Changeset f959a20f in mainline for uspace/srv/fs/fat/fat_idx.c

Timestamp:

2019-02-01T22:32:38Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

00b7fc8

Parents:

1a37496

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 21:22:39)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 22:32:38)

Message:

Avoid directly using .head/.next/.prev of list_t/link_t

Use existing constructs from <adt/list.h> instead.

File:

• uspace/srv/fs/fat/fat_idx.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_idx.c

@@ -284 +284 @@
                 link_t *lnk;
                 freed_t *n;
-                for (lnk = u->freed_list.head.next; lnk != &u->freed_list.head;
-                    lnk = lnk->next) {
+                for (lnk = list_first(&u->freed_list); lnk != NULL;
+                    lnk = list_next(lnk, &u->freed_list)) {
                         freed_t *f = list_get_instance(lnk, freed_t, link);
                         if (f->first == index + 1) {
                                 f->first--;
-                                if (lnk->prev != &u->freed_list.head)
-                                        try_coalesce_intervals(lnk->prev, lnk,
-                                            lnk);
+                                link_t *prev = list_prev(lnk, &u->freed_list);
+                                if (prev)
+                                        try_coalesce_intervals(prev, lnk, lnk);
                                 fibril_mutex_unlock(&unused_lock);
                                 return;
@@ -297 +297 @@
                         if (f->last == index - 1) {
                                 f->last++;
-                                if (lnk->next != &u->freed_list.head)
-                                        try_coalesce_intervals(lnk, lnk->next,
-                                            lnk);
+                                link_t *next = list_next(lnk, &u->freed_list);
+                                if (next)
+                                        try_coalesce_intervals(lnk, next, lnk);
                                 fibril_mutex_unlock(&unused_lock);
                                 return;