Changeset 1999 in kBuild for trunk/src

Timestamp:

Oct 29, 2008 9:47:00 PM (17 years ago)

Author:

bird

Message:

variaiable::value_length -> unsigned int.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (2 diffs)
• function.c (modified) (1 diff)
• kbuild.c (modified) (3 diffs)
• variable.c (modified) (2 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -296 +296 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
-  assert ((unsigned int)v->value_length == strlen (v->value));
+  assert (v->value_length == strlen (v->value));
   if (!v->recursive)
     o = variable_buffer_output (o, v->value, v->value_length);
@@ -981 +981 @@
     buf = variable_buffer_output (buf, " ", 1);
 #ifdef CONFIG_WITH_VALUE_LENGTH
-  assert ((unsigned int)v->value_length == strlen (v->value)); /* FIXME */
+  assert (v->value_length == strlen (v->value));
 #endif
 

trunk/src/kmk/function.c

@@ -1762 +1762 @@
   if (v)
 #ifdef CONFIG_WITH_VALUE_LENGTH
-    o = variable_buffer_output (o, v->value,
-                                v->value_length >= 0
-                                ? (unsigned int)v->value_length /* FIXME */
-                                : strlen(v->value));
+    {
+      assert (v->value_length == strlen (v->value));
+      o = variable_buffer_output (o, v->value, v->value_length);
+    }
 #else
     o = variable_buffer_output (o, v->value, strlen(v->value));

trunk/src/kmk/kbuild.c

@@ -654 +654 @@
         assert(!pVar->rdonly_val);
 #endif
-        kbuild_apply_defpath(pDefPath, &pVar->value, (unsigned int *)&pVar->value_length, &pVar->value_alloc_len, 1);
+        kbuild_apply_defpath(pDefPath, &pVar->value, &pVar->value_length, &pVar->value_alloc_len, 1);
     }
     return pVar;
@@ -678 +678 @@
         assert(!pVar->rdonly_val);
 #endif
-        kbuild_apply_defpath(pDefPath, &pVar->value, (unsigned int *)&pVar->value_length, &pVar->value_alloc_len, 1);
+        kbuild_apply_defpath(pDefPath, &pVar->value, &pVar->value_length, &pVar->value_alloc_len, 1);
     }
     return pVar;
@@ -2068 +2068 @@
         assert(!pSource->rdonly_val);
 #endif
-        kbuild_apply_defpath(pDefPath, &pSource->value, (unsigned int *)&pSource->value_length, &pSource->value_alloc_len, 1 /* can free */);
+        kbuild_apply_defpath(pDefPath, &pSource->value, &pSource->value_length, &pSource->value_alloc_len, 1 /* can free */);
     }
 

trunk/src/kmk/variable.c

@@ -1378 +1378 @@
   if (*v->value == '\0' || v->origin == o_env || v->origin == o_env_override)
     {
-#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
       if (v->rdonly_val)
         v->rdonly_val = 0;
       else
-#endif
+# endif
         free (v->value);
       v->origin = o_file;
       v->value = xstrdup (default_shell);
-#ifdef CONFIG_WITH_VALUE_LENGTH
+# ifdef CONFIG_WITH_VALUE_LENGTH
       v->value_length = strlen (v->value);
       v->value_alloc_len = v->value_length + 1;
-#endif
+# endif
     }
 #endif
@@ -2253 +2253 @@
     return 0;
 
-  vp = do_variable_definition_2 (flocp, v.name, v.value,
-                                 v.value_length != -1 ? (unsigned int)v.value_length : ~0U, /* FIXME */
+  vp = do_variable_definition_2 (flocp, v.name, v.value, v.value_length,
                                  0, NULL, origin, v.flavor, target_var);
 #endif

trunk/src/kmk/variable.h

@@ -67 +67 @@
     int length;                 /* strlen (name) */
 #ifdef CONFIG_WITH_VALUE_LENGTH
-    int value_length;           /* The length of the value, usually unused.  */
+    unsigned int value_length;  /* The length of the value.  */
     unsigned int value_alloc_len; /* The amount of memory we've actually allocated. */
     /* FIXME: make lengths unsigned! */