Changeset 144 for trunk/src/slib.c

Timestamp:

Oct 31, 2007, 11:33:13 PM (17 years ago)

Author:

rainer

Message:

Fix some more queer compile problems.

File:

• trunk/src/slib.c (modified) (6 diffs)

trunk/src/slib.c

@@ -55 +55 @@
 #define SH_NEED_PWD_GRP 1
 #include "sh_static.h"
+#include "sh_pthread.h"
 
 #undef  FIL__
@@ -1514 +1515 @@
 static SL_OFILE * ofiles[MAXFD]; 
 
+SH_MUTEX_STATIC(mutex_ticket, PTHREAD_MUTEX_INITIALIZER);
 
 static unsigned int nonce_counter = TOFFSET;
@@ -1522 +1524 @@
   unsigned int high; /* index */ 
   unsigned int low;  /* nonce */
+  SL_TICKET    retval = SL_EINTERNAL;
 
   SL_ENTER(_("sl_create_ticket"));
 
-  if (myindex >= MAXFD) 
-    SL_IRETURN (SL_EINTERNAL, _("sl_create_ticket")); 
+  if (myindex >= MAXFD)
+    goto out_ticket;
 
   /* mask out the high bit and check that it is not used
@@ -1534 +1537 @@
 
   if (high != myindex + TOFFSET) 
-    SL_IRETURN (SL_EINTERNAL, _("sl_create_ticket")); 
+    goto out_ticket;
+
+  SH_MUTEX_LOCK_UNSAFE(mutex_ticket);
 
   low = nonce_counter & 0xffff;
@@ -1541 +1546 @@
    */
   if ((low != nonce_counter++) || low == 0)
-    SL_IRETURN (SL_EINTERNAL, _("sl_create_ticket"));
+    goto out_ticket;
  
   /* Wrap around the nonce counter.
@@ -1549 +1554 @@
     nonce_counter = TOFFSET;
 
-  SL_RETURN ((SL_TICKET) ((high << 16) | low), _("sl_create_ticket")); 
+  retval = (SL_TICKET) ((high << 16) | low);
+
+ out_ticket:
+  ;
+
+  SH_MUTEX_UNLOCK_UNSAFE(mutex_ticket);
+  SL_RETURN (retval, _("sl_create_ticket")); 
 }