9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ssld: avoid clang static analysis warning

Browse source 
Don't set `x = 0` twice.

Edit by @aaronmdjones: fix for loop initialisation and inner condition
This commit is contained in:
Simon Arlott 2017-07-29 20:29:24 +01:00 committed by Aaron Jones
parent a21843a0a0
commit ae6ce6100a
No known key found for this signature in database
GPG key ID: 8AF0737488AB3012
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ssld/ssld.c
View file

@ -1189,7 +1189,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
const char *s_ctlfd, *s_pipe, *s_pid; const char *s_ctlfd, *s_pipe, *s_pid;
int ctlfd, pipefd, x, maxfd; int ctlfd, pipefd, maxfd;
maxfd = maxconn(); maxfd = maxconn();
s_ctlfd = getenv("CTL_FD"); s_ctlfd = getenv("CTL_FD");
@ -1209,13 +1209,16 @@ main(int argc, char **argv)
ctlfd = atoi(s_ctlfd); ctlfd = atoi(s_ctlfd);
pipefd = atoi(s_pipe); pipefd = atoi(s_pipe);
ppid = atoi(s_pid); ppid = atoi(s_pid);
x = 0;
#ifndef _WIN32 #ifndef _WIN32
for(x = 0; x < maxfd; x++) int x;
for(x = 3; x < maxfd; x++)
{ {
if(x != ctlfd && x != pipefd && x > 2) if(x != ctlfd && x != pipefd)
close(x); close(x);
} }
x = open("/dev/null", O_RDWR); x = open("/dev/null", O_RDWR);
if(x >= 0) if(x >= 0)
@ -1230,6 +1233,7 @@ main(int argc, char **argv)
close(x); close(x);
} }
#endif #endif
setup_signals(); setup_signals();
rb_lib_init(NULL, NULL, NULL, 0, maxfd, 1024, 4096); rb_lib_init(NULL, NULL, NULL, 0, maxfd, 1024, 4096);
rb_init_rawbuffers(1024); rb_init_rawbuffers(1024);