Changeset 18 for trunk/src/sh_tools.c

Timestamp:

Jan 28, 2006, 9:07:52 PM (19 years ago)

Author:

rainer

Message:

Optimized version of tiger algorithm, and basic ingredients for unit testing (part 2)

File:

• trunk/src/sh_tools.c (modified) (6 diffs)

trunk/src/sh_tools.c

@@ -125 +125 @@
 char * sh_tools_safe_name (const char * instr, int flag)
 {
-  unsigned char c;
+  unsigned char c, d;
   const  char * p;
   char   *q;
@@ -133 +133 @@
   int    i = 0;
   unsigned char   val_octal = '\0';
+  static char ctable[16] = { '0', '1', '2', '3', '4', '5', '6', '7', 
+                             '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; 
 
   SL_ENTER(_("sh_tools_safe_name"));
@@ -202 +204 @@
             {
               --i;
-              sprintf(&outstr[i], "=%02x", c);          /* known to fit  */
+              d = c % 16; c = c / 16;
+              outstr[i] = '=';       ++i;
+              outstr[i] = ctable[c]; ++i;
+              outstr[i] = ctable[d]; ++i;
             }
 
@@ -274 +279 @@
             break;
           default:
-            if (strlen(p) < 3)
+            if (strlen(p) < 3) /* certainly not an octal number, skip */
               {
                 p += strlen(p);
@@ -284 +289 @@
                 if (val_octal != '\0') { 
                   c = val_octal;
-                  sprintf(&outstr[i], "=%02x", c);       /* known to fit  */
-                  i+=3;
+                  d = c % 16; c = c / 16;
+                  outstr[i] = '=';       ++i;
+                  outstr[i] = ctable[c]; ++i;
+                  outstr[i] = ctable[d]; ++i;
                 } 
                 p += 3;
@@ -294 +301 @@
         {
           ++p;
-          if (!p || !(*p)) 
-            break;
+          if (!p || !(*p))
+            {
+              outstr[i] = '&'; ++i;
+              break;
+            }
 
           if (p[0] == 'a' && p[1] == 'm' && p[2] == 'p' && p[3] == ';')