mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
r16450@catbus: nickm | 2007-11-06 09:18:11 -0500
Fix compile on sparc64 svn:r12394
This commit is contained in:
parent
95c7b8cc64
commit
512d3b161c
@ -708,7 +708,7 @@ set_max_file_descriptors(unsigned long limit, unsigned long cap)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
most = rlim.rlim_max > (rlim_t)cap ? (rlim_t)cap : rlim.rlim_max;
|
most = rlim.rlim_max > (rlim_t)cap ? (rlim_t)cap : rlim.rlim_max;
|
||||||
if (most > (unsigned long)rlim.rlim_cur) {
|
if ((rlim_t)most > rlim.rlim_cur) {
|
||||||
log_info(LD_NET,"Raising max file descriptors from %lu to %lu.",
|
log_info(LD_NET,"Raising max file descriptors from %lu to %lu.",
|
||||||
(unsigned long)rlim.rlim_cur, (unsigned long)most);
|
(unsigned long)rlim.rlim_cur, (unsigned long)most);
|
||||||
}
|
}
|
||||||
@ -722,7 +722,7 @@ set_max_file_descriptors(unsigned long limit, unsigned long cap)
|
|||||||
* full of nasty lies. I'm looking at you, OSX 10.5.... */
|
* full of nasty lies. I'm looking at you, OSX 10.5.... */
|
||||||
rlim.rlim_cur = OPEN_MAX;
|
rlim.rlim_cur = OPEN_MAX;
|
||||||
if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) {
|
if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) {
|
||||||
if (rlim.rlim_cur < limit) {
|
if (rlim.rlim_cur < (rlim_t)limit) {
|
||||||
log_warn(LD_CONFIG, "We are limited to %lu file descriptors by "
|
log_warn(LD_CONFIG, "We are limited to %lu file descriptors by "
|
||||||
"OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.",
|
"OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.",
|
||||||
(unsigned long)OPEN_MAX, limit);
|
(unsigned long)OPEN_MAX, limit);
|
||||||
|
Loading…
Reference in New Issue
Block a user