Mirrors_Framework/gear-lib
1
0
Fork 0
mirror of https://github.com/gozfree/gear-lib.git synced 2026-02-06 11:04:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[libdict] fix dict_lookup return NULL

Browse Source 
bug is from 02db43e0d0
	but need find why the patch merged
This commit is contained in:
gozfree
2023-02-12 11:04:50 +08:00
parent c6637864bb
commit 57f2a418a7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gear-lib/libdict/libdict.c
View File

@@ -146,6 +146,7 @@ static keypair *dict_lookup(dict *d, char *key, uint32_t hash)
uint32_t perturb;
if (!d || !key) {
printf("%s:%d invalid paraments!\n", __func__, __LINE__);
return NULL;
}
@@ -164,7 +165,7 @@ static keypair *dict_lookup(dict *d, char *key, uint32_t hash)
}
freeslot = NULL;
}
for (perturb = hash; perturb > 0; perturb >>= PERTURB_SHIFT) {
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
i = (i<<2) + i + perturb + 1;
i &= (d->size-1);
ep = d->table + i;
@@ -226,7 +227,7 @@ int dict_add(dict *d, char *key, char *val)
return -1;
}
#if DEBUG>2
#if DEBUG>1
printf("dict_add[%s][%s]\n", key, val ? val : "UNDEF");
#endif
hash = dict_hash(key, strlen(key));
@@ -252,6 +253,9 @@ int dict_add(dict *d, char *key, char *val)
return -1;
}
}
} else {
printf("dict_lookup key:%s hash:0x%x empty!\n", key, hash);
return -1;
}
return 0;
}
@@ -318,7 +322,6 @@ dict *dict_new(void)
free(d);
return NULL;
}
memset(d->table, -1, DICT_MIN_SZ*sizeof(keypair));
return d;
}

2
gear-lib/libdict/test_libdict.c
View File

@@ -76,10 +76,10 @@ int test(int argc, char * argv[])
}
#if DEBUG>1
printf("exp[%s] got[%s]\n", buffer+i*9, val);
#endif
if (val && strcmp(val, buffer+i*9)) {
printf("-> WRONG got[%s] exp[%s]\n", val, buffer+i*9);
}
#endif
}
t2 = epoch_double();
printf(ALIGN, "lookup", t2 - t1);