Changeset 171 for trunk/src/sh_forward.c

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:

• trunk/src/sh_forward.c (modified) (3 diffs)

trunk/src/sh_forward.c

@@ -2644 +2644 @@
                                sizeof(addr_peer.sin_addr))) 
                 break;
-              ++i;
             }
         }
@@ -4916 +4915 @@
   struct  sigaction  new_act;
   struct  sigaction  old_act;
+
+  int setsize_fd;
   
   SL_ENTER(_("sh_receive"));
@@ -4946 +4947 @@
    * The POSIX lower limit on open files seems to be eight. 
    */
-  maxconn = get_open_max() - 6;
-  maxconn = (((int)FD_SETSIZE) < maxconn) ? FD_SETSIZE : maxconn;
+  maxconn    = get_open_max() - 6;
+  /* ugly fix for FreeBSD compiler warning; casting FD_SETSIZE in the
+   * conditional expression does not suppress the warning... */
+  setsize_fd = (int)FD_SETSIZE;
+  maxconn = (setsize_fd < maxconn) ? setsize_fd : maxconn;
 
   if (maxconn < 0 || !sl_ok_muls(maxconn, sizeof(sh_conn_t)))