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

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);