Changeset 13 for trunk/src/sh_database.c

Timestamp:

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

Author:

rainer

Message:

minor optimization

File:

• trunk/src/sh_database.c (modified) (4 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;
     }