Changeset 1946 in kBuild

Timestamp:

Oct 26, 2008 3:09:15 AM (16 years ago)

Author:

bird

Message:

kmk: Caught a variable::value update that I'd missed when implementing CONFIG_WITH_VALUE_LENGTH.

Location:

trunk/src/kmk

Files:

• read.c (modified) (1 diff)
• variable.c (modified) (2 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/read.c

@@ -2445 +2445 @@
         {
           struct variable *gv;
+#ifndef CONFIG_WITH_STRCACHE2
           int len = strlen(v->name);
+#else
+          int len = strcache2_get_len (&variable_strcache, v->name);
+#endif
 
           gv = lookup_variable (v->name, len);
           if (gv && (gv->origin == o_env_override || gv->origin == o_command))
             {
+#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+              assert (!v->rdonly_val); /* paranoia */
+#endif
               if (v->value != 0)
                 free (v->value);
+#ifndef CONFIG_WITH_VALUE_LENGTH
               v->value = xstrdup (gv->value);
+#else
+              v->value = savestring (gv->value, gv->value_length);
+              v->value_length = gv->value_length;
+#endif
               v->origin = gv->origin;
               v->recursive = gv->recursive;

trunk/src/kmk/variable.c

@@ -108 +108 @@
 
 #ifdef CONFIG_WITH_STRCACHE2
-static struct strcache2 variable_strcache;
+struct strcache2 variable_strcache;
 #endif
 
@@ -609 +609 @@
   /* lookup the name in the string case, if it's not there it won't
      be in any of the sets either. */
-  cached_name = strcache2_lookup(&variable_strcache, name, length);
+  cached_name = strcache2_lookup (&variable_strcache, name, length);
   if (!cached_name)
     return NULL;

trunk/src/kmk/variable.h

@@ -427 +427 @@
 
 extern int export_all_variables;
+#ifdef CONFIG_WITH_STRCACHE2
+extern struct strcache2 variable_strcache;
+#endif
 
 #ifdef KMK