mtd: cfi_flash: Use ARRAY_SIZE at appropriate places

[u-boot] / lib / hashtable.c

diff --git a/lib/hashtable.c b/lib/hashtable.c
index e9226665f3454d8f1f5db60fd5e88bf6bf0c9a10..4cdbc95329c0d9d5892d81eed39254fc13796f2a 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -2,7 +2,7 @@
  * This implementation is based on code from uClibc-0.9.30.3 but was
  * modified and extended for use within U-Boot.
  *
- * Copyright (C) 2010 Wolfgang Denk <wd@denx.de>
+ * Copyright (C) 2010-2013 Wolfgang Denk <wd@denx.de>
  *
  * Original license header:
  *
@@ -55,7 +55,9 @@
 #endif
 
 #include <env_callback.h>
+#include <env_flags.h>
 #include <search.h>
+#include <slre.h>
 
 /*
  * [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
@@ -209,29 +211,6 @@ void hdestroy_r(struct hsearch_data *htab)
  *   example for functions like hdelete().
  */
 
-/*
- * hstrstr_r - return index to entry whose key and/or data contains match
- */
-int hstrstr_r(const char *match, int last_idx, ENTRY ** retval,
-             struct hsearch_data *htab)
-{
-       unsigned int idx;
-
-       for (idx = last_idx + 1; idx < htab->size; ++idx) {
-               if (htab->table[idx].used <= 0)
-                       continue;
-               if (strstr(htab->table[idx].entry.key, match) ||
-                   strstr(htab->table[idx].entry.data, match)) {
-                       *retval = &htab->table[idx].entry;
-                       return idx;
-               }
-       }
-
-       __set_errno(ESRCH);
-       *retval = NULL;
-       return 0;
-}
-
 int hmatch_r(const char *match, int last_idx, ENTRY ** retval,
             struct hsearch_data *htab)
 {
@@ -412,6 +391,8 @@ int hsearch_r(ENTRY item, ACTION action, ENTRY ** retval,
 
                /* This is a new entry, so look up a possible callback */
                env_callback_init(&htab->table[idx].entry);
+               /* Also look for flags */
+               env_flags_init(&htab->table[idx].entry);
 
                /* check for permission */
                if (htab->change_ok != NULL && htab->change_ok(
@@ -465,6 +446,7 @@ static void _hdelete(const char *key, struct hsearch_data *htab, ENTRY *ep,
        free((void *)ep->key);
        free(ep->data);
        ep->callback = NULL;
+       ep->flags = 0;
        htab->table[idx].used = -1;
 
        --htab->filled;
@@ -559,6 +541,65 @@ static int cmpkey(const void *p1, const void *p2)
        return (strcmp(e1->key, e2->key));
 }
 
+static int match_string(int flag, const char *str, const char *pat, void *priv)
+{
+       switch (flag & H_MATCH_METHOD) {
+       case H_MATCH_IDENT:
+               if (strcmp(str, pat) == 0)
+                       return 1;
+               break;
+       case H_MATCH_SUBSTR:
+               if (strstr(str, pat))
+                       return 1;
+               break;
+#ifdef CONFIG_REGEX
+       case H_MATCH_REGEX:
+               {
+                       struct slre *slrep = (struct slre *)priv;
+                       struct cap caps[slrep->num_caps + 2];
+
+                       if (slre_match(slrep, str, strlen(str), caps))
+                               return 1;
+               }
+               break;
+#endif
+       default:
+               printf("## ERROR: unsupported match method: 0x%02x\n",
+                       flag & H_MATCH_METHOD);
+               break;
+       }
+       return 0;
+}
+
+static int match_entry(ENTRY *ep, int flag,
+                int argc, char * const argv[])
+{
+       int arg;
+       void *priv = NULL;
+
+       for (arg = 1; arg < argc; ++arg) {
+#ifdef CONFIG_REGEX
+               struct slre slre;
+
+               if (slre_compile(&slre, argv[arg]) == 0) {
+                       printf("Error compiling regex: %s\n", slre.err_str);
+                       return 0;
+               }
+
+               priv = (void *)&slre;
+#endif
+               if (flag & H_MATCH_KEY) {
+                       if (match_string(flag, ep->key, argv[arg], priv))
+                               return 1;
+               }
+               if (flag & H_MATCH_DATA) {
+                       if (match_string(flag, ep->data, argv[arg], priv))
+                               return 1;
+               }
+       }
+       return 0;
+}
+
 ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
                 char **resp, size_t size,
                 int argc, char * const argv[])
@@ -585,14 +626,8 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
 
                if (htab->table[i].used > 0) {
                        ENTRY *ep = &htab->table[i].entry;
-                       int arg, found = 0;
+                       int found = match_entry(ep, flag, argc, argv);
 
-                       for (arg = 0; arg < argc; ++arg) {
-                               if (strcmp(argv[arg], ep->key) == 0) {
-                                       found = 1;
-                                       break;
-                               }
-                       }
                        if ((argc > 0) && (found == 0))
                                continue;
 
@@ -866,6 +901,12 @@ int himport_r(struct hsearch_data *htab,
                *sp++ = '\0';   /* terminate value */
                ++dp;
 
+               if (*name == 0) {
+                       debug("INSERT: unable to use an empty key\n");
+                       __set_errno(EINVAL);
+                       return 0;
+               }
+
                /* Skip variables which are not supposed to be processed */
                if (!drop_var_from_set(name, nvars, localvars))
                        continue;