X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=droute%2Fdroute-pairhash.c;h=c2f2c29933cb896085457b0ad8a910196d2c536f;hp=20ff4910cca63e8a6dc65843563a1e155863ac51;hb=683739dea15d7c02c217a404d8c5d9d7af076a57;hpb=b37f0b74994912dea13f33d63d3f1395554944b2 diff --git a/droute/droute-pairhash.c b/droute/droute-pairhash.c index 20ff491..c2f2c29 100644 --- a/droute/droute-pairhash.c +++ b/droute/droute-pairhash.c @@ -25,7 +25,7 @@ /*---------------------------------------------------------------------------*/ static guint -str_hash (guint32 h, const signed char *p) +str_hash (guint32 h, const char *p) { for (p += 1; *p != '\0'; p++) h = (h << 5) - h + *p; @@ -43,18 +43,24 @@ str_pair_new (const gchar *one, const gchar *two) pair = g_new (StrPair, 1); pair->one = one; pair->two = two; + return pair; } -gint +guint str_pair_hash (gconstpointer key) { StrPair *pair = (StrPair *) key; guint hash = 0; + /*g_return_val_if_fail (pair != NULL, 0); + g_return_val_if_fail (pair->one != NULL, 0); + g_return_val_if_fail (pair->two != NULL, 0); + */ + if (*(pair->two) != '\0') { hash = *(pair->two); - hash = str_hash (hash, ++(pair->two)); + hash = str_hash (hash, pair->two); hash = str_hash (hash, pair->one); }