X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.c;h=91229595924c7bfe7fe11d1486970ae598950f5c;hb=bd17d2af982332ee1791998361b1ac6731fe14fa;hp=6be5ef0afa468b2705de8b95e88e328d8afca5c5;hpb=f5d9f9911bd04682a7edfb48521a12202e561e0a;p=pspp-builds.git

diff --git a/src/data/file-name.c b/src/data/file-name.c
index 6be5ef0a..91229595 100644
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -448,9 +448,9 @@ fn_compare_file_identities (const struct file_identity *a,
 unsigned int
 fn_hash_identity (const struct file_identity *identity)
 {
-  unsigned int hash = identity->device ^ identity->inode;
+  unsigned int hash = hash_int (identity->device, identity->inode);
   if (identity->name != NULL)
-    hash ^= hsh_hash_string (identity->name);
+    hash = hash_string (identity->name, hash);
   return hash;
 }
 
@@ -476,7 +476,6 @@ default_output_path (void)
 	  const char *home_drive = getenv ("HOMEDRIVE");
 	  const char *home_path = getenv ("HOMEPATH");
 
-
 	  if (home_drive != NULL && home_path != NULL)
 	    home_dir = xasprintf ("%s%s",
 				  home_drive, home_path);
@@ -494,7 +493,6 @@ default_output_path (void)
       else
         path = xstrdup (home_dir);
 
-
       for(i = 0; i < strlen (path); i++)
 	if (path[i] == '\\') path[i] = '/';
     }