Changeset 1536 in kBuild

Timestamp:

Apr 20, 2008 10:46:03 PM (17 years ago)

Author:

bird

Message:

Use the value_length if possible (saves strlen). Assert its correctness instead of fallbacks.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (4 diffs)
• variable.c (modified) (6 diffs)

trunk/src/kmk/expand.c

@@ -186 +186 @@
     return o;
 
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  if (!v->recursive)
+    {
+      assert (v->value_length == strlen (v->value));
+      o = variable_buffer_output (o, v->value, v->value_length);
+    }
+  else
+   {
+     value = recursively_expand (v);
+     o = variable_buffer_output (o, value, strlen (value));
+     free (value);
+   }
+#else  /* !CONFIG_WITH_VALUE_LENGTH */
   value = (v->recursive ? recursively_expand (v) : v->value);
 
@@ -192 +205 @@
   if (v->recursive)
     free (value);
+#endif /* !CONFIG_WITH_VALUE_LENGTH */
 
   return o;
@@ -572 +586 @@
   if (buf > variable_buffer)
     buf = variable_buffer_output (buf, " ", 1);
+#ifdef CONFIG_WITH_VALUE_LENGTH
+  assert (v->value_length == strlen (v->value));
+#endif
 
   /* Either expand it or copy it, depending.  */
   if (! v->recursive)
 #ifdef CONFIG_WITH_VALUE_LENGTH
-    return variable_buffer_output (buf, v->value,
-                                   v->value_length >= 0 ? v->value_length : strlen (v->value));
+    return variable_buffer_output (buf, v->value, v->value_length);
 #else
     return variable_buffer_output (buf, v->value, strlen (v->value));
@@ -583 +599 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
-  buf = variable_expand_string (buf, v->value, v->value_length >= 0 ? v->value_length : strlen (v->value));
+  buf = variable_expand_string (buf, v->value, v->value_length);
 #else
   buf = variable_expand_string (buf, v->value, strlen (v->value));

trunk/src/kmk/variable.c

@@ -131 +131 @@
     switch (length)
     {
-        default: 
+        default:
         case 32: //UPDATE_HASH(uvar_end[-16]);
-        case 31: UPDATE_HASH(uvar_end[-15]); 
-        case 30: //UPDATE_HASH(uvar_end[-14]); 
-        case 29: UPDATE_HASH(uvar_end[-13]); 
+        case 31: UPDATE_HASH(uvar_end[-15]);
+        case 30: //UPDATE_HASH(uvar_end[-14]);
+        case 29: UPDATE_HASH(uvar_end[-13]);
         case 28: //UPDATE_HASH(uvar_end[-12]);
-        case 27: UPDATE_HASH(uvar_end[-11]); 
-        case 26: //UPDATE_HASH(uvar_end[-10]); 
-        case 25: UPDATE_HASH(uvar_end[-9]); 
+        case 27: UPDATE_HASH(uvar_end[-11]);
+        case 26: //UPDATE_HASH(uvar_end[-10]);
+        case 25: UPDATE_HASH(uvar_end[-9]);
         case 24: //UPDATE_HASH(uvar[15]);
-        case 23: UPDATE_HASH(uvar[14]); 
+        case 23: UPDATE_HASH(uvar[14]);
         case 22: //UPDATE_HASH(uvar[13]);
-        case 21: UPDATE_HASH(uvar[12]); 
+        case 21: UPDATE_HASH(uvar[12]);
         case 20: //UPDATE_HASH(uvar[11]);
-        case 19: UPDATE_HASH(uvar[10]); 
+        case 19: UPDATE_HASH(uvar[10]);
         case 18: //UPDATE_HASH(uvar[9]);
         case 17: UPDATE_HASH(uvar[8]);
@@ -164 +164 @@
         case 2:  //UPDATE_HASH(uvar[1]);
         case 1:  UPDATE_HASH(uvar[0]);
-        case 0:  
+        case 0:
             return hash;
     }
@@ -190 +190 @@
     switch (length)
     {
-        default: 
+        default:
 #if 0 /* seems to be a waste of time. */
         case 97: UPDATE_HASH(uvar_end[-77]);
@@ -273 +273 @@
         case 21: UPDATE_HASH(uvar_end[-9]);
         case 20: UPDATE_HASH(uvar[7]);
-        case 19: UPDATE_HASH(uvar[6]);  
+        case 19: UPDATE_HASH(uvar[6]);
         case 18: UPDATE_HASH(uvar[5]);
         case 17: UPDATE_HASH(uvar[4]);
@@ -432 +432 @@
 # else
 #define PERFILE_VARIABLE_BUCKETS        23
-# endif 
+# endif
 #endif
 #ifndef SMALL_SCOPE_VARIABLE_BUCKETS
@@ -439 +439 @@
 # else
 #define SMALL_SCOPE_VARIABLE_BUCKETS    13
-# endif 
+# endif
 #endif