Changeset 1898 for trunk/src/kmk/read.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/read.c (modified) (7 diffs)

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