atria-soft/enet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct .hpp port + clean libC include

Browse Source
This commit is contained in:
Edouard DUPIN 2016-10-02 23:46:07 +02:00
parent 975c124bd4
commit d89531189e
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doxy_enet.py
View File

@ -19,5 +19,15 @@ def create(target, module_name):
'ememory', 'ememory',
#'algue' #'algue'
]) ])
my_module.add_exclude_symbols([
'*operator<<*',
])
my_module.add_exclude_file([
'debug.hpp',
])
my_module.add_file_patterns([
'*.hpp',
'*.md',
])
return my_module return my_module

2
enet/Ftp.cpp
View File

@ -6,4 +6,4 @@
#include <enet/debug.hpp> #include <enet/debug.hpp>
#include <enet/Ftp.hpp> #include <enet/Ftp.hpp>
#include <string.h> #include <cstring>

2
enet/Http.cpp
View File

@ -8,7 +8,7 @@
#include <enet/Http.hpp> #include <enet/Http.hpp>
#include <map> #include <map>
#include <etk/stdTools.hpp> #include <etk/stdTools.hpp>
#include <string.h> #include <cstring>
#include <unistd.h> #include <unistd.h>
static std::string escapeChar(const std::string& _value) { static std::string escapeChar(const std::string& _value) {

12
enet/Tcp.cpp
View File

@ -6,11 +6,11 @@
#include <enet/debug.hpp> #include <enet/debug.hpp>
#include <enet/Tcp.hpp> #include <enet/Tcp.hpp>
#include <sys/types.hpp> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <cerrno>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <cstring>
#include <etk/stdTools.hpp> #include <etk/stdTools.hpp>
#ifdef __TARGET_OS__Windows #ifdef __TARGET_OS__Windows
@ -46,7 +46,7 @@ enet::Tcp::Tcp(int32_t _idSocket, const std::string& _name) :
m_name(_name), m_name(_name),
m_status(status::link) { m_status(status::link) {
//Initialize the pollfd structure //Initialize the pollfd structure
memset(m_fds[0], 0 , sizeof(m_fds)); memset(&m_fds[0], 0 , sizeof(m_fds));
//Set up the initial listening socket //Set up the initial listening socket
m_fds[0].fd = _idSocket; m_fds[0].fd = _idSocket;
m_fds[0].events = POLLIN | POLLERR; m_fds[0].events = POLLIN | POLLERR;
@ -60,7 +60,7 @@ enet::Tcp::Tcp(Tcp&& _obj) :
_obj.m_name = ""; _obj.m_name = "";
_obj.m_status = status::error; _obj.m_status = status::error;
m_fds[0] = _obj.m_fds[0]; m_fds[0] = _obj.m_fds[0];
memset(m_fds[0], 0 , sizeof(m_fds)); memset(&m_fds[0], 0 , sizeof(m_fds));
} }
enet::Tcp::~Tcp() { enet::Tcp::~Tcp() {
@ -76,7 +76,7 @@ enet::Tcp& enet::Tcp::operator = (enet::Tcp&& _obj) {
m_status = _obj.m_status; m_status = _obj.m_status;
_obj.m_status = status::error; _obj.m_status = status::error;
m_fds[0] = _obj.m_fds[0]; m_fds[0] = _obj.m_fds[0];
memset(m_fds[0], 0 , sizeof(m_fds)); memset(&m_fds[0], 0 , sizeof(m_fds));
return *this; return *this;
} }

2
enet/Tcp.hpp
View File

@ -22,7 +22,7 @@ namespace enet {
#else #else
int32_t m_socketId; //!< socket linux interface generic int32_t m_socketId; //!< socket linux interface generic
#endif #endif
#ifndef __TARGET_OS__Windows #ifdef __TARGET_OS__Windows
int32_t m_fds[1]; int32_t m_fds[1];
#else #else
struct pollfd m_fds[1]; struct pollfd m_fds[1];

4
enet/TcpClient.cpp
View File

@ -10,9 +10,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <cerrno>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <cstring>
#include <etk/stdTools.hpp> #include <etk/stdTools.hpp>
#ifdef __TARGET_OS__Windows #ifdef __TARGET_OS__Windows

4
enet/TcpServer.cpp
View File

@ -8,9 +8,9 @@
#include <enet/Tcp.hpp> #include <enet/Tcp.hpp>
#include <enet/TcpServer.hpp> #include <enet/TcpServer.hpp>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <cerrno>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <cstring>
#include <etk/stdTools.hpp> #include <etk/stdTools.hpp>
#ifdef __TARGET_OS__Windows #ifdef __TARGET_OS__Windows

2
enet/WebSocket.cpp
View File

@ -8,7 +8,7 @@
#include <enet/WebSocket.hpp> #include <enet/WebSocket.hpp>
#include <map> #include <map>
#include <etk/stdTools.hpp> #include <etk/stdTools.hpp>
#include <string.h> #include <cstring>
#include <random> #include <random>
#include <algue/base64.hpp> #include <algue/base64.hpp>
#include <algue/sha1.hpp> #include <algue/sha1.hpp>