[gentoo-commits] proj/portage-utils:master commit in: libq/

[Fabian Groffen]

commit:     ea01f98af2c34f59b762f83f4a45717b53d9d635
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 14:34:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 14:34:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ea01f98a

libq/set: rename elem to set_elem

elem is a tad bit too generic a name

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 libq/set.c | 30 +++++++++++++++---------------
 libq/set.h |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libq/set.c b/libq/set.c
index 3b56f81..28c41a1 100644
--- a/libq/set.c
+++ b/libq/set.c
@@ -38,8 +38,8 @@ set *
 add_set(const char *name, set *q)
 {
        int pos;
-       elem *ll = xmalloc(sizeof(*ll));
-       elem *w;
+       set_elem *ll = xmalloc(sizeof(*ll));
+       set_elem *w;
 
        if (q == NULL)
                q = create_set();
@@ -68,8 +68,8 @@ add_set_unique(const char *name, set *q, bool *unique)
 {
        unsigned int hash;
        int pos;
-       elem *ll;
-       elem *w;
+       set_elem *ll;
+       set_elem *w;
        bool uniq = false;
 
        if (q == NULL)
@@ -117,8 +117,8 @@ add_set_value(const char *name, void *ptr, set *q)
 {
        unsigned int hash;
        int pos;
-       elem *ll;
-       elem *w;
+       set_elem *ll;
+       set_elem *w;
 
        hash = fnv1a32(name);
        pos = hash % _SET_HASH_SIZE;
@@ -154,7 +154,7 @@ contains_set(const char *name, set *q)
 {
        unsigned int hash;
        int pos;
-       elem *w;
+       set_elem *w;
        bool found;
 
        hash = fnv1a32(name);
@@ -180,7 +180,7 @@ get_set(const char *name, set *q)
 {
        unsigned int hash;
        int pos;
-       elem *w;
+       set_elem *w;
 
        hash = fnv1a32(name);
        pos = hash % _SET_HASH_SIZE;
@@ -205,8 +205,8 @@ del_set(const char *s, set *q, bool *removed)
 {
        unsigned int hash;
        int pos;
-       elem *ll;
-       elem *w;
+       set_elem *ll;
+       set_elem *w;
        void *ret;
        bool rmd;
 
@@ -248,7 +248,7 @@ size_t
 list_set(set *q, char ***l)
 {
        int i;
-       elem *w;
+       set_elem *w;
        char **ret;
 
        ret = *l = xmalloc(sizeof(char **) * (q->len + 1));
@@ -266,7 +266,7 @@ size_t
 values_set(set *q, array_t *ret)
 {
        int i;
-       elem *w;
+       set_elem *w;
        array_t blank = array_init_decl;
 
        *ret = blank;
@@ -289,8 +289,8 @@ void
 clear_set(set *q)
 {
        int i;
-       elem *w;
-       elem *e;
+       set_elem *w;
+       set_elem *e;
 
        for (i = 0; i < _SET_HASH_SIZE; i++) {
                for (w = q->buckets[i]; w != NULL; w = e) {
@@ -315,7 +315,7 @@ free_set(set *q)
 static void
 print_set(const set *q)
 {
-       elem *w;
+       set_elem *w;
        int i;
 
        for (i = 0; i < _SET_HASH_SIZE; i++) {

diff --git a/libq/set.h b/libq/set.h
index 8546a90..118d20d 100644
--- a/libq/set.h
+++ b/libq/set.h
@@ -12,19 +12,19 @@
 
 #include "xarray.h"
 
-typedef struct elem_t elem;
+typedef struct elem_t set_elem;
 typedef struct set_t set;
 
 struct elem_t {
        char *name;
        unsigned int hash;  /* FNV1a32 */
        void *val;
-       elem *next;
+       set_elem *next;
 };
 
 #define _SET_HASH_SIZE 128
 struct set_t {
-       elem *buckets[_SET_HASH_SIZE];
+       set_elem *buckets[_SET_HASH_SIZE];
        size_t len;
 };