Changeset 1901 for trunk/src/kmk/file.c

Timestamp:

Oct 21, 2008, 5:12:16 AM (17 years ago)

Author:

bird

Message:

kmk: fix for file_cache <-> file_strcache confusion bug introduced earlier tonight.

File:

• trunk/src/kmk/file.c (modified) (4 diffs)

trunk/src/kmk/file.c

@@ -47 +47 @@
   return_ISTRING_HASH_1 (((struct file const *) key)->hname);
 #else  /* CONFIG_WITH_STRCACHE2 */
-  return strcache2_get_ptr_hash (&file_cache, ((struct file const *) key)->hname);
+  return strcache2_get_ptr_hash (&file_strcache, ((struct file const *) key)->hname);
 #endif /* CONFIG_WITH_STRCACHE2 */
 }
@@ -57 +57 @@
   return_ISTRING_HASH_2 (((struct file const *) key)->hname);
 #else  /* CONFIG_WITH_STRCACHE2 */
-  return strcache2_get_ptr_hash (&file_cache, ((struct file const *) key)->hname);
+  return strcache2_get_ptr_hash (&file_strcache, ((struct file const *) key)->hname);
 #endif /* CONFIG_WITH_STRCACHE2 */
 }
@@ -223 +223 @@
 
   file_key.hname = name;
+#ifndef CONFIG_WITH_STRCACHE2
   file_slot = (struct file **) hash_find_slot (&files, &file_key);
+#else  /* CONFIG_WITH_STRCACHE2 */
+  file_slot = (struct file **) hash_find_slot_strcached (&files, &file_key);
+#endif /* CONFIG_WITH_STRCACHE2 */
   f = *file_slot;
   if (! HASH_VACANT (f) && !f->double_colon)
@@ -299 +303 @@
   /* Find where the newly renamed file will go in the hash.  */
   file_key.hname = to_hname;
+#ifndef CONFIG_WITH_STRCACHE2
   file_slot = (struct file **) hash_find_slot (&files, &file_key);
+#else  /* CONFIG_WITH_STRCACHE2 */
+  file_slot = (struct file **) hash_find_slot_strcached (&files, &file_key);
+#endif /* CONFIG_WITH_STRCACHE2 */
   to_file = *file_slot;