VIDEO: mx3fb: GCC4.6 fix build warnings

[u-boot] / lib / hashtable.c

diff --git a/lib/hashtable.c b/lib/hashtable.c
index 19d5b158eeff52bf74606d17e391901ddeb226d3..6895550d3cae5a7ac476f3aa8770542fefd87e1f 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -32,6 +32,7 @@
 #ifdef USE_HOSTCC              /* HOST build */
 # include <string.h>
 # include <assert.h>
+# include <ctype.h>
 
 # ifndef debug
 #  ifdef DEBUG
@@ -43,6 +44,7 @@
 #else                          /* U-Boot build */
 # include <common.h>
 # include <linux/string.h>
+# include <linux/ctype.h>
 #endif
 
 #ifndef        CONFIG_ENV_MIN_ENTRIES  /* minimum number of entries */
@@ -155,7 +157,7 @@ void hdestroy_r(struct hsearch_data *htab)
                if (htab->table[i].used > 0) {
                        ENTRY *ep = &htab->table[i].entry;
 
-                       free(ep->key);
+                       free((void *)ep->key);
                        free(ep->data);
                }
        }
@@ -416,7 +418,7 @@ int hdelete_r(const char *key, struct hsearch_data *htab)
        /* free used ENTRY */
        debug("hdelete: DELETING key \"%s\"\n", key);
 
-       free(ep->key);
+       free((void *)ep->key);
        free(ep->data);
        htab->table[idx].used = -1;
 
@@ -564,7 +566,7 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep,
         * export sorted list of result data
         */
        for (i = 0, p = res; i < n; ++i) {
-               char *s;
+               const char *s;
 
                s = list[i]->key;
                while (*s)
@@ -690,7 +692,7 @@ int himport_r(struct hsearch_data *htab,
                ENTRY e, *rv;
 
                /* skip leading white space */
-               while ((*dp == ' ') || (*dp == '\t'))
+               while (isblank(*dp))
                        ++dp;
 
                /* skip comment lines */