X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_model.c;h=57532566a7ea58a54a8782bdb7dbc67cb4cd3841;hp=f08521acf3505c76f789d258e3e72774111f9e74;hb=03759c1d9512afb87624c268481d5c9c499e8275;hpb=7f50cedb88527a356ba2deeb15e1e959c58a3f57 diff --git a/src/ttrss_model.c b/src/ttrss_model.c index f08521a..5753256 100644 --- a/src/ttrss_model.c +++ b/src/ttrss_model.c @@ -21,42 +21,9 @@ #include #include +#include "list.h" #include "ttrss_model.h" -static int list_length(void **list) -{ - int n; - - if (!list) - return 0; - - n = 0; - while (*list) { - n++; - list++; - } - - return n; -} - -static void **list_add(void **list, void *item) -{ - int n; - void **result; - - n = list_length(list); - - result = malloc((n + 1 + 1) * sizeof(void *)); - - if (list) - memcpy(result, list, n * sizeof(void *)); - - result[n] = item; - result[n + 1] = NULL; - - return result; -} - struct headline **headlines_add(struct headline **list, struct headline *h) { return (struct headline **)list_add((void **)list, (void *)h); @@ -167,14 +134,10 @@ struct feed *feeds_get_feed(struct feed **feeds, int id) { struct feed **cur; - printf("%p\n", feeds); - if (feeds) for (cur = feeds; *cur; cur++) - if ((*cur)->id == id) { - printf("match!\n"); + if ((*cur)->id == id) return *cur; - } return NULL; }