... | ... |
@@ -29,12 +29,12 @@ |
29 | 29 |
#include "socklib.h" |
30 | 30 |
|
31 | 31 |
typedef struct _sselect { |
32 |
- int fd_set readset; |
|
33 |
- int fd_set writeset; |
|
32 |
+ fd_set readset; |
|
33 |
+ fd_set writeset; |
|
34 | 34 |
int maxfd; |
35 | 35 |
int numfd; |
36 |
- int fd_set readresult; |
|
37 |
- int fd_set writeresult; |
|
36 |
+ fd_set readresult; |
|
37 |
+ fd_set writeresult; |
|
38 | 38 |
int sizeresult; |
39 | 39 |
int readresultreturned; |
40 | 40 |
int writeresultreturned; |
... | ... |
@@ -240,7 +240,6 @@ sselect_init(void) |
240 | 240 |
int |
241 | 241 |
sselect_reset(sselect *paramssel) |
242 | 242 |
{ |
243 |
- int i; |
|
244 | 243 |
_sselect *ssel=(_sselect *)paramssel; |
245 | 244 |
if(ssel==NULL) |
246 | 245 |
return(-1); |
... | ... |
@@ -256,9 +255,8 @@ sselect_reset(sselect *paramssel) |
256 | 255 |
int |
257 | 256 |
sselect_addread(sselect *paramssel, int fd) |
258 | 257 |
{ |
259 |
- int i; |
|
260 | 258 |
_sselect *ssel=(_sselect *)paramssel; |
261 |
- if(ssel==NULL || fd<0 || FD_ISSET(fd,&(ssel->readset)) |
|
259 |
+ if(ssel==NULL || fd<0 || FD_ISSET(fd,&(ssel->readset))) |
|
262 | 260 |
return(-1); |
263 | 261 |
FD_SET(fd,&(ssel->readset)); |
264 | 262 |
if(fd>ssel->maxfd) |
... | ... |
@@ -271,9 +269,8 @@ sselect_addread(sselect *paramssel, int fd) |
271 | 269 |
int |
272 | 270 |
sselect_addwrite(sselect *paramssel, int fd) |
273 | 271 |
{ |
274 |
- int i; |
|
275 | 272 |
_sselect *ssel=(_sselect *)paramssel; |
276 |
- if(ssel==NULL || fd<0 || FD_ISSET(fd,&(ssel->writeset)) |
|
273 |
+ if(ssel==NULL || fd<0 || FD_ISSET(fd,&(ssel->writeset))) |
|
277 | 274 |
return(-1); |
278 | 275 |
FD_SET(fd,&(ssel->writeset)); |
279 | 276 |
if(fd>ssel->maxfd) |
... | ... |
@@ -285,12 +282,11 @@ sselect_addwrite(sselect *paramssel, int fd) |
285 | 282 |
int |
286 | 283 |
sselect_delread(sselect *paramssel, int fd) |
287 | 284 |
{ |
288 |
- int i; |
|
289 | 285 |
_sselect *ssel=(_sselect *)paramssel; |
290 |
- if(ssel==NULL || fd<0 || !FD_ISSET(fd,&(ssel->readset)) |
|
286 |
+ if(ssel==NULL || fd<0 || !FD_ISSET(fd,&(ssel->readset))) |
|
291 | 287 |
return(-1); |
292 | 288 |
FD_CLR(fd,&(ssel->readset)); |
293 |
- if(fd>0 && fd==ssel->maxfd && !FD_ISSET(fd,&(ssel->writeset)) |
|
289 |
+ if(fd>0 && fd==ssel->maxfd && !FD_ISSET(fd,&(ssel->writeset))) |
|
294 | 290 |
ssel->maxfd=fd-1; |
295 | 291 |
ssel->numfd--; |
296 | 292 |
return(0); |
... | ... |
@@ -300,12 +296,11 @@ sselect_delread(sselect *paramssel, int fd) |
300 | 296 |
int |
301 | 297 |
sselect_delwrite(sselect *paramssel, int fd) |
302 | 298 |
{ |
303 |
- int i; |
|
304 | 299 |
_sselect *ssel=(_sselect *)paramssel; |
305 |
- if(ssel==NULL || fd<0 || !FD_ISSET(fd,&(ssel->writeset)) |
|
300 |
+ if(ssel==NULL || fd<0 || !FD_ISSET(fd,&(ssel->writeset))) |
|
306 | 301 |
return(-1); |
307 | 302 |
FD_CLR(fd,&(ssel->writeset)); |
308 |
- if(fd>0 && fd==ssel->maxfd && !FD_ISSET(fd,&(ssel->readset)) |
|
303 |
+ if(fd>0 && fd==ssel->maxfd && !FD_ISSET(fd,&(ssel->readset))) |
|
309 | 304 |
ssel->maxfd=fd-1; |
310 | 305 |
ssel->numfd--; |
311 | 306 |
return(0); |
... | ... |
@@ -314,8 +309,7 @@ sselect_delwrite(sselect *paramssel, int fd) |
314 | 309 |
int |
315 | 310 |
sselect_wait(sselect *paramssel, int ms) |
316 | 311 |
{ |
317 |
- fd_set readset,writefd; |
|
318 |
- timeval tv; |
|
312 |
+ struct timeval tv; |
|
319 | 313 |
_sselect *ssel=(_sselect *)paramssel; |
320 | 314 |
if(ssel==NULL || ms<0) |
321 | 315 |
return(-1); |
... | ... |
@@ -338,7 +332,7 @@ sselect_getread(sselect *paramssel, int *fds, int sizefds) |
338 | 332 |
_sselect *ssel=(_sselect *)paramssel; |
339 | 333 |
if(ssel==NULL || fds==NULL || sizefds<1) |
340 | 334 |
return(-1); |
341 |
- for(n=0,i=ssel->readresultreturned;i<ssel->maxfd && n<sizeofds;i++) { |
|
335 |
+ for(n=0,i=ssel->readresultreturned;i<ssel->maxfd && n<sizefds;i++) { |
|
342 | 336 |
if(FD_ISSET(i,&(ssel->readresult))) |
343 | 337 |
fds[n++]=i; |
344 | 338 |
} |
... | ... |
@@ -353,7 +347,7 @@ sselect_getwrite(sselect *paramssel, int *fds, int sizefds) |
353 | 347 |
_sselect *ssel=(_sselect *)paramssel; |
354 | 348 |
if(ssel==NULL || fds==NULL || sizefds<1) |
355 | 349 |
return(-1); |
356 |
- for(n=0,i=ssel->writeresultreturned;i<ssel->maxfd && n<sizeofds;i++) { |
|
350 |
+ for(n=0,i=ssel->writeresultreturned;i<ssel->maxfd && n<sizefds;i++) { |
|
357 | 351 |
if(FD_ISSET(i,&(ssel->writeresult))) |
358 | 352 |
fds[n++]=i; |
359 | 353 |
} |