Changeset f1fae414 in mainline for uspace/app/edit/sheet.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/edit/sheet.c (modified) (8 diffs)

uspace/app/edit/sheet.c

@@ -75 +75 @@
                 return ENOMEM;
 
-        list_initialize(&sh->tags_head);
+        list_initialize(&sh->tags);
 
         return EOK;
@@ -97 +97 @@
         char *ipp;
         size_t sz;
-        link_t *link;
         tag_t *tag;
         char *newp;
@@ -121 +120 @@
         /* Adjust tags. */
 
-        link = sh->tags_head.next;
-        while (link != &sh->tags_head) {
+        list_foreach(sh->tags, link) {
                 tag = list_get_instance(link, tag_t, link);
 
@@ -129 +127 @@
                 else if (tag->b_off == pos->b_off && dir == dir_before)
                         tag->b_off += sz;
-
-                link = link->next;
         }
 
@@ -150 +146 @@
         char *spp;
         size_t sz;
-        link_t *link;
         tag_t *tag;
         char *newp;
@@ -162 +157 @@
 
         /* Adjust tags. */
-        link = sh->tags_head.next;
-        while (link != &sh->tags_head) {
+        list_foreach(sh->tags, link) {
                 tag = list_get_instance(link, tag_t, link);
 
@@ -170 +164 @@
                 else if (tag->b_off >= spos->b_off)
                         tag->b_off = spos->b_off;
-
-                link = link->next;
         }
 
@@ -328 +320 @@
         tag->b_off = pt->b_off;
         tag->sh = sh;
-        list_append(&tag->link, &sh->tags_head);
+        list_append(&tag->link, &sh->tags);
 }