Changeset 13 for trunk

Timestamp:

Jan 8, 2006, 10:13:03 PM (19 years ago)

Author:

rainer

Message:

minor optimization

Location:

trunk/src

Files:

• sh_database.c (modified) (4 diffs)
• sh_utils.c (modified) (16 diffs)

trunk/src/sh_database.c

@@ -1438 +1438 @@
       attr_tab[i].attr = malloc (j+1); /* only once */
       if (NULL == attr_tab[i].attr)
-        SL_RETURN (NULL, _("sh_database_parse"));
+        return;
       for (k = 0; k < j; ++k)
         attr_tab[i].attr[k] = attr_tab[i].attr_o[k] ^ XOR_CODE;
@@ -1503 +1503 @@
           escp = (escp == 1) ? 0 : 1;
         }
-      else if (*p == '\'' && escp == 0)
-        {
-          retv = S_FALSE;
-        }
-      else if (*p == '\"' && escp == 0)
+      else if ((*p == '\'' || *p == '\"') && escp == 0)
         {
           retv = S_FALSE;
@@ -1573 +1569 @@
  parse:
 
-  while ((p != NULL) && (*p == ' ' || *p == '>'))
+  while (*p == ' ' || *p == '>')
     ++p;
 
-  if (!p || *p == '\0')
+  if (*p == '\0')
     SL_RETURN(NULL, _("sh_database_parse"));
 
@@ -1673 +1669 @@
             }
         }
-      ++i;
     }
 

trunk/src/sh_utils.c

@@ -245 +245 @@
 
 
-/* returned string must be free'd by caller
+/* returned string must be free'd by caller.
  */
 char * sh_util_formatted (const char * formatt, st_format * ftab)
@@ -260 +260 @@
   time_t inpp;
 
-  char * clist[16];
+  char * clist[16] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
   int    nn = 0;
 
   SL_ENTER(_("sh_util_formatted"));
 
-  if (formatt == NULL || ftab == NULL)
+  if (formatt == NULL || ftab == NULL || *formatt == '\0')
     SL_RETURN(NULL, _("sh_util_formatted"));
 
@@ -271 +272 @@
    */
   size = sl_strlen(formatt);
-  if (size > 0)
-    {
-      fmt = (char *) SH_ALLOC(size + 1);
-      (void) sl_strlcpy(fmt, formatt, size + 1);
-    }
-  else
-    SL_RETURN(NULL, _("sh_util_formatted"));
+
+  fmt = (char *) SH_ALLOC(size + 1);
+  (void) sl_strlcpy(fmt, formatt, size + 1);
 
   p = fmt;
 
   j = 0;
-  while (ftab[j].fchar != '\0')
-    {
-      if (ftab[j].type != S_FMT_STRING)
-        ftab[j].data_str = NULL;
-      ++j;
-    }
-
-  for (j = 0; j < 16; ++j)
-    clist[j] = NULL;
-
+  while (ftab[j].fchar != '\0') {
+    if (ftab[j].type != S_FMT_STRING)
+      ftab[j].data_str = NULL;
+    ++j;
+  }
+ 
   while (p != NULL && *p != '\0' && NULL != (q = strchr(p, '%')))
     {
@@ -324 +317 @@
               i  = 1;
               
-              if (ftab[j].type == S_FMT_STRING)
+              switch(ftab[j].type) {
+
+              case S_FMT_STRING:
                 {
                   isiz = sl_strlen(ftab[j].data_str);
@@ -335 +330 @@
                   else
                     *q = '%';
-                  break;
+                  goto endsrch;
                 }
-              else if (ftab[j].type == S_FMT_ULONG)
+                break;
+
+              case S_FMT_ULONG:
                 {
                   ftab[j].data_str = (char *) SH_ALLOC(64);
@@ -353 +350 @@
                   else
                     *q = '%';
-                  break;
+                  goto endsrch;
                 }
-              else if (ftab[j].type == S_FMT_LONG)
+                break;
+
+              case S_FMT_LONG:
                 {
                   ftab[j].data_str = (char *) SH_ALLOC(64);
@@ -371 +370 @@
                   else
                     *q = '%';
-                  break;
+                  goto endsrch;
                 }
-              else if (ftab[j].type == S_FMT_TIME)
+                break;
+
+              case S_FMT_TIME:
                 {
                   ftab[j].data_str = (char *) SH_ALLOC(64);
@@ -401 +402 @@
                   else
                     *q = '%';
-                  break;
+                  goto endsrch;
                 }
+                break;
+
+              default:
+                /* do nothing */;
+              }
 
             }
-          else
-            ++j;
-        }
+          ++j;
+        }
+
+    endsrch:
+
+      p = q;
 
       /* -- not found -- */
@@ -413 +422 @@
         {
           *q = '%';
-          p = q;
           ++p;
         }
-      else
-        {
-          p = q;
-        }
+
     }
 
@@ -443 +448 @@
    */
   j = 0;
-  while (ftab[j].fchar != '\0')
-    {
-      if (ftab[j].type != S_FMT_STRING && ftab[j].data_str != NULL)
-        SH_FREE(ftab[j].data_str);
-      ++j;
-    }
+  while (ftab[j].fchar != '\0') {
+    if (ftab[j].type != S_FMT_STRING && ftab[j].data_str != NULL)
+      SH_FREE(ftab[j].data_str);
+    ++j;
+  }
   SH_FREE(fmt);
 
@@ -474 +478 @@
 {
   int i = 0, j, k, l = 0;
+  char c;
+
+#define SH_HEXCHAR(x, y) \
+    c = (x); \
+    if ( c >= '0' && c <= '9' ) \
+      y = c - '0'; \
+    else if ( c >= 'a' && c <= 'f' ) \
+      y = c - 'a' + 10; \
+    else if ( c >= 'A' && c <= 'F' ) \
+      y = c - 'A' + 10; \
+    else \
+      SL_RETURN((-1), _("sh_util_hextobinary"))
+
 
   SL_ENTER(_("sh_util_hextobinary"));
@@ -479 +496 @@
   while (i < bytes)
     {
-      k = sh_util_hexchar(hex[i]); j = sh_util_hexchar(hex[i+1]); 
+      SH_HEXCHAR(hex[i],   k);
+      SH_HEXCHAR(hex[i+1], j);
+      
+      binary[l] = (char)(k * 16 + j);
+      ++l; i+= 2;
+
+      /* k = sh_util_hexchar(hex[i]); j = sh_util_hexchar(hex[i+1]); 
       if (k != -1 && j != -1) 
         {
@@ -489 +512 @@
           SL_RETURN((-1), _("sh_util_hextobinary"));
         }
+      */
     }
   
@@ -654 +678 @@
 }    
 
-  
  
 /* a simple compressor
@@ -785 +808 @@
   UINT32   retval;
   UINT32 * res;
+  static   UINT32   res_vec[6];
+  static   int      res_num = 0;
   register int i;
+
+  if (res_num > 0)
+    {
+      retval  = res_vec[res_num];
+      res_num = (res_num == 5) ? 0 : (res_num + 1);
+      return  retval;
+    }
 
   taus_svec[0] = taus_get_long (state1);
@@ -798 +830 @@
                                    (unsigned long)(6 * sizeof(UINT32)));
 
-  for (i = 1; i < KEY_BYT/4; ++i)
+  for (i = 1; i < 6; ++i)
     { 
-      res[0] ^= res[i];
-      res[i]  = 0;
-    }
-  retval = res[0];
+      res_vec[i] = res[i];
+    }
+  retval  = taus_svec[0];
+  res_num = 1;
 
   taus_svec[0] = 0; taus_svec[1] = 0; taus_svec[2] = 0;