projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
hash.c
diff --git
a/hash.c
b/hash.c
index
f042589
..
cb2cf2e
100644
(file)
--- a/
hash.c
+++ b/
hash.c
@@
-40,13
+40,13
@@
int hash_string (const unsigned char *s, int n)
HASH *hash_create (int nelem)
{
HASH *hash_create (int nelem)
{
- HASH *table =
safe
_malloc (sizeof (HASH));
+ HASH *table =
mem
_malloc (sizeof (HASH));
if (nelem == 0)
nelem = 2;
table->nelem = nelem;
table->curnelem = 0;
if (nelem == 0)
nelem = 2;
table->nelem = nelem;
table->curnelem = 0;
- table->table =
safe
_calloc (nelem, sizeof (struct hash_elem *));
+ table->table =
mem
_calloc (nelem, sizeof (struct hash_elem *));
return table;
}
return table;
}
@@
-63,11
+63,11
@@
HASH *hash_resize (HASH * ptr, int nelem)
tmp = elem;
elem = elem->next;
hash_insert (table, tmp->key, tmp->data, 1);
tmp = elem;
elem = elem->next;
hash_insert (table, tmp->key, tmp->data, 1);
-
FREE
(&tmp);
+
mem_free
(&tmp);
}
}
}
}
-
FREE
(&ptr->table);
-
FREE
(&ptr);
+
mem_free
(&ptr->table);
+
mem_free
(&ptr);
return table;
}
return table;
}
@@
-82,7
+82,7
@@
int hash_insert (HASH * table, const char *key, void *data, int allow_dup)
struct hash_elem *ptr;
int h;
struct hash_elem *ptr;
int h;
- ptr = (struct hash_elem *)
safe
_malloc (sizeof (struct hash_elem));
+ ptr = (struct hash_elem *)
mem
_malloc (sizeof (struct hash_elem));
h = hash_string ((unsigned char *) key, table->nelem);
ptr->key = key;
ptr->data = data;
h = hash_string ((unsigned char *) key, table->nelem);
ptr->key = key;
ptr->data = data;
@@
-97,9
+97,9
@@
int hash_insert (HASH * table, const char *key, void *data, int allow_dup)
int r;
for (tmp = table->table[h], last = NULL; tmp; last = tmp, tmp = tmp->next) {
int r;
for (tmp = table->table[h], last = NULL; tmp; last = tmp, tmp = tmp->next) {
- r =
mutt_str
cmp (tmp->key, key);
+ r =
str_
cmp (tmp->key, key);
if (r == 0) {
if (r == 0) {
-
FREE
(&ptr);
+
mem_free
(&ptr);
return (-1);
}
if (r > 0)
return (-1);
}
if (r > 0)
@@
-120,7
+120,7
@@
void *hash_find_hash (const HASH * table, int hash, const char *key)
struct hash_elem *ptr = table->table[hash];
for (; ptr; ptr = ptr->next) {
struct hash_elem *ptr = table->table[hash];
for (; ptr; ptr = ptr->next) {
- if (
mutt_str
cmp (key, ptr->key) == 0)
+ if (
str_
cmp (key, ptr->key) == 0)
return (ptr->data);
}
return NULL;
return (ptr->data);
}
return NULL;
@@
-133,11
+133,11
@@
void hash_delete_hash (HASH * table, int hash, const char *key, const void *data
struct hash_elem **last = &table->table[hash];
while (ptr) {
struct hash_elem **last = &table->table[hash];
while (ptr) {
- if ((data == ptr->data || !data) &&
mutt_str
cmp (ptr->key, key) == 0) {
+ if ((data == ptr->data || !data) &&
str_
cmp (ptr->key, key) == 0) {
*last = ptr->next;
if (destroy)
destroy (ptr->data);
*last = ptr->next;
if (destroy)
destroy (ptr->data);
-
FREE
(&ptr);
+
mem_free
(&ptr);
ptr = *last;
} else {
ptr = *last;
} else {
@@
-162,9
+162,9
@@
void hash_destroy (HASH ** ptr, void (*destroy) (void *))
elem = elem->next;
if (destroy)
destroy (tmp->data);
elem = elem->next;
if (destroy)
destroy (tmp->data);
-
FREE
(&tmp);
+
mem_free
(&tmp);
}
}
}
}
-
FREE
(&pptr->table);
-
FREE
(ptr);
+
mem_free
(&pptr->table);
+
mem_free
(ptr);
}
}