content = json_object_object_get(rp, "content");
if (!content) {
- fprintf(stderr, "Login failed: no content");
+ fprintf(stderr, "Login failed: no content\n");
return ;
}
error = json_object_object_get(content, "error");
if (error) {
- fprintf(stderr, "Login failed");
+ fprintf(stderr, "Login failed\n");
return ;
}
return headlines;
}
+static int feeds_length(struct feed **list)
+{
+ int n;
+
+ if (!list)
+ return 0;
+
+ n = 0;
+ while(*list) {
+ n++;
+ list++;
+ }
+
+ return n;
+}
+
+static struct feed **feeds_add(struct feed **feeds, struct feed *feed)
+{
+ int n;
+ struct feed **result;
+
+ n = feeds_length(feeds);
+
+ result = malloc((n + 1 + 1) * sizeof(struct feed *));
+
+ if (feeds)
+ memcpy(result, feeds, n * sizeof(struct feed *));
+
+ result[n] = feed;
+ result[n + 1] = NULL;
+
+ return result;
+}
+
struct feed **ttrss_get_feeds()
{
struct json_object *rp, *rq, *content, *jfeed, *j;
int i, n;
- struct feed **feeds, *feed;
+ struct feed **feeds, *feed, **tmp;
printf("ttrss_get_feeds\n");
if (content) {
n = json_object_array_length(content);
- feeds = malloc((n+1) * sizeof(struct feed *));
+ feeds = NULL;
for (i = 0; i < n; i++) {
jfeed = json_object_array_get_idx(content, i);
feed->headlines = NULL;
- feeds[i] = feed;
+ tmp = feeds_add(feeds, feed);
+ free(feeds);
+ feeds = tmp;
}
- feeds[n] = NULL;
} else {
feeds = NULL;
}