X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.c;h=f861028682f8c3391b440d475579c45e1c9e6f1e;hb=2c411d651e22704f60f117d944b9380a07d247fe;hp=e9411b65d950d444ee07dbfd155bdaeb982d1351;hpb=62c871225e944dbdb2a50e1253423952719145cf;p=pspp-builds.git diff --git a/src/data/file-name.c b/src/data/file-name.c index e9411b65..f8610286 100644 --- a/src/data/file-name.c +++ b/src/data/file-name.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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; }