Changeset feeac0d in mainline for uspace/lib/c

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

uspace/lib/c

Files:

• generic/adt/hash_table.c (modified) (2 diffs)
• generic/adt/list.c (modified) (1 diff)
• generic/cfg.c (modified) (3 diffs)
• generic/devman.c (modified) (1 diff)
• generic/pio_trace.c (modified) (2 diffs)
• include/adt/list.h (modified) (3 diffs)
• include/cfg.h (modified) (2 diffs)

uspace/lib/c/generic/adt/hash_table.c

@@ -227 +227 @@
         
         /* Check for duplicates. */
-        list_foreach(h->bucket[idx], cur) {
+        list_foreach(h->bucket[idx], link, ht_link_t, cur_link) {
                 /* 
                  * We could filter out items using their hashes first, but 
                  * calling equal() might very well be just as fast.
                  */
-                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
                 if (h->op->equal(cur_link, item))
                         return false;
@@ -258 +257 @@
         size_t idx = h->op->key_hash(key) % h->bucket_cnt;
 
-        list_foreach(h->bucket[idx], cur) {
-                ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link);
+        list_foreach(h->bucket[idx], link, ht_link_t, cur_link) {
                 /* 
                  * Is this is the item we are looking for? We could have first 

uspace/lib/c/generic/adt/list.c

@@ -102 +102 @@
         unsigned int count = 0;
         
-        list_foreach(*list, link) {
+        link_t *link = list_first(list);
+        while (link != NULL) {
                 count++;
+                link = list_next(link, list);
         }
         

uspace/lib/c/generic/cfg.c

@@ -83 +83 @@
                 return true;
         
-        list_foreach(data->sections, link) {
-                const cfg_section_t *section = cfg_section_instance(link);
-                
+        cfg_file_foreach(data, section) {
                 if (!list_empty(&section->entries))
                         return false;
@@ -413 +411 @@
 const cfg_section_t *cfg_find_section(const cfg_file_t *data, const char *title)
 {
-        list_foreach(data->sections, link) {
-                const cfg_section_t *section = cfg_section_instance(link);
-                
+        cfg_file_foreach(data, section) {
                 if (str_cmp(section->title, title) == 0)
                         return section;
@@ -434 +430 @@
 const char *cfg_find_value(const cfg_section_t *section, const char *key)
 {
-        list_foreach(section->entries, link) {
-                const cfg_entry_t *entry = cfg_entry_instance(link);
-                
+        cfg_section_foreach(section, entry) {
                 if (str_cmp(entry->key, key) == 0)
                         return entry->value;

uspace/lib/c/generic/devman.c

@@ -230 +230 @@
         }
         
-        match_id_t *match_id = NULL;
-        
-        list_foreach(match_ids->ids, link) {
-                match_id = list_get_instance(link, match_id_t, link);
-                
+        list_foreach(match_ids->ids, link, match_id_t, match_id) {
                 ipc_call_t answer2;
                 aid_t req2 = async_send_1(exch, DEVMAN_ADD_MATCH_ID,

uspace/lib/c/generic/pio_trace.c

@@ -95 +95 @@
         pio_regions_t *regions = get_regions();
         fibril_rwlock_read_lock(&regions->guard);
-        list_foreach(regions->list, it) {
-                assert(it);
-                region_t *reg = region_instance(it);
-                assert(reg);
+        list_foreach(regions->list, link, region_t, reg) {
                 if ((r >= reg->base) && (r < reg->base + reg->size)) {
                         if (reg->log)
@@ -131 +128 @@
         fibril_rwlock_write_lock(&regions->guard);
         list_foreach_safe(regions->list, it, next) {
-                assert(it);
                 region_t *reg = region_instance(it);
-                assert(reg);
                 if (r >= reg->base && (r < reg->base + reg->size)) {
-                                list_remove(&reg->link);
-                                region_destroy(reg);
+                        list_remove(&reg->link);
+                        region_destroy(reg);
                 }
         }

uspace/lib/c/include/adt/list.h

@@ -67 +67 @@
         ((type *) (((void *)(link)) - list_link_to_void(&(((type *) NULL)->member))))
 
-#define list_foreach(list, iterator) \
-        for (link_t *iterator = (list).head.next; \
-            iterator != &(list).head; iterator = iterator->next)
+#define list_foreach(list, member, itype, iterator) \
+        for (itype *iterator = NULL; iterator == NULL; iterator =(itype *)1) \
+            for (link_t *_link = (list).head.next; \
+            iterator = list_get_instance(_link, itype, member), \
+            _link != &(list).head; _link = _link->next)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
@@ -238 +240 @@
 static inline link_t *list_last(list_t *list)
 {
-        return ((list->head.prev == &list->head) ? NULL : list->head.prev);
+        return (list->head.prev == &list->head) ? NULL : list->head.prev;
+}
+
+/** Get next item in list.
+ *
+ * @param link Current item link
+ * @param list List containing @a link
+ *
+ * @return Next item or NULL if @a link is the last item.
+ */
+static inline link_t *list_next(link_t *link, const list_t *list)
+{
+        return (link->next == &list->head) ? NULL : link->next;
+}
+
+/** Get previous item in list.
+ *
+ * @param link Current item link
+ * @param list List containing @a link
+ *
+ * @return Previous item or NULL if @a link is the first item.
+ */
+static inline link_t *list_prev(link_t *link, const list_t *list)
+{
+        return (link->prev == &list->head) ? NULL : link->prev;
 }
 
@@ -308 +334 @@
         unsigned int cnt = 0;
         
-        list_foreach(*list, link) {
+        link_t *link = list_first(list);
+        while (link != NULL) {
                 if (cnt == n)
                         return link;
                 
                 cnt++;
+                link = list_next(link, list);
         }
         

uspace/lib/c/include/cfg.h

@@ -80 +80 @@
 
 #define cfg_file_foreach(file, cur) \
-        list_foreach((file)->sections, (cur))
+        list_foreach((file)->sections, link, const cfg_section_t, (cur))
 
 #define cfg_section_instance(cur) \
@@ -86 +86 @@
 
 #define cfg_section_foreach(section, cur) \
-        list_foreach((section)->entries, (cur))
+        list_foreach((section)->entries, link, const cfg_entry_t, (cur))
 
 #define cfg_entry_instance(cur) \