external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcc v2.95 compile fixes.

Browse Source
This commit is contained in:
Jan Vidar Krey
2010-01-28 01:06:41 +01:00
parent db32eaeafc
commit 8e7e8c68f5
11 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/epoll.c
View File

@@ -107,10 +107,10 @@ void net_backend_shutdown()
*/
int net_backend_process()
{
int n;
int n, res;
size_t secs = timeout_queue_get_next_timeout(&g_backend->timeout_queue, g_backend->now);
LOG_TRACE("epoll_wait: fd=%d, events=%x, max=%zu, seconds=%d", g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER), (int) secs);
int res = epoll_wait(g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER), secs * 1000);
res = epoll_wait(g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER), secs * 1000);
g_backend->now = time(0);
timeout_queue_process(&g_backend->timeout_queue, g_backend->now);

6
src/network/network.c
View File

@@ -588,9 +588,10 @@ const char* net_get_peer_address(int fd)
struct sockaddr_in6* name6;
struct sockaddr_in* name4;
struct sockaddr* name;
socklen_t namelen;
memset(address, 0, INET6_ADDRSTRLEN);
socklen_t namelen = sizeof(struct sockaddr_storage);
namelen = sizeof(struct sockaddr_storage);
memset(&storage, 0, namelen);
name6 = (struct sockaddr_in6*) &storage;
@@ -626,9 +627,10 @@ const char* net_get_local_address(int fd)
struct sockaddr_in6* name6;
struct sockaddr_in* name4;
struct sockaddr* name;
socklen_t namelen;
memset(address, 0, INET6_ADDRSTRLEN);
socklen_t namelen = sizeof(struct sockaddr_storage);
namelen = sizeof(struct sockaddr_storage);
memset(&storage, 0, namelen);
name6 = (struct sockaddr_in6*) &storage;