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

Merge branch 'master' of git://github.com/janvidar/uhub

This commit is contained in:
root 2010-01-26 19:17:16 +03:00
parent f263534aaf 788b644c80
commit e9f0331ca8
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network.c
View File

@ -69,7 +69,7 @@ size_t net_get_max_sockets()
struct rlimit limits; struct rlimit limits;
if (getrlimit(RLIMIT_NOFILE, &limits) == 0) if (getrlimit(RLIMIT_NOFILE, &limits) == 0)
{ {
return limits.rlim_max; return MIN(limits.rlim_max, 65536);
} }
LOG_ERROR("getrlimit() failed"); LOG_ERROR("getrlimit() failed");
return 1024; return 1024;

1
src/util/misc.c
View File

@ -225,7 +225,6 @@ int file_read_lines(const char* file, void* data, file_line_handler_t handler)
if (*start) if (*start)
{ {
buf[strlen(start)] = 0;
LOG_DUMP("Line: %s", start); LOG_DUMP("Line: %s", start);
if (handler(start, line_count+1, data) < 0) if (handler(start, line_count+1, data) < 0)
return -1; return -1;