Changeset 1898 for trunk/src/kmk/commands.c

Timestamp:

Oct 21, 2008, 3:39:22 AM (17 years ago)

Author:

bird

Message:

kmk: strcache_get_len -> strcache2_get_len

File:

• trunk/src/kmk/commands.c (modified) (6 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