Merge tag 'u-boot-rockchip-20200522' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / lib / hashtable.c

diff --git a/lib/hashtable.c b/lib/hashtable.c
index 1093d8adaa6a9a8df8b495dbbeabe7b93c2fbcde..b96dbe19be4dd52e0233e9d452f3201f6c57ad69 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -13,7 +13,9 @@
  */
 
 #include <errno.h>
+#include <log.h>
 #include <malloc.h>
+#include <sort.h>
 
 #ifdef USE_HOSTCC              /* HOST build */
 # include <string.h>
@@ -194,7 +196,7 @@ void hdestroy_r(struct hsearch_data *htab)
  *   data any more.
  * - The standard implementation does not provide a way to update an
  *   existing entry.  This version will create a new entry or update an
- *   existing one when both "action == ENTER" and "item.data != NULL".
+ *   existing one when both "action == ENV_ENTER" and "item.data != NULL".
  * - Instead of returning 1 on success, we return the index into the
  *   internal hash table, which is also guaranteed to be positive.
  *   This allows us direct access to the found hash table slot for
@@ -221,19 +223,30 @@ int hmatch_r(const char *match, int last_idx, struct env_entry **retval,
        return 0;
 }
 
+static int
+do_callback(const struct env_entry *e, const char *name, const char *value,
+           enum env_op op, int flags)
+{
+#ifndef CONFIG_SPL_BUILD
+       if (e->callback)
+               return e->callback(name, value, op, flags);
+#endif
+       return 0;
+}
+
 /*
  * Compare an existing entry with the desired key, and overwrite if the action
- * is ENTER.  This is simply a helper function for hsearch_r().
+ * is ENV_ENTER.  This is simply a helper function for hsearch_r().
  */
 static inline int _compare_and_overwrite_entry(struct env_entry item,
-               ACTION action, struct env_entry **retval,
+               enum env_action action, struct env_entry **retval,
                struct hsearch_data *htab, int flag, unsigned int hval,
                unsigned int idx)
 {
        if (htab->table[idx].used == hval
            && strcmp(item.key, htab->table[idx].entry.key) == 0) {
                /* Overwrite existing value? */
-               if ((action == ENTER) && (item.data != NULL)) {
+               if (action == ENV_ENTER && item.data) {
                        /* check for permission */
                        if (htab->change_ok != NULL && htab->change_ok(
                            &htab->table[idx].entry, item.data,
@@ -246,9 +259,8 @@ static inline int _compare_and_overwrite_entry(struct env_entry item,
                        }
 
                        /* If there is a callback, call it */
-                       if (htab->table[idx].entry.callback &&
-                           htab->table[idx].entry.callback(item.key,
-                           item.data, env_op_overwrite, flag)) {
+                       if (do_callback(&htab->table[idx].entry, item.key,
+                                       item.data, env_op_overwrite, flag)) {
                                debug("callback() rejected setting variable "
                                        "%s, skipping it!\n", item.key);
                                __set_errno(EINVAL);
@@ -272,8 +284,8 @@ static inline int _compare_and_overwrite_entry(struct env_entry item,
        return -1;
 }
 
-int hsearch_r(struct env_entry item, ACTION action, struct env_entry **retval,
-             struct hsearch_data *htab, int flag)
+int hsearch_r(struct env_entry item, enum env_action action,
+             struct env_entry **retval, struct hsearch_data *htab, int flag)
 {
        unsigned int hval;
        unsigned int count;
@@ -354,7 +366,7 @@ int hsearch_r(struct env_entry item, ACTION action, struct env_entry **retval,
        }
 
        /* An empty bucket has been found. */
-       if (action == ENTER) {
+       if (action == ENV_ENTER) {
                /*
                 * If table is full and another entry should be
                 * entered return with error.
@@ -401,9 +413,8 @@ int hsearch_r(struct env_entry item, ACTION action, struct env_entry **retval,
                }
 
                /* If there is a callback, call it */
-               if (htab->table[idx].entry.callback &&
-                   htab->table[idx].entry.callback(item.key, item.data,
-                   env_op_create, flag)) {
+               if (do_callback(&htab->table[idx].entry, item.key, item.data,
+                               env_op_create, flag)) {
                        debug("callback() rejected setting variable "
                                "%s, skipping it!\n", item.key);
                        _hdelete(item.key, htab, &htab->table[idx].entry, idx);
@@ -440,7 +451,6 @@ static void _hdelete(const char *key, struct hsearch_data *htab,
        debug("hdelete: DELETING key \"%s\"\n", key);
        free((void *)ep->key);
        free(ep->data);
-       ep->callback = NULL;
        ep->flags = 0;
        htab->table[idx].used = USED_DELETED;
 
@@ -456,7 +466,7 @@ int hdelete_r(const char *key, struct hsearch_data *htab, int flag)
 
        e.key = (char *)key;
 
-       idx = hsearch_r(e, FIND, &ep, htab, 0);
+       idx = hsearch_r(e, ENV_FIND, &ep, htab, 0);
        if (idx == 0) {
                __set_errno(ESRCH);
                return 0;       /* not found */
@@ -472,8 +482,8 @@ int hdelete_r(const char *key, struct hsearch_data *htab, int flag)
        }
 
        /* If there is a callback, call it */
-       if (htab->table[idx].entry.callback &&
-           htab->table[idx].entry.callback(key, NULL, env_op_delete, flag)) {
+       if (do_callback(&htab->table[idx].entry, key, NULL,
+                       env_op_delete, flag)) {
                debug("callback() rejected deleting variable "
                        "%s, skipping it!\n", key);
                __set_errno(EINVAL);
@@ -596,7 +606,7 @@ static int match_entry(struct env_entry *ep, int flag, int argc,
 
 ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
                 char **resp, size_t size,
-                int argc, char * const argv[])
+                int argc, char *const argv[])
 {
        struct env_entry *list[htab->size];
        char *res, *p;
@@ -931,7 +941,7 @@ int himport_r(struct hsearch_data *htab,
                e.key = name;
                e.data = value;
 
-               hsearch_r(e, ENTER, &rv, htab, flag);
+               hsearch_r(e, ENV_ENTER, &rv, htab, flag);
                if (rv == NULL)
                        printf("himport_r: can't insert \"%s=%s\" into hash table\n",
                                name, value);