summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2011-09-12 08:12:57 -0400
committerRyan Lortie <desrt@desrt.ca>2011-09-12 08:12:57 -0400
commit1b033919845cef366842373da9f1cfb56f522d01 (patch)
tree0c6c6402d0217fbc6577d62b80c1e50162470ab3
parent2d44a45b6ba2cf8de2ba1468013cad501e9858d8 (diff)
parent92652ac79177bcdced5f01122debb50eabdb3e2c (diff)
downloadglib-1b033919845cef366842373da9f1cfb56f522d01.tar.gz
Merge remote-tracking branch 'gvdb/master'
-rw-r--r--gio/gvdb/gvdb-builder.c2
-rw-r--r--gio/gvdb/gvdb-reader.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gio/gvdb/gvdb-builder.c b/gio/gvdb/gvdb-builder.c
index f65ca7dbd..91adec673 100644
--- a/gio/gvdb/gvdb-builder.c
+++ b/gio/gvdb/gvdb-builder.c
@@ -93,7 +93,7 @@ djb_hash (const gchar *key)
guint32 hash_value = 5381;
while (*key)
- hash_value = hash_value * 33 + *key++;
+ hash_value = hash_value * 33 + *(signed char *)key++;
return hash_value;
}
diff --git a/gio/gvdb/gvdb-reader.c b/gio/gvdb/gvdb-reader.c
index 0d9df37c7..cdd89e9d1 100644
--- a/gio/gvdb/gvdb-reader.c
+++ b/gio/gvdb/gvdb-reader.c
@@ -254,7 +254,7 @@ gvdb_table_lookup (GvdbTable *file,
return NULL;
for (key_length = 0; key[key_length]; key_length++)
- hash_value = (hash_value * 33) + key[key_length];
+ hash_value = (hash_value * 33) + ((signed char *) key)[key_length];
if (!gvdb_table_bloom_filter (file, hash_value))
return NULL;