Changeset 169 for trunk/src/slib.c

Timestamp:

Apr 13, 2008, 9:59:55 PM (17 years ago)

Author:

katerina

Message:

Fixes for tickes #93 to #104 (yes, big commit, bad, bad,...).

File:

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

trunk/src/slib.c

@@ -108 +108 @@
 int  sl_trace_use (const char * dummy)
 {
-  if (dummy)
-    slib_do_trace = 1;
-  else
-    slib_do_trace = 1;
+  (void) dummy;
+  slib_do_trace = 1;
   return 0;
 }
@@ -156 +154 @@
           fprintf(trace_fp, "[%2d] %s \t - File %c%s%c at line %d\n", 
                  trace_level, str, 0x22, file, 0x22, line);
+          fflush(trace_fp);
         }
       else
@@ -191 +190 @@
           fprintf(trace_fp, _("[%2d] %s \t - File %c%s%c at line %d\n"), 
                  trace_level, str, 0x22, file, 0x22, line);
+          fflush(trace_fp);
         }
       else
@@ -1007 +1007 @@
 }
 
+#include <ctype.h>
+int sl_strcasecmp(const char * one, const char * two)
+{
+#ifdef SL_FAIL_ON_ERROR
+  SL_REQUIRE (one != NULL, _("one != NULL"));
+  SL_REQUIRE (two != NULL, _("two != NULL"));
+#endif
+
+  if (one && two)
+    {
+      do {
+        if (*one && *two)
+          {
+            if (tolower(*one) == tolower(*two))
+              {
+                ++one; ++two;
+              }
+            else if (tolower(*one) < tolower(*two))
+              return -1;
+            else
+              return 1;
+          }
+        else if (*one == '\0' && *two == '\0')
+          return 0;
+        else if (*one == '\0')
+          return -1;
+        else
+          return 1;
+      } while (1 == 1);
+    }
+  else if (one == NULL && two != NULL)
+    return -1;
+  else if (one != NULL && two == NULL)
+    return 1;
+  else
+    return -7; /* default to not equal */
+}
 
 int sl_strcmp(const char * a, const char * b)
@@ -1022 +1059 @@
     return (1);
   else
-    return (-7); /* arbitrary */
+    return (-7); /* default to not equal */
 }
 
@@ -1040 +1077 @@
     return (1);
   else
-    return (-7); /* arbitrary */
+    return (-7); /* default to not equal */
 }
 
@@ -2232 +2269 @@
                   if (is_nonblocking == SL_FALSE)
                       retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags);
+                  TPT(( 0, FIL__, __LINE__, _("msg=<read error>")));
                   return (SL_EREAD);
                 }
@@ -2247 +2285 @@
           if (is_nonblocking == SL_FALSE)
               retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags);
+          TPT(( 0, FIL__, __LINE__, _("msg=<timeout>")));
           return (SL_TIMEOUT);
         }
@@ -2253 +2292 @@
           if (is_nonblocking == SL_FALSE)
               retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags);
+          TPT(( 0, FIL__, __LINE__, _("msg=<timeout>")));
           return (SL_EREAD);
         }
@@ -2260 +2300 @@
           if (is_nonblocking == SL_FALSE)
               retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags);
+          TPT(( 0, FIL__, __LINE__, _("msg=<terminated>")));
           return (SL_EREAD);
         }
@@ -2270 +2311 @@
           if (is_nonblocking == SL_FALSE)
               retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags);
+          TPT(( 0, FIL__, __LINE__, _("msg=<timeout>")));
           return (SL_TIMEOUT);
         }
@@ -2282 +2324 @@
                      int timeout, int is_nonblocking)
 {
-  int    fd;
+  int    fd, retval;
  
+  SL_ENTER(_("sl_read_timeout"));
+
   if (buf_in == NULL || SL_ISERROR(fd = get_the_fd(ticket)))
     {
@@ -2289 +2333 @@
         {
           TPT(( 0, FIL__, __LINE__, _("msg=<null buffer>")));
-          return (SL_ENULL);
+          SL_IRETURN((SL_ENULL), _("sl_read_timeout"));
         }
       if (SL_ISERROR(fd = get_the_fd(ticket)))
         {
           TPT(( 0, FIL__, __LINE__, _("msg=<ticket error> errno=<%d>"), fd));
-          return (fd);
+          SL_IRETURN((fd),  _("sl_read_timeout"));
         }
     }
 
-  return sl_read_timeout_fd (fd, buf_in, count, timeout, is_nonblocking);
+  retval = sl_read_timeout_fd (fd, buf_in, count, timeout, is_nonblocking);
+  SL_IRETURN((retval), _("sl_read_timeout"));
 }
 
@@ -2310 +2355 @@
   char * buf;
 
+  SL_ENTER(_("sl_read"));
+
   if (count < 1)
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<range error>")));
-      return(SL_ERANGE);
+      SL_IRETURN((SL_ERANGE), _("sl_read"));
     }
   if (buf_in == NULL)
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<null buffer>")));
-      return (SL_ENULL);
+      SL_IRETURN((SL_ENULL), _("sl_read"));
     }
 
@@ -2324 +2371 @@
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<ticket error> errno=<%d>"), fd));
-      return (fd);
+      SL_IRETURN((fd), _("sl_read"));
     }
 
@@ -2345 +2392 @@
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<read error> errno=<%d>\n"), errno));
-      return (SL_EREAD);
-    }
-  return (bytes);
+      SL_IRETURN((SL_EREAD), _("sl_read"));
+    }
+  SL_IRETURN((bytes), _("sl_read"));
 }
 
@@ -2357 +2404 @@
   char * buf;
 
+  SL_ENTER(_("sl_read_fast"));
+
   if (count < 1)
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<range error>")));
-      return(SL_ERANGE);
+      SL_IRETURN((SL_ERANGE), _("sl_read_fast"));
     }
   if (buf_in == NULL)
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<null buffer>")));
-      return (SL_ENULL);
+      SL_IRETURN((SL_ENULL), _("sl_read_fast"));
     }
 
@@ -2371 +2420 @@
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<ticket error> errno=<%d>"), fd));
-      return (fd);
+      SL_IRETURN((fd), _("sl_read_fast"));
     }
 
@@ -2381 +2430 @@
       if (byteread >= 0) 
         {
-          return (byteread);
+          SL_IRETURN((byteread), _("sl_read_fast"));
         }  
     } while ( byteread == -1 && (errno == EINTR || errno == EAGAIN));
@@ -2389 +2438 @@
     {
       TPT(( 0, FIL__, __LINE__, _("msg=<read error> errno=<%d>\n"), errno));
-      return (SL_EREAD);
-    }
-  return (0);
+      SL_IRETURN((SL_EREAD), _("sl_read_fast"));
+    }
+  SL_IRETURN((0), _("sl_read_fast"));
 }