Changeset 0c1ad7ac in mainline

Timestamp:

2008-05-04T20:50:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9a5ccfb3

Parents:

5a324099

Message:

merge vs. coalesce

File:

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

uspace/srv/fs/fat/fat_idx.c

@@ -118 +118 @@
 }
 
-/** If possible, merge two intervals of freed indices. */
-static void try_merge_intervals(link_t *l, link_t *r, link_t *cur)
+/** If possible, coalesce two intervals of freed indices. */
+static void try_coalesce_intervals(link_t *l, link_t *r, link_t *cur)
 {
         freed_t *fl = list_get_instance(l, freed_t, link);
@@ -171 +171 @@
                                 f->first--;
                                 if (lnk->prev != &u->freed_head)
-                                        try_merge_intervals(lnk->prev, lnk,
+                                        try_coalesce_intervals(lnk->prev, lnk,
                                             lnk);
                                 return;
@@ -178 +178 @@
                                 f->last++;
                                 if (lnk->next != &u->freed_head)
-                                        try_merge_intervals(lnk, lnk->next,
+                                        try_coalesce_intervals(lnk, lnk->next,
                                             lnk);
                                 return;