Rewrite list_* API to make more sense

Tasssadar · Tasssadar · commit 65f07d0233d5 · 2014-08-11T23:15:44.000+02:00
diff --git a/animation.c b/animation.c
@@ -371,12 +371,12 @@ void anim_push_context(void)
     pthread_mutex_lock(&anim_list.mutex);
     if(anim_list.first)
     {
-        list_add(anim_list.first, &anim_list.inactive_ctx);
+        list_add(&anim_list.inactive_ctx, anim_list.first);
         anim_list.first = anim_list.last = NULL;
     }
     else
     {
-        list_add(&EMPTY_CONTEXT, &anim_list.inactive_ctx);
+        list_add(&anim_list.inactive_ctx, &EMPTY_CONTEXT);
     }
     pthread_mutex_unlock(&anim_list.mutex);
 }
@@ -402,7 +402,7 @@ void anim_pop_context(void)
             last_active_ctx = last_active_ctx->next;
         anim_list.last = last_active_ctx;
     }
-    list_rm_at(idx, &anim_list.inactive_ctx, NULL);
+    list_rm_at(&anim_list.inactive_ctx, idx, NULL);
     pthread_mutex_unlock(&anim_list.mutex);
 }
 
diff --git a/containers.c b/containers.c
@@ -33,7 +33,7 @@ int list_size(listItself list)
     return list_item_count(list)+1;
 }
 
-void list_add(void *item, ptrToList list_p)
+void list_add(ptrToList list_p, void *item)
 {
     void ***list = (void***)list_p;
 
@@ -48,7 +48,7 @@ void list_add(void *item, ptrToList list_p)
     (*list)[--i] = item;
 }
 
-int list_add_from_list(listItself src_p, ptrToList list_p)
+int list_add_from_list(ptrToList list_p, listItself src_p)
 {
     void **src = (void**)src_p;
     void ***list = (void***)list_p;
@@ -71,7 +71,7 @@ int list_add_from_list(listItself src_p, ptrToList list_p)
     return len_src-1;
 }
 
-int list_rm_opt(int reorder, void *item, ptrToList list_p, callback destroy_callback_p)
+int list_rm_opt(ptrToList list_p, void *item, callback destroy_callback_p, int reorder)
 {
     void ***list = (void***)list_p;
     callbackPtr destroy_callback = (callbackPtr)destroy_callback_p;
@@ -113,17 +113,17 @@ int list_rm_opt(int reorder, void *item, ptrToList list_p, callback destroy_call
     return -1;
 }
 
-int list_rm(void *item, ptrToList list_p, callback destroy_callback_p)
+int list_rm(ptrToList list_p, void *item, callback destroy_callback_p)
 {
-    return list_rm_opt(1, item, list_p, destroy_callback_p);
+    return list_rm_opt(list_p, item, destroy_callback_p, 1);
 }
 
-int list_rm_noreorder(void *item, ptrToList list_p, callback destroy_callback_p)
+int list_rm_noreorder(ptrToList list_p, void *item, callback destroy_callback_p)
 {
-    return list_rm_opt(0, item, list_p, destroy_callback_p);
+    return list_rm_opt(list_p, item, destroy_callback_p, 0);
 }
 
-int list_rm_at(int idx, ptrToList list_p, callback destroy_callback_p)
+int list_rm_at(ptrToList list_p, int idx, callback destroy_callback_p)
 {
     void ***list = (void***)list_p;
     callbackPtr destroy_callback = (callbackPtr)destroy_callback_p;
@@ -171,7 +171,7 @@ void list_clear(ptrToList list_p, callback destroy_callback_p)
     *list = NULL;
 }
 
-int list_copy(listItself src, ptrToList dest_p)
+int list_copy(ptrToList dest_p, listItself src)
 {
     void **source = (void**)src;
     void ***dest = (void***)dest_p;
@@ -191,7 +191,7 @@ int list_copy(listItself src, ptrToList dest_p)
     return 0;
 }
 
-int list_move(ptrToList source_p, ptrToList dest_p)
+int list_move(ptrToList dest_p, ptrToList source_p)
 {
     void ***source = (void***)source_p;
     void ***dest = (void***)dest_p;
@@ -247,8 +247,8 @@ void map_add(map *m, const char *key, void *val, void (*destroy_callback)(void*)
 
 void map_add_not_exist(map *m, const char *key, void *val)
 {
-    list_add(strdup(key), &m->keys);
-    list_add(val, &m->values);
+    list_add(&m->keys, strdup(key));
+    list_add(&m->values, val);
     ++m->size;
 }
 
@@ -258,8 +258,8 @@ void map_rm(map *m, const char *key, void (*destroy_callback)(void*))
     if(idx < 0)
         return;
 
-    list_rm_at(idx, &m->keys, &free);
-    list_rm_at(idx, &m->values, destroy_callback);
+    list_rm_at(&m->keys, idx, &free);
+    list_rm_at(&m->values, idx, destroy_callback);
     --m->size;
 }
 
@@ -323,7 +323,7 @@ void imap_add_not_exist(imap *m, int key, void *val)
     m->keys = realloc(m->keys, sizeof(int)*(m->size+1));
     m->keys[m->size++] = key;
 
-    list_add(val, &m->values);
+    list_add(&m->values, val);
 }
 
 void imap_rm(imap *m, int key, void (*destroy_callback)(void*))
@@ -338,7 +338,7 @@ void imap_rm(imap *m, int key, void (*destroy_callback)(void*))
 
     --m->size;
     m->keys = realloc(m->keys, sizeof(int)*m->size);
-    list_rm_at(idx, &m->values, destroy_callback);
+    list_rm_at(&m->values, idx, destroy_callback);
 }
 
 int imap_find(imap *m, int key)
diff --git a/containers.h b/containers.h
@@ -24,16 +24,16 @@ typedef void* listItself; // void **
 typedef void* callback;
 typedef void(*callbackPtr)(void*);
 
-void list_add(void *item, ptrToList list_p);
-int list_add_from_list(listItself src_p, ptrToList list_p);
-int list_rm(void *item, ptrToList list_p, callback destroy_callback_p);
-int list_rm_noreorder(void *item, ptrToList list_p, callback destroy_callback_p);
-int list_rm_opt(int reorder, void *item, ptrToList list_p, callback destroy_callback_p);
-int list_rm_at(int idx, ptrToList list_p, callback destroy_callback_p);
+void list_add(ptrToList list_p, void *item);
+int list_add_from_list(ptrToList list_p, listItself src_p);
+int list_rm(ptrToList list_p, void *item, callback destroy_callback_p);
+int list_rm_noreorder(ptrToList list_p, void *item, callback destroy_callback_p);
+int list_rm_opt(ptrToList list_p, void *item, callback destroy_callback_p, int reorder);
+int list_rm_at(ptrToList list_p, int idx, callback destroy_callback_p);
 int list_size(listItself list);
 int list_item_count(listItself list);
-int list_copy(listItself src, ptrToList dest_p);
-int list_move(ptrToList source_p, ptrToList dest_p);
+int list_copy(ptrToList dest_p, listItself src);
+int list_move(ptrToList dest_p, ptrToList source_p);
 void list_clear(ptrToList list_p, callback destroy_callback_p);
 void list_swap(ptrToList a_p, ptrToList b_p);
 
diff --git a/framebuffer.c b/framebuffer.c
@@ -724,19 +724,19 @@ void fb_add_rect_notfilled(int level, int x, int y, int w, int h, uint32_t color
     fb_rect *r;
     // top
     r = fb_add_rect_lvl(level, x, y, w, thickness, color);
-    list_add(r, list);
+    list_add(list, r);
 
     // right
     r = fb_add_rect_lvl(level, x + w - thickness, y, thickness, h, color);
-    list_add(r, list);
+    list_add(list, r);
 
     // bottom
     r = fb_add_rect_lvl(level, x, y + h - thickness, w, thickness, color);
-    list_add(r, list);
+    list_add(list, r);
 
     // left
     r = fb_add_rect_lvl(level, x, y, thickness, h, color);
-    list_add(r, list);
+    list_add(list, r);
 }
 
 fb_img *fb_add_img(int level, int x, int y, int w, int h, int img_type, px_type *data)
@@ -860,7 +860,7 @@ void fb_push_context(void)
     fb_ctx.first_item = NULL;
     pthread_mutex_unlock(&fb_ctx.mutex);
 
-    list_add(ctx, &inactive_ctx);
+    list_add(&inactive_ctx, ctx);
 }
 
 void fb_pop_context(void)
@@ -878,7 +878,7 @@ void fb_pop_context(void)
     fb_ctx.background_color = ctx->background_color;
     pthread_mutex_unlock(&fb_ctx.mutex);
 
-    list_rm_noreorder(ctx, &inactive_ctx, &free);
+    list_rm_noreorder(&inactive_ctx, ctx, &free);
 
     fb_request_draw();
 }
diff --git a/framebuffer_png.c b/framebuffer_png.c
@@ -256,7 +256,7 @@ px_type *fb_png_get(const char *path, int w, int h)
     e->height = h;
     e->refcnt = 1;
 
-    list_add(e, &png_cache);
+    list_add(&png_cache, e);
     PNG_LOG("PNG %s (%dx%d) %p added into cache\n", path, w, h, data);
     return data;
 }
@@ -284,7 +284,7 @@ void fb_png_drop_unused(void)
         if((*itr)->refcnt <= 0)
         {
             PNG_LOG("PNG %s (%dx%d) %p removed from cache\n", (*itr)->path, (*itr)->width, (*itr)->height, data);
-            list_rm(*itr, &png_cache, &destroy_png_cache_entry);
+            list_rm(&png_cache, *itr, &destroy_png_cache_entry);
             itr = png_cache;
         }
         else
diff --git a/framebuffer_truetype.c b/framebuffer_truetype.c
@@ -479,7 +479,7 @@ static void fb_text_render(fb_img *img)
         maxW = imax(maxW, line->w);
         maxH = imax(maxH, line->h);
 
-        list_add(line, &lines);
+        list_add(&lines, line);
         ++lines_cnt;
     }
 
diff --git a/fstab.c b/fstab.c
@@ -152,7 +152,7 @@ struct fstab *fstab_load(const char *path, int resolve_symlinks)
             continue;
         }
 
-        list_add(part, &t->parts);
+        list_add(&t->parts, part);
         ++t->count;
         part = NULL;
     }
@@ -359,7 +359,7 @@ void fstab_add_part(struct fstab *f, const char *dev, const char *path, const ch
     fstab_parse_options(p->options_raw, p);
     p->options2 = strdup(options2);
 
-    list_add(p, &f->parts);
+    list_add(&f->parts, p);
     ++f->count;
 }
 
@@ -380,6 +380,6 @@ struct fstab_part *fstab_clone_part(struct fstab_part *p)
 
 void fstab_add_part_struct(struct fstab *f, struct fstab_part *p)
 {
-    list_add(p, &f->parts);
+    list_add(&f->parts, p);
     ++f->count;
 }
diff --git a/input.c b/input.c
@@ -474,7 +474,7 @@ void input_push_context(void)
     mt_handlers = NULL;
     pthread_mutex_unlock(&touch_mutex);
 
-    list_add(ctx, &inactive_ctx);
+    list_add(&inactive_ctx, ctx);
 }
 
 void input_pop_context(void)
@@ -489,7 +489,7 @@ void input_pop_context(void)
     mt_handlers = ctx->handlers;
     pthread_mutex_unlock(&touch_mutex);
 
-    list_rm_noreorder(ctx, &inactive_ctx, &free);
+    list_rm_noreorder(&inactive_ctx, ctx, &free);
 }
 
 struct keyaction
@@ -551,7 +551,7 @@ void keyaction_add(int x, int y, keyaction_call call, void *data)
 
     pthread_mutex_lock(&keyaction_ctx.lock);
 
-    list_add(k, &keyaction_ctx.actions);
+    list_add(&keyaction_ctx.actions, k);
     ++keyaction_ctx.actions_len;
 
     qsort(keyaction_ctx.actions, keyaction_ctx.actions_len,
@@ -578,7 +578,7 @@ void keyaction_remove(keyaction_call call, void *data)
                     keyaction_ctx.cur_act = NULL;
                 }
 
-                list_rm_at(i, &keyaction_ctx.actions, &free);
+                list_rm_at(&keyaction_ctx.actions, i, &free);
                 --keyaction_ctx.actions_len;
                 break;
             }
diff --git a/kexec.c b/kexec.c
@@ -92,7 +92,7 @@ int kexec_load_exec(struct kexec *k)
 
 void kexec_add_arg(struct kexec *k, const char *arg)
 {
-    list_add(strdup(arg), &k->args);
+    list_add(&k->args, strdup(arg));
 }
 
 void kexec_add_arg_prefix(struct kexec *k, const char *prefix, const char *value)
@@ -101,7 +101,7 @@ void kexec_add_arg_prefix(struct kexec *k, const char *prefix, const char *value
     char *arg = malloc(len);
     snprintf(arg, len, "%s%s", prefix, value);
 
-    list_add(arg, &k->args);
+    list_add(&k->args, arg);
 }
 
 void kexec_add_kernel(struct kexec *k, const char *path, int hardboot)
diff --git a/listview.c b/listview.c
@@ -105,7 +105,7 @@ listview_item *listview_add_item(listview *view, int id, void *data)
     if(!view->items)
         keyaction_add(view->x, view->y, listview_keyaction_call, view);
 
-    list_add(it, &view->items);
+    list_add(&view->items, it);
     return it;
 }
 
diff --git a/multirom.c b/multirom.c
@@ -434,7 +434,7 @@ int multirom_default_status(struct multirom_status *s)
 
         multirom_find_rom_icon(rom);
 
-        list_add(rom, &add_roms);
+        list_add(&add_roms, rom);
     }
 
     closedir(d);
@@ -697,7 +697,7 @@ void multirom_find_usb_roms(struct multirom_status *s)
     {
         if(s->roms[i]->partition)
         {
-            list_rm_at(i, &s->roms, &multirom_free_rom);
+            list_rm_at(&s->roms, i, &multirom_free_rom);
             i = 0;
         }
         else ++i;
@@ -776,7 +776,7 @@ int multirom_scan_partition_for_roms(struct multirom_status *s, struct usb_parti
 
         multirom_find_rom_icon(rom);
 
-        list_add(rom, &add_roms);
+        list_add(&add_roms, rom);
     }
     closedir(d);
 
@@ -785,7 +785,7 @@ int multirom_scan_partition_for_roms(struct multirom_status *s, struct usb_parti
         // sort roms
         qsort(add_roms, list_item_count(add_roms), sizeof(struct multirom_rom*), compare_rom_names);
 
-        list_add_from_list(add_roms, &s->roms);
+        list_add_from_list(&s->roms, add_roms);
         list_clear(&add_roms, NULL);
     }
     return 0;
@@ -2231,7 +2231,7 @@ int multirom_update_partitions(struct multirom_status *s)
 
         if(part->fs && multirom_mount_usb(part) == 0)
         {
-            list_add(part, &s->partitions);
+            list_add(&s->partitions, part);
             ERROR("Found part %s: %s, %s\n", part->name, part->uuid, part->fs);
         }
         else
diff --git a/multirom_ui.c b/multirom_ui.c
@@ -654,7 +654,7 @@ void multirom_ui_tab_rom_set_empty(void *data, int empty)
         p->wrap_w = t->list->w - 100*DPI_MUL;
         p->justify = JUSTIFY_CENTER;
         t->usb_text = fb_text_finalize(p);
-        list_add(t->usb_text, &t->ui_elements);
+        list_add(&t->ui_elements, t->usb_text);
 
         center_text(t->usb_text, t->list->x, -1, t->list->w, -1);
         t->usb_text->y = t->list->y + t->list->h*0.2;
@@ -667,7 +667,7 @@ void multirom_ui_tab_rom_set_empty(void *data, int empty)
         progdots_destroy(t->usb_prog);
         t->usb_prog = NULL;
 
-        list_rm(t->usb_text, &t->ui_elements, &fb_remove_item);
+        list_rm(&t->ui_elements, t->usb_text, &fb_remove_item);
         t->usb_text = NULL;
     }
 }
diff --git a/multirom_ui_themes.c b/multirom_ui_themes.c
@@ -29,7 +29,7 @@ multirom_themes_info *multirom_ui_init_themes(void)
 
 #define ADD_THEME(RES) \
     extern struct multirom_theme theme_info_ ## RES; \
-    list_add(&theme_info_ ## RES, &i->themes);
+    list_add(&i->themes, &theme_info_ ## RES);
 
     // universal themes which scale according to DPI_MUL
     ADD_THEME(landscape);
diff --git a/notification_card.c b/notification_card.c
diff --git a/pong.c b/pong.c
diff --git a/themes/multirom_ui_landscape.c b/themes/multirom_ui_landscape.c
diff --git a/themes/multirom_ui_portrait.c b/themes/multirom_ui_portrait.c
diff --git a/workers.c b/workers.c

Original file line number	Diff line number	Diff line change
`@@ -371,12 +371,12 @@ void anim_push_context(void)`
`371`	`371`	`pthread_mutex_lock(&anim_list.mutex);`
`372`	`372`	`if(anim_list.first)`
`373`	`373`	`{`
`374`		`- list_add(anim_list.first, &anim_list.inactive_ctx);`
	`374`	`+ list_add(&anim_list.inactive_ctx, anim_list.first);`
`375`	`375`	`anim_list.first = anim_list.last = NULL;`
`376`	`376`	`}`
`377`	`377`	`else`
`378`	`378`	`{`
`379`		`- list_add(&EMPTY_CONTEXT, &anim_list.inactive_ctx);`
	`379`	`+ list_add(&anim_list.inactive_ctx, &EMPTY_CONTEXT);`
`380`	`380`	`}`
`381`	`381`	`pthread_mutex_unlock(&anim_list.mutex);`
`382`	`382`	`}`
`@@ -402,7 +402,7 @@ void anim_pop_context(void)`
`402`	`402`	`last_active_ctx = last_active_ctx->next;`
`403`	`403`	`anim_list.last = last_active_ctx;`
`404`	`404`	`}`
`405`		`- list_rm_at(idx, &anim_list.inactive_ctx, NULL);`
	`405`	`+ list_rm_at(&anim_list.inactive_ctx, idx, NULL);`
`406`	`406`	`pthread_mutex_unlock(&anim_list.mutex);`
`407`	`407`	`}`
`408`	`408`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ int list_size(listItself list)`
`33`	`33`	`return list_item_count(list)+1;`
`34`	`34`	`}`
`35`	`35`
`36`		`-void list_add(void *item, ptrToList list_p)`
	`36`	`+void list_add(ptrToList list_p, void *item)`
`37`	`37`	`{`
`38`	`38`	`void *list = (void*)list_p;`
`39`	`39`
`@@ -48,7 +48,7 @@ void list_add(void *item, ptrToList list_p)`
`48`	`48`	`(*list)[--i] = item;`
`49`	`49`	`}`
`50`	`50`
`51`		`-int list_add_from_list(listItself src_p, ptrToList list_p)`
	`51`	`+int list_add_from_list(ptrToList list_p, listItself src_p)`
`52`	`52`	`{`
`53`	`53`	`void src = (void)src_p;`
`54`	`54`	`void *list = (void*)list_p;`
`@@ -71,7 +71,7 @@ int list_add_from_list(listItself src_p, ptrToList list_p)`
`71`	`71`	`return len_src-1;`
`72`	`72`	`}`
`73`	`73`
`74`		`-int list_rm_opt(int reorder, void *item, ptrToList list_p, callback destroy_callback_p)`
	`74`	`+int list_rm_opt(ptrToList list_p, void *item, callback destroy_callback_p, int reorder)`
`75`	`75`	`{`
`76`	`76`	`void *list = (void*)list_p;`
`77`	`77`	`callbackPtr destroy_callback = (callbackPtr)destroy_callback_p;`
`@@ -113,17 +113,17 @@ int list_rm_opt(int reorder, void *item, ptrToList list_p, callback destroy_call`
`113`	`113`	`return -1;`
`114`	`114`	`}`
`115`	`115`
`116`		`-int list_rm(void *item, ptrToList list_p, callback destroy_callback_p)`
	`116`	`+int list_rm(ptrToList list_p, void *item, callback destroy_callback_p)`
`117`	`117`	`{`
`118`		`- return list_rm_opt(1, item, list_p, destroy_callback_p);`
	`118`	`+ return list_rm_opt(list_p, item, destroy_callback_p, 1);`
`119`	`119`	`}`
`120`	`120`
`121`		`-int list_rm_noreorder(void *item, ptrToList list_p, callback destroy_callback_p)`
	`121`	`+int list_rm_noreorder(ptrToList list_p, void *item, callback destroy_callback_p)`
`122`	`122`	`{`
`123`		`- return list_rm_opt(0, item, list_p, destroy_callback_p);`
	`123`	`+ return list_rm_opt(list_p, item, destroy_callback_p, 0);`
`124`	`124`	`}`
`125`	`125`
`126`		`-int list_rm_at(int idx, ptrToList list_p, callback destroy_callback_p)`
	`126`	`+int list_rm_at(ptrToList list_p, int idx, callback destroy_callback_p)`
`127`	`127`	`{`
`128`	`128`	`void *list = (void*)list_p;`
`129`	`129`	`callbackPtr destroy_callback = (callbackPtr)destroy_callback_p;`
`@@ -171,7 +171,7 @@ void list_clear(ptrToList list_p, callback destroy_callback_p)`
`171`	`171`	`*list = NULL;`
`172`	`172`	`}`
`173`	`173`
`174`		`-int list_copy(listItself src, ptrToList dest_p)`
	`174`	`+int list_copy(ptrToList dest_p, listItself src)`
`175`	`175`	`{`
`176`	`176`	`void source = (void)src;`
`177`	`177`	`void *dest = (void*)dest_p;`
`@@ -191,7 +191,7 @@ int list_copy(listItself src, ptrToList dest_p)`
`191`	`191`	`return 0;`
`192`	`192`	`}`
`193`	`193`
`194`		`-int list_move(ptrToList source_p, ptrToList dest_p)`
	`194`	`+int list_move(ptrToList dest_p, ptrToList source_p)`
`195`	`195`	`{`
`196`	`196`	`void *source = (void*)source_p;`
`197`	`197`	`void *dest = (void*)dest_p;`
`@@ -247,8 +247,8 @@ void map_add(map m, const char key, void val, void (destroy_callback)(void*)`
`247`	`247`
`248`	`248`	`void map_add_not_exist(map m, const char key, void *val)`
`249`	`249`	`{`
`250`		`- list_add(strdup(key), &m->keys);`
`251`		`- list_add(val, &m->values);`
	`250`	`+ list_add(&m->keys, strdup(key));`
	`251`	`+ list_add(&m->values, val);`
`252`	`252`	`++m->size;`
`253`	`253`	`}`
`254`	`254`
`@@ -258,8 +258,8 @@ void map_rm(map m, const char key, void (destroy_callback)(void))`
`258`	`258`	`if(idx < 0)`
`259`	`259`	`return;`
`260`	`260`
`261`		`- list_rm_at(idx, &m->keys, &free);`
`262`		`- list_rm_at(idx, &m->values, destroy_callback);`
	`261`	`+ list_rm_at(&m->keys, idx, &free);`
	`262`	`+ list_rm_at(&m->values, idx, destroy_callback);`
`263`	`263`	`--m->size;`
`264`	`264`	`}`
`265`	`265`
`@@ -323,7 +323,7 @@ void imap_add_not_exist(imap m, int key, void val)`
`323`	`323`	`m->keys = realloc(m->keys, sizeof(int)*(m->size+1));`
`324`	`324`	`m->keys[m->size++] = key;`
`325`	`325`
`326`		`- list_add(val, &m->values);`
	`326`	`+ list_add(&m->values, val);`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`void imap_rm(imap m, int key, void (destroy_callback)(void*))`
`@@ -338,7 +338,7 @@ void imap_rm(imap m, int key, void (destroy_callback)(void*))`
`338`	`338`
`339`	`339`	`--m->size;`
`340`	`340`	`m->keys = realloc(m->keys, sizeof(int)*m->size);`
`341`		`- list_rm_at(idx, &m->values, destroy_callback);`
	`341`	`+ list_rm_at(&m->values, idx, destroy_callback);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`int imap_find(imap *m, int key)`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ px_type fb_png_get(const char path, int w, int h)`
`256`	`256`	`e->height = h;`
`257`	`257`	`e->refcnt = 1;`
`258`	`258`
`259`		`- list_add(e, &png_cache);`
	`259`	`+ list_add(&png_cache, e);`
`260`	`260`	`PNG_LOG("PNG %s (%dx%d) %p added into cache\n", path, w, h, data);`
`261`	`261`	`return data;`
`262`	`262`	`}`
`@@ -284,7 +284,7 @@ void fb_png_drop_unused(void)`
`284`	`284`	`if((*itr)->refcnt <= 0)`
`285`	`285`	`{`
`286`	`286`	`PNG_LOG("PNG %s (%dx%d) %p removed from cache\n", (itr)->path, (itr)->width, (*itr)->height, data);`
`287`		`- list_rm(*itr, &png_cache, &destroy_png_cache_entry);`
	`287`	`+ list_rm(&png_cache, *itr, &destroy_png_cache_entry);`
`288`	`288`	`itr = png_cache;`
`289`	`289`	`}`
`290`	`290`	`else`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ static void fb_text_render(fb_img *img)`
`479`	`479`	`maxW = imax(maxW, line->w);`
`480`	`480`	`maxH = imax(maxH, line->h);`
`481`	`481`
`482`		`- list_add(line, &lines);`
	`482`	`+ list_add(&lines, line);`
`483`	`483`	`++lines_cnt;`
`484`	`484`	`}`
`485`	`485`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ struct fstab fstab_load(const char path, int resolve_symlinks)`
`152`	`152`	`continue;`
`153`	`153`	`}`
`154`	`154`
`155`		`- list_add(part, &t->parts);`
	`155`	`+ list_add(&t->parts, part);`
`156`	`156`	`++t->count;`
`157`	`157`	`part = NULL;`
`158`	`158`	`}`
`@@ -359,7 +359,7 @@ void fstab_add_part(struct fstab f, const char dev, const char *path, const ch`
`359`	`359`	`fstab_parse_options(p->options_raw, p);`
`360`	`360`	`p->options2 = strdup(options2);`
`361`	`361`
`362`		`- list_add(p, &f->parts);`
	`362`	`+ list_add(&f->parts, p);`
`363`	`363`	`++f->count;`
`364`	`364`	`}`
`365`	`365`
`@@ -380,6 +380,6 @@ struct fstab_part fstab_clone_part(struct fstab_part p)`
`380`	`380`
`381`	`381`	`void fstab_add_part_struct(struct fstab f, struct fstab_part p)`
`382`	`382`	`{`
`383`		`- list_add(p, &f->parts);`
	`383`	`+ list_add(&f->parts, p);`
`384`	`384`	`++f->count;`
`385`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ int kexec_load_exec(struct kexec *k)`
`92`	`92`
`93`	`93`	`void kexec_add_arg(struct kexec k, const char arg)`
`94`	`94`	`{`
`95`		`- list_add(strdup(arg), &k->args);`
	`95`	`+ list_add(&k->args, strdup(arg));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void kexec_add_arg_prefix(struct kexec k, const char prefix, const char *value)`
`@@ -101,7 +101,7 @@ void kexec_add_arg_prefix(struct kexec k, const char prefix, const char *value`
`101`	`101`	`char *arg = malloc(len);`
`102`	`102`	`snprintf(arg, len, "%s%s", prefix, value);`
`103`	`103`
`104`		`- list_add(arg, &k->args);`
	`104`	`+ list_add(&k->args, arg);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`void kexec_add_kernel(struct kexec k, const char path, int hardboot)`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ listview_item listview_add_item(listview view, int id, void *data)`
`105`	`105`	`if(!view->items)`
`106`	`106`	`keyaction_add(view->x, view->y, listview_keyaction_call, view);`
`107`	`107`
`108`		`- list_add(it, &view->items);`
	`108`	`+ list_add(&view->items, it);`
`109`	`109`	`return it;`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ int multirom_default_status(struct multirom_status *s)`
`434`	`434`
`435`	`435`	`multirom_find_rom_icon(rom);`
`436`	`436`
`437`		`- list_add(rom, &add_roms);`
	`437`	`+ list_add(&add_roms, rom);`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`closedir(d);`
`@@ -697,7 +697,7 @@ void multirom_find_usb_roms(struct multirom_status *s)`
`697`	`697`	`{`
`698`	`698`	`if(s->roms[i]->partition)`
`699`	`699`	`{`
`700`		`- list_rm_at(i, &s->roms, &multirom_free_rom);`
	`700`	`+ list_rm_at(&s->roms, i, &multirom_free_rom);`
`701`	`701`	`i = 0;`
`702`	`702`	`}`
`703`	`703`	`else ++i;`
`@@ -776,7 +776,7 @@ int multirom_scan_partition_for_roms(struct multirom_status *s, struct usb_parti`
`776`	`776`
`777`	`777`	`multirom_find_rom_icon(rom);`
`778`	`778`
`779`		`- list_add(rom, &add_roms);`
	`779`	`+ list_add(&add_roms, rom);`
`780`	`780`	`}`
`781`	`781`	`closedir(d);`
`782`	`782`
`@@ -785,7 +785,7 @@ int multirom_scan_partition_for_roms(struct multirom_status *s, struct usb_parti`
`785`	`785`	`// sort roms`
`786`	`786`	`qsort(add_roms, list_item_count(add_roms), sizeof(struct multirom_rom*), compare_rom_names);`
`787`	`787`
`788`		`- list_add_from_list(add_roms, &s->roms);`
	`788`	`+ list_add_from_list(&s->roms, add_roms);`
`789`	`789`	`list_clear(&add_roms, NULL);`
`790`	`790`	`}`
`791`	`791`	`return 0;`
`@@ -2231,7 +2231,7 @@ int multirom_update_partitions(struct multirom_status *s)`
`2231`	`2231`
`2232`	`2232`	`if(part->fs && multirom_mount_usb(part) == 0)`
`2233`	`2233`	`{`
`2234`		`- list_add(part, &s->partitions);`
	`2234`	`+ list_add(&s->partitions, part);`
`2235`	`2235`	`ERROR("Found part %s: %s, %s\n", part->name, part->uuid, part->fs);`
`2236`	`2236`	`}`
`2237`	`2237`	`else`