From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 26 Apr 2013 06:11:58 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=commitdiff_plain;h=5b2f4161306b0890dd030d3fa6f62852e827a07c;hp=09a826a93753ebb1b82fbc30574c034f084e02b8

---

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index f34aaf1..82e9205 100644
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -214,7 +214,7 @@ char *ws_get_article_content(int id)
 int ws_update_headlines(struct feed *feed)
 {
 	struct json_object *rp, *rq, *jheadline, *j;
-	int i, n, err, hid;
+	int i, n, hid;
 	struct headline *h, **tmp;
 	const char *title, *url;
 
@@ -252,13 +252,11 @@ int ws_update_headlines(struct feed *feed)
 			j = json_object_object_get(jheadline, "unread");
 			h->unread = json_object_get_boolean(j);
 		}
-		err = 0;
+		json_object_put(rp);
+		return 1;
 	} else {
-		err = 1;
+		return 0;
 	}
-
-	json_object_put(rp);
-	return !err;
 }
 
 struct feed **ws_update_feeds(struct feed **feeds)
@@ -303,13 +301,12 @@ struct feed **ws_update_feeds(struct feed **feeds)
 			j = json_object_object_get(jfeed, "unread");
 			feed->unread = json_object_get_int(j);
 		}
+		json_object_put(rp);
 	} else {
 		feeds_free(feeds);
 		feeds = NULL;
 	}
 
-	json_object_put(rp);
-
 	log_debug("ttrss_get_feeds() done");
 
 	return feeds;