Changeset 8 for trunk/src/sh_hash.c

Timestamp:

Dec 31, 2005, 2:02:03 PM (19 years ago)

Author:

rainer

Message:

minor optimisations for speed

File:

• trunk/src/sh_hash.c (modified) (8 diffs)

trunk/src/sh_hash.c

@@ -71 +71 @@
 static char * unquote_string (char * str)
 {
-  int    i = 0, j, k = 0, len;
-  char * tmp;
+  int    i = 0, j, k = 0, len, t1, t2, l2;
+  char * tmp = NULL;
 
   SL_ENTER(_("unquote_string"));
 
-  if (str == NULL)
-    {
-      SL_RETURN(NULL, _("unquote_string"));
-    }
-
-  len = sl_strlen(str);
-
-  tmp = SH_ALLOC(len + 1);
-  for (j = 0; j <= len; ++j)
-    {
-      if (str[j] == QUOTE_CHAR && j < (len-2))
-        {
-          if (sh_util_hexchar(str[j+1]) >= 0 && sh_util_hexchar(str[j+2]) >= 0)
-            {
-              i = 16 * sh_util_hexchar(str[j+1]) + sh_util_hexchar(str[j+2]);
-              tmp[k] = i; j += 2;
-            }
-          else
+  if (str != NULL)
+    {
+      len = sl_strlen(str);
+      l2  = len - 2;
+      tmp = SH_ALLOC(len + 1);
+
+      for (j = 0; j <= len; ++j)
+        {
+          if (str[j] != QUOTE_CHAR)
             {
               tmp[k] = str[j];
             }
-        }
-      else
-        tmp[k] = str[j];
-      ++k;
+          else if (str[j] == QUOTE_CHAR && j < l2)
+            {
+              t1 = sh_util_hexchar(str[j+1]);
+              t2 = sh_util_hexchar(str[j+2]);
+              if ((t1|t2) >= 0)
+                {
+                  i = 16 * t1 + t2;
+                  tmp[k] = i; 
+                  j += 2;
+                }
+              else
+                {
+                  tmp[k] = str[j];
+                }
+            }
+          else
+            tmp[k] = str[j];
+          ++k;
+        }
     }
   SL_RETURN(tmp, _("unquote_string"));
@@ -306 +312 @@
 
 /* must fit an int              */
-#define TABSIZE 2048  
+/* #define TABSIZE 2048         */
+#define TABSIZE 65536
 
 /* must fit an unsigned short   */
@@ -386 +393 @@
  *
  **************************************************************/
+
 static int hashfunc(char *s) 
 {
@@ -392 +400 @@
   for ( ; *s; s++) 
     n = 31 * n + *s; 
-  return n % TABSIZE; 
+  return n & 0xFFFF;/* % TABSIZE*/; 
 } 
+
 
 int hashreport_missing( char *fullpath, int level)
@@ -635 +644 @@
   SL_ENTER(_("hashsearch"));
 
-  if (!s)
-    SL_RETURN( NULL, _("hashsearch"));
-
-  for (p = tab[hashfunc(s)]; p; p = p->next) 
-    if ((p->fullpath != NULL) && (0 == strcmp(s, p->fullpath))) 
-      SL_RETURN( p, _("hashsearch")); 
+  if (s)
+    {
+      for (p = tab[hashfunc(s)]; p; p = p->next)
+        if ((p->fullpath != NULL) && (0 == strcmp(s, p->fullpath))) 
+          SL_RETURN( p, _("hashsearch"));
+    } 
   SL_RETURN( NULL, _("hashsearch"));
 } 
@@ -672 +681 @@
         {
           if (p && p->fullpath && 
-              0 == strcmp(s->fullpath, p->fullpath) &&
-              strlen(s->fullpath) == strlen(p->fullpath))
+              0 == strcmp(s->fullpath, p->fullpath))
             {
               q = p->next;
@@ -3064 +3072 @@
 int hash_remove_tree (char * s) 
 {
-  sh_file_t * p;
-  int         len;
-  int         i;
+  sh_file_t *  p;
+  size_t       len;
+  unsigned int i;
 
   SL_ENTER(_("hash_remove_tree"));
 
-  if (!s)
+  if (!s || *s == '\0')
     SL_RETURN ((-1), _("hash_remove_tree"));
-  else
-    len = sl_strlen(s);
+
+  len = sl_strlen(s);
 
   if (IsInit != 1) 
@@ -3082 +3090 @@
       for (p = tab[i]; p; p = p->next)
         {
-          if (sl_strncmp(s, p->fullpath, len) == 0)
+          if (p->fullpath && 0 == strncmp(s, p->fullpath, len))
             { 
               p->allignore  = S_TRUE;