Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-30 08:30:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Bump sdb fixing disk storage issue

Browse Source
This commit is contained in:
pancake 2014-02-22 00:20:00 +01:00
parent d25cafe4d4
commit 5f11916d28
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shlr/sdb/src/disk.c
View File

@ -50,7 +50,7 @@ SDB_API int sdb_disk_create (Sdb* s) {
strcpy (str+nlen, ".tmp");
s->fdump = open (str, O_BINARY|O_RDWR|O_CREAT|O_TRUNC, 0644);
if (s->fdump == -1) {
fprintf (stderr, "sdb: Cannot open '%s' for writing.\n", str);
eprintf ("sdb: Cannot open '%s' for writing.\n", str);
free (str);
return 0;
}

24
shlr/sdb/src/sdb.c
View File

@ -124,7 +124,7 @@ SDB_API const char *sdb_const_get (Sdb* s, const char *key, ut32 *cas) {
if (cas) *cas = 0;
if (!s||!key) return NULL;
keylen = strlen (key)+1;
hash = sdb_hash (key, keylen);
hash = sdb_hash (key, keylen-1);
/* search in memory */
kv = (SdbKv*)ht_lookup (s->ht, hash);
@ -164,7 +164,7 @@ SDB_API char *sdb_get (Sdb* s, const char *key, ut32 *cas) {
if (cas) *cas = 0;
if (!s || !key) return NULL;
keylen = strlen (key)+1;
hash = sdb_hash (key, keylen);
hash = sdb_hash (key, keylen-1);
/* search in memory */
kv = (SdbKv*)ht_lookup (s->ht, hash);
@ -280,7 +280,7 @@ SDB_API int sdb_set (Sdb* s, const char *key, const char *val, ut32 cas) {
if (!sdb_check_value (val))
return 0;
klen = strlen (key)+1;
hash = sdb_hash (key, klen);
hash = sdb_hash (key, klen-1);
cdb_findstart (&s->db);
e = ht_search (s->ht, hash);
if (e) {
@ -312,16 +312,7 @@ SDB_API void sdb_foreach (Sdb* s, SdbForeachCallback cb, void *user) {
ls_foreach (s->ht->list, iter, kv) {
if (!kv->value || !*kv->value)
continue;
if (strchr (kv->value, SDB_RS)) {
char *o, *p = strdup (kv->value);
for (o=p; *o; o++) if (*o==SDB_RS) *o = ',';
o = malloc (strlen (kv->key)+3);
memcpy (o, "()", 2);
strcpy (o+2, kv->key);
cb (user, o, p);
free (o);
free (p);
} else cb (user, kv->key, kv->value);
cb (user, kv->key, kv->value);
}
}
@ -334,12 +325,7 @@ SDB_API void sdb_list (Sdb* s) {
ls_foreach (s->ht->list, iter, kv) {
if (!kv->value || !*kv->value)
continue;
if (strchr (kv->value, SDB_RS)) {
char *o, *p = strdup (kv->value);
for (o=p; *o; o++) if (*o==SDB_RS) *o = ',';
printf ("()%s=%s\n", kv->key, p);
free (p);
} else printf ("%s=%s\n", kv->key, kv->value);
printf ("%s=\"%s\"\n", kv->key, kv->value);
}
}