Changeset 243

Timestamp:

Aug 19, 2009, 9:11:53 PM (15 years ago)

Author:

katerina

Message:

Improved diagnostics for the 'Not accessible' bug

Location:

trunk

Files:

• include/slib.h (modified) (1 diff)
• src/slib.c (modified) (12 diffs)

trunk/include/slib.h

@@ -118 +118 @@
 
 #define SL_EISDIR    -1055      /* Is a directory                      */
+
+#define SL_EINTERNAL01 -1061    /* Internal error.                      */
+#define SL_EINTERNAL02 -1062    /* Internal error.                      */
+#define SL_EINTERNAL03 -1063    /* Internal error.                      */
+#define SL_EINTERNAL04 -1064    /* Internal error.                      */
+#define SL_EINTERNAL05 -1065    /* Internal error.                      */
+#define SL_EINTERNAL06 -1066    /* Internal error.                      */
+#define SL_EINTERNAL07 -1067    /* Internal error.                      */
+#define SL_EINTERNAL08 -1068    /* Internal error.                      */
+#define SL_EINTERNAL09 -1069    /* Internal error.                      */
+#define SL_EINTERNAL10 -1070    /* Internal error.                      */
+#define SL_EINTERNAL11 -1071    /* Internal error.                      */
+#define SL_EINTERNAL12 -1072    /* Internal error.                      */
+
 /*
  * All int functions return SL_NONE on success.

trunk/src/slib.c

@@ -1580 +1580 @@
 
   if (myindex >= MAXFD)
-    goto out_ticket;
+    {
+      retval = SL_EINTERNAL01;
+      goto out_ticket;
+    }
 
   /* mask out the high bit and check that it is not used
@@ -1587 +1590 @@
   high = (myindex + TOFFSET) & 0x7fff; 
 
-  if (high != myindex + TOFFSET) 
-    goto out_ticket;
+  if (high != myindex + TOFFSET)
+    {
+      retval = SL_EINTERNAL02;
+      goto out_ticket;
+    }
 
   SH_MUTEX_LOCK_UNSAFE(mutex_ticket);
@@ -1597 +1603 @@
    */
   if ((low != nonce_counter++) || low == 0)
-    goto out_ticket;
+    {
+      retval = SL_EINTERNAL03;
+      goto out_ticket;
+    }
  
   /* Wrap around the nonce counter.
@@ -1631 +1640 @@
 
   if ((of = ofiles[myindex])->fd < 0 || of->fd >= MAXFD )
-    return (SL_EINTERNAL);
+    return (SL_EINTERNAL04);
 
   if (((of->ticket) & 0xffff) == 0)
-    return (SL_EINTERNAL); 
+    return (SL_EINTERNAL05); 
 
   return (myindex); 
@@ -1653 +1662 @@
    if (ofiles[fd] != NULL)
     {
-      SL_IRETURN(SL_EINTERNAL, _("sl_make_ticket"));
+      SL_IRETURN(SL_EINTERNAL06, _("sl_make_ticket"));
     }
 
@@ -1741 +1750 @@
     SL_IRETURN(SL_ENULL, _("sl_open_file"));
   if (mode < SL_OPEN_MIN || mode > SL_OPEN_MAX)
-    SL_IRETURN(SL_EINTERNAL, _("sl_open_file"));
+    SL_IRETURN(SL_EINTERNAL07, _("sl_open_file"));
     
   /* "This system call always succeeds and the previous value of
@@ -1863 +1872 @@
     default:
       errno = 0;
-      SL_IRETURN(SL_EINTERNAL, _("sl_open_file"));
+      SL_IRETURN(SL_EINTERNAL08, _("sl_open_file"));
     }
 
@@ -1913 +1922 @@
     {
       close(fd);
-      SL_IRETURN(SL_EINTERNAL, _("sl_open_file"));
+      SL_IRETURN(SL_EINTERNAL09, _("sl_open_file"));
     }
 
@@ -1961 +1970 @@
 
   if (ofiles[fd] == NULL || fd != ofiles[fd]->fd || fd < 0)
-    return (SL_EINTERNAL);
+    return (SL_EINTERNAL10);
   return (fd);
 }
@@ -1972 +1981 @@
     SL_IRETURN(SL_ENULL, _("check_fname_priv"));
   if (priv != SL_YESPRIV && priv != SL_NOPRIV)
-    SL_IRETURN(SL_EINTERNAL, _("check_fname_priv"));
+    SL_IRETURN(SL_EINTERNAL11, _("check_fname_priv"));
   SL_IRETURN(SL_ENONE, _("check_fname_priv"));
 }
@@ -2140 +2149 @@
 
   if (ofiles[fd] == NULL || fd != ofiles[fd]->fd || fd < 0)
-    return (SL_EINTERNAL);
+    return (SL_EINTERNAL12);
 
   if (ofiles[fd]->content)
@@ -2721 +2730 @@
     case SL_EINTERNAL: 
       return _("Internal error");
+    case SL_EINTERNAL01: 
+      return _("Internal error 01");
+    case SL_EINTERNAL02: 
+      return _("Internal error 02");
+    case SL_EINTERNAL03: 
+      return _("Internal error 03");
+    case SL_EINTERNAL04: 
+      return _("Internal error 04");
+    case SL_EINTERNAL05: 
+      return _("Internal error 05");
+    case SL_EINTERNAL06: 
+      return _("Internal error 06");
+    case SL_EINTERNAL07: 
+      return _("Internal error 07");
+    case SL_EINTERNAL08: 
+      return _("Internal error 08");
+    case SL_EINTERNAL09: 
+      return _("Internal error 09");
+    case SL_EINTERNAL10: 
+      return _("Internal error 10");
+    case SL_EINTERNAL11: 
+      return _("Internal error 11");
+    case SL_EINTERNAL12: 
+      return _("Internal error 12");
     case SL_ETICKET:
       return _("Bad ticket");