Change the parser to use the hashtable functions

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 078f3046f0fb5f183a9b0a1b9c73cbe28f0c9e0d..1bbbf96f21c701addd162498dc93633f9ff35deb 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2012
  *     Dale Weiler
+ *     Wolfgang Bumiller
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -477,44 +478,21 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
 
 size_t util_strtocmd(const char *in, char *out, size_t outsz) {
     size_t sz = 1;
-    for (; *in && sz < outsz; ++in, ++out, ++sz) {
-        if (*in == '-')
-            *out = '_';
-        else if (isalpha(*in) && !isupper(*in))
-            *out = *in + 'A' - 'a';
-        else
-            *out = *in;
-    }
+    for (; *in && sz < outsz; ++in, ++out, ++sz)
+        *out = (*in == '-') ? '_' : (isalpha(*in) && !isupper(*in)) ? *in + 'A' - 'a': *in;
     *out = 0;
     return sz-1;
 }
 
 size_t util_strtononcmd(const char *in, char *out, size_t outsz) {
     size_t sz = 1;
-    for (; *in && sz < outsz; ++in, ++out, ++sz) {
-        if (*in == '_')
-            *out = '-';
-        else if (isalpha(*in) && isupper(*in))
-            *out = *in + 'a' - 'A';
-        else
-            *out = *in;
-            
-        *out = (isalpha(*in) && isupper(*in)) ? *in + 'a' - 'A' : *in;
-    }
+    for (; *in && sz < outsz; ++in, ++out, ++sz)
+        *out = (*in == '_') ? '-' : (isalpha(*in) && isupper(*in)) ? *in + 'a' - 'A' : *in;
     *out = 0;
     return sz-1;
 }
 
 
-bool util_filexists(const char *file) {
-    FILE *fp = fopen(file, "rb");
-    if  (!fp) return false;
-    
-    /* it exists */
-    fclose(fp);
-    return true;
-}
-
 FILE *util_fopen(const char *filename, const char *mode)
 {
 #ifdef WIN32
@@ -542,15 +520,14 @@ void _util_vec_grow(void **a, size_t i, size_t s) {
  * EXPOSED INTERFACE comment below
  */
 typedef struct hash_node_t {
-    char               *key;  /* the key for this node in table */
-    void               *value; /* allocated memory storing data  */
-    size_t              size; /* size of data                   */
-    struct hash_node_t *next; /* next node (linked list)        */
+    char               *key;   /* the key for this node in table */
+    void               *value; /* pointer to the data as void*   */
+    struct hash_node_t *next;  /* next node (linked list)        */
 } hash_node_t;
 
 
-size_t _util_hthash(hash_table_t *ht, const char *key) {
-    uint64_t val;
+size_t util_hthash(hash_table_t *ht, const char *key) {
+    uint64_t val = 0;
     size_t   len = strlen(key);
     size_t   itr = 0;
     
@@ -565,7 +542,7 @@ size_t _util_hthash(hash_table_t *ht, const char *key) {
     return val % ht->size;
 }
 
-hash_node_t *_util_htnewpair(const char *key, void *value, size_t size) {
+hash_node_t *_util_htnewpair(const char *key, void *value) {
     hash_node_t *node;
     if (!(node = mem_a(sizeof(hash_node_t))))
         return NULL;
@@ -575,15 +552,8 @@ hash_node_t *_util_htnewpair(const char *key, void *value, size_t size) {
         return NULL;
     }
     
-    if (!(node->value = mem_a(size))) {
-        mem_d(node->key);
-        mem_d(node);
-        return NULL;
-    }
-    
-    memcpy(node->value, value, size);
-    node->size = size;
-    node->next = NULL;
+    node->value = value;
+    node->next  = NULL;
     
     return node;
 }
@@ -614,27 +584,22 @@ hash_table_t *util_htnew(size_t size) {
     return hashtable;
 }
 
-void util_htset(hash_table_t *ht, const char *key, void *value, size_t size) {
-    size_t bin = 0;
+void util_htseth(hash_table_t *ht, const char *key, size_t bin, void *value) {
     hash_node_t *newnode = NULL;
     hash_node_t *next    = NULL;
     hash_node_t *last    = NULL;
     
-    bin  = _util_hthash(ht, key);
     next = ht->table[bin];
     
-    while (next && next->key && strcmp(key, next->key))
+    while (next && next->key && strcmp(key, next->key) > 0)
         last = next, next = next->next;
     
     /* already in table, do a replace */
-    if (next && next->key && !strcmp(key, next->key)) {
-        mem_d(next->value);
-        next->value = mem_a(size);
-        next->size  = size;
-        memcpy(next->value, value, size);
+    if (next && next->key && strcmp(key, next->key) == 0) {
+        next->value = value;
     } else {
         /* not found, grow a pair man :P */
-        newnode = _util_htnewpair(key, value, size);
+        newnode = _util_htnewpair(key, value);
         if (next == ht->table[bin]) {
             newnode->next  = next;
             ht->table[bin] = newnode;
@@ -647,8 +612,11 @@ void util_htset(hash_table_t *ht, const char *key, void *value, size_t size) {
     }
 }
 
-void *util_htget(hash_table_t *ht, const char *key) {
-    size_t       bin  = _util_hthash(ht, key);
+void util_htset(hash_table_t *ht, const char *key, void *value) {
+    util_htseth(ht, key, util_hthash(ht, key), value);
+}
+
+void *util_htgeth(hash_table_t *ht, const char *key, size_t bin) {
     hash_node_t *pair = ht->table[bin];
     
     while (pair && pair->key && strcmp(key, pair->key) > 0)
@@ -660,6 +628,10 @@ void *util_htget(hash_table_t *ht, const char *key) {
     return pair->value;
 }
 
+void *util_htget(hash_table_t *ht, const char *key) {
+    return util_htgeth(ht, key, util_hthash(ht, key));
+}
+
 /*
  * Free all allocated data in a hashtable, this is quite the amount
  * of work.
@@ -671,8 +643,8 @@ void util_htdel(hash_table_t *ht) {
         
         /* free in list */
         while (n) {
-            if (n->key)   mem_d(n->key);
-            if (n->value) mem_d(n->value);
+            if (n->key)
+                mem_d(n->key);
             n = n->next;
         }