summaryrefslogtreecommitdiffstats
path: root/src/misc/st/st.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/misc/st/st.c')
-rw-r--r--src/misc/st/st.c115
1 files changed, 67 insertions, 48 deletions
diff --git a/src/misc/st/st.c b/src/misc/st/st.c
index 13e9bd6a..872fe51b 100644
--- a/src/misc/st/st.c
+++ b/src/misc/st/st.c
@@ -8,12 +8,31 @@
*
*/
#include <stdio.h>
-#include "util.h"
+#include <stdlib.h>
#include "st.h"
+#ifndef ABS
+# define ABS(a) ((a) < 0 ? -(a) : (a))
+#endif
+
+#ifndef ALLOC
+#define ALLOC(type, num) ((type *) malloc(sizeof(type) * (num)))
+#endif
+
+#ifndef FREE
+#define FREE(obj) ((obj) ? (free((char *) (obj)), (obj) = 0) : 0)
+#endif
+
+#ifndef REALLOC
+#define REALLOC(type, obj, num) \
+ ((obj) ? ((type *) realloc((char *)(obj), sizeof(type) * (num))) : \
+ ((type *) malloc(sizeof(type) * (num))))
+#endif
+
#define ST_NUMCMP(x,y) ((x) != (y))
#define ST_NUMHASH(x,size) (ABS((long)x)%(size))
-#define ST_PTRHASH(x,size) ((int)((unsigned long)(x)>>2)%size)
+//#define ST_PTRHASH(x,size) ((int)((unsigned long)(x)>>2)%size) // 64-bit bug fix 9/17/2007
+#define ST_PTRHASH(x,size) ((int)(((unsigned long)(x)>>2)%size))
#define EQUAL(func, x, y) \
((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\
(ST_NUMCMP((x),(y)) == 0) : ((*func)((x), (y)) == 0))
@@ -41,8 +60,8 @@ int reorder_flag;
st_table *new;
new = ALLOC(st_table, 1);
- if (new == NIL(st_table)) {
- return NIL(st_table);
+ if (new == NULL) {
+ return NULL;
}
new->compare = compare;
new->hash = hash;
@@ -55,9 +74,9 @@ int reorder_flag;
}
new->num_bins = size;
new->bins = ALLOC(st_table_entry *, size);
- if (new->bins == NIL(st_table_entry *)) {
+ if (new->bins == NULL) {
FREE(new);
- return NIL(st_table);
+ return NULL;
}
for(i = 0; i < size; i++) {
new->bins[i] = 0;
@@ -85,7 +104,7 @@ st_table *table;
for(i = 0; i < table->num_bins ; i++) {
ptr = table->bins[i];
- while (ptr != NIL(st_table_entry)) {
+ while (ptr != NULL) {
next = ptr->next;
FREE(ptr);
ptr = next;
@@ -96,7 +115,7 @@ st_table *table;
}
#define PTR_NOT_EQUAL(table, ptr, user_key)\
-(ptr != NIL(st_table_entry) && !EQUAL(table->compare, user_key, (ptr)->key))
+(ptr != NULL && !EQUAL(table->compare, user_key, (ptr)->key))
#define FIND_ENTRY(table, hash_val, key, ptr, last) \
(last) = &(table)->bins[hash_val];\
@@ -104,7 +123,7 @@ st_table *table;
while (PTR_NOT_EQUAL((table), (ptr), (key))) {\
(last) = &(ptr)->next; (ptr) = *(last);\
}\
- if ((ptr) != NIL(st_table_entry) && (table)->reorder_flag) {\
+ if ((ptr) != NULL && (table)->reorder_flag) {\
*(last) = (ptr)->next;\
(ptr)->next = (table)->bins[hash_val];\
(table)->bins[hash_val] = (ptr);\
@@ -123,10 +142,10 @@ char **value;
FIND_ENTRY(table, hash_val, key, ptr, last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
return 0;
} else {
- if (value != NIL(char *)) {
+ if (value != NULL) {
*value = ptr->record;
}
return 1;
@@ -146,10 +165,10 @@ int *value;
FIND_ENTRY(table, hash_val, key, ptr, last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
return 0;
} else {
- if (value != NIL(int)) {
+ if (value != 0) {
*value = (long) ptr->record;
}
return 1;
@@ -187,7 +206,7 @@ char *value;
FIND_ENTRY(table, hash_val, key, ptr, last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
if (table->num_entries/table->num_bins >= table->max_density) {
if (rehash(table) == ST_OUT_OF_MEM) {
return ST_OUT_OF_MEM;
@@ -195,7 +214,7 @@ char *value;
hash_val = do_hash(key, table);
}
new = ALLOC(st_table_entry, 1);
- if (new == NIL(st_table_entry)) {
+ if (new == NULL) {
return ST_OUT_OF_MEM;
}
new->key = key;
@@ -227,7 +246,7 @@ char *value;
}
hash_val = do_hash(key, table);
new = ALLOC(st_table_entry, 1);
- if (new == NIL(st_table_entry)) {
+ if (new == NULL) {
return ST_OUT_OF_MEM;
}
new->key = key;
@@ -251,7 +270,7 @@ char ***slot;
FIND_ENTRY(table, hash_val, key, ptr, last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
if (table->num_entries / table->num_bins >= table->max_density) {
if (rehash(table) == ST_OUT_OF_MEM) {
return ST_OUT_OF_MEM;
@@ -259,7 +278,7 @@ char ***slot;
hash_val = do_hash(key, table);
}
new = ALLOC(st_table_entry, 1);
- if (new == NIL(st_table_entry)) {
+ if (new == NULL) {
return ST_OUT_OF_MEM;
}
new->key = key;
@@ -267,10 +286,10 @@ char ***slot;
new->next = table->bins[hash_val];
table->bins[hash_val] = new;
table->num_entries++;
- if (slot != NIL(char **)) *slot = &new->record;
+ if (slot != NULL) *slot = &new->record;
return 0;
} else {
- if (slot != NIL(char **)) *slot = &ptr->record;
+ if (slot != NULL) *slot = &ptr->record;
return 1;
}
}
@@ -288,10 +307,10 @@ char ***slot;
FIND_ENTRY(table, hash_val, key, ptr, last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
return 0;
} else {
- if (slot != NIL(char **)) {
+ if (slot != NULL) {
*slot = &ptr->record;
}
return 1;
@@ -317,7 +336,7 @@ register st_table *table;
}
table->num_entries = 0;
table->bins = ALLOC(st_table_entry *, table->num_bins);
- if (table->bins == NIL(st_table_entry *)) {
+ if (table->bins == NULL) {
table->bins = old_bins;
table->num_bins = old_num_bins;
table->num_entries = old_num_entries;
@@ -331,7 +350,7 @@ register st_table *table;
/* copy data over */
for (i = 0; i < old_num_bins; i++) {
ptr = old_bins[i];
- while (ptr != NIL(st_table_entry)) {
+ while (ptr != NULL) {
next = ptr->next;
hash_val = do_hash(ptr->key, table);
ptr->next = table->bins[hash_val];
@@ -354,25 +373,25 @@ st_table *old_table;
int i, j, num_bins = old_table->num_bins;
new_table = ALLOC(st_table, 1);
- if (new_table == NIL(st_table)) {
- return NIL(st_table);
+ if (new_table == NULL) {
+ return NULL;
}
*new_table = *old_table;
new_table->bins = ALLOC(st_table_entry *, num_bins);
- if (new_table->bins == NIL(st_table_entry *)) {
+ if (new_table->bins == NULL) {
FREE(new_table);
- return NIL(st_table);
+ return NULL;
}
for(i = 0; i < num_bins ; i++) {
- new_table->bins[i] = NIL(st_table_entry);
+ new_table->bins[i] = NULL;
ptr = old_table->bins[i];
- while (ptr != NIL(st_table_entry)) {
+ while (ptr != NULL) {
new = ALLOC(st_table_entry, 1);
- if (new == NIL(st_table_entry)) {
+ if (new == NULL) {
for (j = 0; j <= i; j++) {
newptr = new_table->bins[j];
- while (newptr != NIL(st_table_entry)) {
+ while (newptr != NULL) {
next = newptr->next;
FREE(newptr);
newptr = next;
@@ -380,7 +399,7 @@ st_table *old_table;
}
FREE(new_table->bins);
FREE(new_table);
- return NIL(st_table);
+ return NULL;
}
*new = *ptr;
new->next = new_table->bins[i];
@@ -405,12 +424,12 @@ char **value;
FIND_ENTRY(table, hash_val, key, ptr ,last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
return 0;
}
*last = ptr->next;
- if (value != NIL(char *)) *value = ptr->record;
+ if (value != NULL) *value = ptr->record;
*keyp = ptr->key;
FREE(ptr);
table->num_entries--;
@@ -431,12 +450,12 @@ char **value;
FIND_ENTRY(table, hash_val, key, ptr ,last);
- if (ptr == NIL(st_table_entry)) {
+ if (ptr == NULL) {
return 0;
}
*last = ptr->next;
- if (value != NIL(char *)) *value = ptr->record;
+ if (value != NULL) *value = ptr->record;
*keyp = (long) ptr->key;
FREE(ptr);
table->num_entries--;
@@ -455,7 +474,7 @@ char *arg;
for(i = 0; i < table->num_bins; i++) {
last = &table->bins[i]; ptr = *last;
- while (ptr != NIL(st_table_entry)) {
+ while (ptr != NULL) {
retval = (*func)(ptr->key, ptr->record, arg);
switch (retval) {
case ST_CONTINUE:
@@ -528,11 +547,11 @@ st_table *table;
st_generator *gen;
gen = ALLOC(st_generator, 1);
- if (gen == NIL(st_generator)) {
- return NIL(st_generator);
+ if (gen == NULL) {
+ return NULL;
}
gen->table = table;
- gen->entry = NIL(st_table_entry);
+ gen->entry = NULL;
gen->index = 0;
return gen;
}
@@ -546,16 +565,16 @@ char **value_p;
{
register int i;
- if (gen->entry == NIL(st_table_entry)) {
+ if (gen->entry == NULL) {
/* try to find next entry */
for(i = gen->index; i < gen->table->num_bins; i++) {
- if (gen->table->bins[i] != NIL(st_table_entry)) {
+ if (gen->table->bins[i] != NULL) {
gen->index = i+1;
gen->entry = gen->table->bins[i];
break;
}
}
- if (gen->entry == NIL(st_table_entry)) {
+ if (gen->entry == NULL) {
return 0; /* that's all folks ! */
}
}
@@ -576,21 +595,21 @@ long *value_p;
{
register int i;
- if (gen->entry == NIL(st_table_entry)) {
+ if (gen->entry == NULL) {
/* try to find next entry */
for(i = gen->index; i < gen->table->num_bins; i++) {
- if (gen->table->bins[i] != NIL(st_table_entry)) {
+ if (gen->table->bins[i] != NULL) {
gen->index = i+1;
gen->entry = gen->table->bins[i];
break;
}
}
- if (gen->entry == NIL(st_table_entry)) {
+ if (gen->entry == NULL) {
return 0; /* that's all folks ! */
}
}
*key_p = gen->entry->key;
- if (value_p != NIL(long)) {
+ if (value_p != 0) {
*value_p = (long) gen->entry->record;
}
gen->entry = gen->entry->next;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 16:15:41 +0000