Changeset feeac0d in mainline for uspace/app

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/app

Files:

• bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• edit/sheet.c (modified) (4 diffs)
• tester/mm/common.c (modified) (2 diffs)
• usbinfo/dump.c (modified) (1 diff)
• usbinfo/hid.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -74 +74 @@
         get_mtab_list(&mtab_list);
 
-        list_foreach(mtab_list, cur) {
-                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
-                    link);
-
+        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 if (old_ent)
                         free(old_ent);

uspace/app/edit/sheet.c

@@ -105 +105 @@
         char *ipp;
         size_t sz;
-        tag_t *tag;
         char *newp;
 
@@ -128 +127 @@
         /* Adjust tags. */
 
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off > pos->b_off)
                         tag->b_off += sz;
@@ -154 +151 @@
         char *spp;
         size_t sz;
-        tag_t *tag;
         char *newp;
         size_t shrink_size;
@@ -165 +161 @@
 
         /* Adjust tags. */
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off >= epos->b_off)
                         tag->b_off -= sz;

uspace/app/tester/mm/common.c

@@ -84 +84 @@
 }
 
-static bool overlap_match(link_t *link, void *addr, size_t size)
-{
-        mem_block_t *block = list_get_instance(link, mem_block_t, link);
-        
+static bool overlap_match(mem_block_t *block, void *addr, size_t size)
+{
         /* Entry block control structure <mbeg, mend) */
         uint8_t *mbeg = (uint8_t *) block;
@@ -125 +123 @@
         bool fnd = false;
         
-        list_foreach(mem_blocks, link) {
-                if (overlap_match(link, addr, size)) {
+        list_foreach(mem_blocks, link, mem_block_t, block) {
+                if (overlap_match(block, addr, size)) {
                         fnd = true;
                         break;

uspace/app/usbinfo/dump.c

@@ -103 +103 @@
 void dump_match_ids(match_id_list_t *matches, const char *line_prefix)
 {
-        list_foreach(matches->ids, link) {
-                match_id_t *match = list_get_instance(link, match_id_t, link);
-
+        list_foreach(matches->ids, link, match_id_t, match) {
                 printf("%s%3d %s\n", line_prefix, match->score, match->id);
         }

uspace/app/usbinfo/hid.c

@@ -100 +100 @@
         printf("%sParsed HID report descriptor for interface %d\n",
             get_indent(0), iface_no);
-        list_foreach(report->reports, report_it) {
-                usb_hid_report_description_t *description = list_get_instance(
-                    report_it, usb_hid_report_description_t, reports_link);
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, description) {
                 printf("%sReport %d (type %d)\n", get_indent(1),
                     (int) description->report_id,
                     (int) description->type);
-                list_foreach(description->report_items, item_it) {
-                        usb_hid_report_field_t *field = list_get_instance(
-                            item_it, usb_hid_report_field_t, ritems_link);
+                list_foreach(description->report_items, ritems_link,
+                    usb_hid_report_field_t, field) {
                         printf("%sUsage page = 0x%04x    Usage = 0x%04x\n",
                             get_indent(2),