env: Drop _ENTRY

This typedef does not need to be defined in the search.h header since it
is only used in one file (hashtable.c). Remove it from the header and
change it to a struct.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/search.h b/include/search.h
index 81745a917d6a2787767cf6dc419bdccc5a08df3b..c99648f80b76dc38b4bab91db954fe73fc46e41b 100644 (file)
--- a/include/search.h
+++ b/include/search.h
@@ -34,9 +34,6 @@ struct env_entry {
        int flags;
 };
 
-/* Opaque type for internal use.  */
-struct _ENTRY;
-
 /*
  * Family of hash table handling functions.  The functions also
  * have reentrant counterparts ending with _r.  The non-reentrant
@@ -45,7 +42,7 @@ struct _ENTRY;
 
 /* Data type for reentrant functions.  */
 struct hsearch_data {
-       struct _ENTRY *table;
+       struct env_entry_node *table;
        unsigned int size;
        unsigned int filled;
 /*

diff --git a/lib/hashtable.c b/lib/hashtable.c
index c77b68f4e6273ba5f9b9f35468a13d04e582fea9..1093d8adaa6a9a8df8b495dbbeabe7b93c2fbcde 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -59,10 +59,10 @@
  * which describes the current status.
  */
 
-typedef struct _ENTRY {
+struct env_entry_node {
        int used;
        struct env_entry entry;
-} _ENTRY;
+};
 
 
 static void _hdelete(const char *key, struct hsearch_data *htab,
@@ -120,7 +120,8 @@ int hcreate_r(size_t nel, struct hsearch_data *htab)
        htab->filled = 0;
 
        /* allocate memory and zero out */
-       htab->table = (_ENTRY *) calloc(htab->size + 1, sizeof(_ENTRY));
+       htab->table = (struct env_entry_node *)calloc(htab->size + 1,
+                                               sizeof(struct env_entry_node));
        if (htab->table == NULL)
                return 0;