[U-Boot] [PATCH v2 2/3] env: check and apply changes on delete/destroy

Gerlando Falauto
2011-12-07T13:30:04Z

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
---
common/cmd_nvedit.c | 2 +-
include/search.h | 6 ++++--
lib/hashtable.c | 18 ++++++++++++------
3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index a31d413..871b3b1 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -377,7 +377,7 @@ int _do_env_set(int flag, int argc, char * const argv[])

/* Delete only ? */
if (argc < 3 || argv[2] == NULL) {
- int rc = hdelete_r(name, &env_htab);
+ int rc = hdelete_r(name, &env_htab, NULL);
return !rc;
}

diff --git a/include/search.h b/include/search.h
index 2a59e03..7ad4261 100644
--- a/include/search.h
+++ b/include/search.h
@@ -70,7 +70,8 @@ struct hsearch_data {
extern int hcreate_r(size_t __nel, struct hsearch_data *__htab);

/* Destroy current internal hashing table. */
-extern void hdestroy_r(struct hsearch_data *__htab);
+extern void hdestroy_r(struct hsearch_data *__htab,
+ apply_cb apply);

/*
* Search for entry matching ITEM.key in internal hash table. If
@@ -95,7 +96,8 @@ extern int hstrstr_r(const char *__match, int __last_idx, ENTRY ** __retval,
struct hsearch_data *__htab);

/* Search and delete entry matching ITEM.key in internal hash table. */
-extern int hdelete_r(const char *__key, struct hsearch_data *__htab);
+extern int hdelete_r(const char *__key, struct hsearch_data *__htab,
+ apply_cb apply);

extern ssize_t hexport_r(struct hsearch_data *__htab,
const char __sep, char **__resp, size_t __size,
diff --git a/lib/hashtable.c b/lib/hashtable.c
index 75b9b07..87adc01 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -142,7 +142,8 @@ int hcreate_r(size_t nel, struct hsearch_data *htab)
* be freed and the local static variable can be marked as not used.
*/

-void hdestroy_r(struct hsearch_data *htab)
+void hdestroy_r(struct hsearch_data *htab,
+ int(*apply)(const char *, const char *, const char *, int))
{
int i;

@@ -156,7 +157,10 @@ void hdestroy_r(struct hsearch_data *htab)
for (i = 1; i <= htab->size; ++i) {
if (htab->table[i].used > 0) {
ENTRY *ep = &htab->table[i].entry;
-
+ if (apply != NULL) {
+ /* deletion is always forced */
+ apply(ep->key, ep->data, NULL, H_FORCE);
+ }
free((void *)ep->key);
free(ep->data);
}
@@ -401,7 +405,8 @@ int hsearch_r(ENTRY item, ACTION action, ENTRY ** retval,
* do that.
*/

-int hdelete_r(const char *key, struct hsearch_data *htab)
+int hdelete_r(const char *key, struct hsearch_data *htab,
+ int(*apply)(const char *, const char *, const char *, int))
{
ENTRY e, *ep;
int idx;
@@ -417,7 +422,8 @@ int hdelete_r(const char *key, struct hsearch_data *htab)

/* free used ENTRY */
debug("hdelete: DELETING key \"%s\"\n", key);
-
+ if (apply != NULL)
+ apply(ep->key, ep->data, NULL, H_FORCE);
free((void *)ep->key);
free(ep->data);
htab->table[idx].used = -1;
@@ -681,7 +687,7 @@ int himport_r(struct hsearch_data *htab,
debug("Destroy Hash Table: %p table = %p\n", htab,
htab->table);
if (htab->table)
- hdestroy_r(htab);
+ hdestroy_r(htab, apply);
}

/*
@@ -747,7 +753,7 @@ int himport_r(struct hsearch_data *htab,
if (!process_var(name, nvars, vars))
continue;

- if (hdelete_r(name, htab) == 0)
+ if (hdelete_r(name, htab, apply) == 0)
debug("DELETE ERROR ##############################\n");

continue;
--
1.7.1