Changeset 1898 in kBuild

Timestamp:

Oct 21, 2008 1:39:22 AM (16 years ago)

Author:

bird

Message:

kmk: strcache_get_len -> strcache2_get_len

Location:

trunk/src/kmk

Files:

• commands.c (modified) (6 diffs)
• file.c (modified) (4 diffs)
• read.c (modified) (7 diffs)

trunk/src/kmk/commands.c

@@ -96 +96 @@
         {
           name = file->name;
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
           len = strlen (name);
 #else
-          len = strcache_get_len (name);
+          len = strcache2_get_len (&file_strcache, name);
 #endif
         }
@@ -105 +105 @@
       for (d = enter_file (strcache_add (".SUFFIXES"))->deps; d ; d = d->next)
         {
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
           unsigned int slen = strlen (dep_name (d));
 #else
-          unsigned int slen = strcache_get_len (dep_name (d));
+          unsigned int slen = strcache2_get_len (&file_strcache, dep_name (d));
 #endif
           if (len > slen && strneq (dep_name (d), name + (len - slen), slen))
@@ -164 +164 @@
     for (d = file->deps; d != 0; d = d->next)
       if (! d->ignore_mtime)
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
         plus_len += strlen (dep_name (d)) + 1;
 #else
-        plus_len += strcache_get_len (dep_name (d)) + 1;
+        plus_len += strcache2_get_len (&file_strcache, dep_name (d)) + 1;
 #endif
     if (plus_len == 0)
@@ -190 +190 @@
           else
 #endif
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
             len = strlen (c);
 #else
-            len = strcache_get_len (c);
+            len = strcache2_get_len (&file_strcache, c);
 #endif
 
@@ -217 +217 @@
     for (d = file->deps; d != 0; d = d->next)
       if (d->ignore_mtime)
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
         bar_len += strlen (dep_name (d)) + 1;
 #else
-        bar_len += strcache_get_len (dep_name (d)) + 1;
+        bar_len += strcache2_get_len (&file_strcache, dep_name (d)) + 1;
 #endif
     if (bar_len == 0)
@@ -249 +249 @@
         else
 #endif
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
           len = strlen (c);
 #else
-          len = strcache_get_len (c);
+          len = strcache2_get_len (&file_strcache, c);
 #endif
 

trunk/src/kmk/file.c

@@ -414 +414 @@
    unsigned int len;
    char *tmp_name = allocated_variable_expand_2 (
-       f->name, strcache_get_len(f->name), &len);
+       f->name, strcache2_get_len (&file_strcache, f->name), &len);
    const char *name = strcache_add_len (tmp_name, len);
    free (tmp_name);
@@ -619 +619 @@
           p = variable_expand ("");
           buffer_offset = p - variable_buffer;
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
           variable_buffer_output (p, d->name, strlen (d->name) + 1);
 #else
-          len = strcache_get_len (d->name);
+          len = strcache2_get_len (&file_strcache, d->name);
           variable_buffer_output (p, d->name, len + 1);
 #endif
@@ -660 +660 @@
           set_file_variables (f);
 
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
           p = variable_expand_for_file (d->name, f);
 #else
-          len = strcache_get_len (d->name);
+          len = strcache2_get_len (&file_strcache, d->name);
           p = variable_expand_for_file_2 (NULL, d->name, len, f, &len);
 #endif
@@ -693 +693 @@
               percent = find_percent (nm);
 #else  /* KMK - don't make a stack copy unless it's actually required! */
-              unsigned int nl = strcache_get_len (dp->name);
+              unsigned int nl = strcache2_get_len (&file_strcache, dp->name);
               char *nm;
               percent = memchr (dp->name, '%', nl);

trunk/src/kmk/read.c

@@ -1540 +1540 @@
                     for (d2 = suffix_file->deps; d2 != 0; d2 = d2->next)
                       {
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
                         unsigned int l = strlen (dep_name (d2));
 #else
-                        unsigned int l = strcache_get_len (dep_name (d2));
+                        unsigned int l = strcache2_get_len (&file_strcache, dep_name (d2));
 #endif
                         if (!strneq (name, dep_name (d2), l))
@@ -2154 +2154 @@
 
 /* Remove duplicate dependencies in CHAIN.  */
-#ifndef CONFIG_WITH_VALUE_LENGTH
+#ifndef CONFIG_WITH_STRCACHE2
 
 static unsigned long
@@ -2185 +2185 @@
 }
 
-#else  /* CONFIG_WITH_VALUE_LENGTH */
+#else  /* CONFIG_WITH_STRCACHE2 */
 
 /* Exploit the fact that all names are in the string cache. This means equal
@@ -2196 +2196 @@
 {
   const char *name = dep_name ((struct dep const *) key);
-  assert (strcache_iscached (name));
+  assert (strcache2_is_cached (&file_strcache, name));
   return (size_t) name / sizeof(void *);
 }
@@ -2204 +2204 @@
 {
   const char *name = dep_name ((struct dep const *) key);
-  return strcache_get_len (name);
+  return strcache2_get_len (&file_strcache, name);
 }
 
@@ -2217 +2217 @@
 
   /* check preconds: both cached and the cache contains no duplicates. */
-  assert (strcache_iscached (dxname));
-  assert (strcache_iscached (dyname));
+  assert (strcache2_is_cached (&file_strcache, dxname));
+  assert (strcache2_is_cached (&file_strcache, dyname));
   assert (cmp == 0 || strcmp (dxname, dyname) != 0);
 
@@ -2231 +2231 @@
 }
 
-#endif /* CONFIG_WITH_VALUE_LENGTH */
+#endif /* CONFIG_WITH_STRCACHE2 */
 
 void