X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=82e9205e2944ecc9d4b0cb424182bb81b802964b;hp=cdd7296880ad9866a9e247d91e82a76f3574511b;hb=5b2f4161306b0890dd030d3fa6f62852e827a07c;hpb=74385a321a64afd5690934ac026d6a45b7e04e72

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index cdd7296..82e9205 100644
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -24,6 +24,7 @@
 #include <json/json.h>
 
 #include "http.h"
+#include "log.h"
 #include "ttrss_ws.h"
 #include "url.h"
 
@@ -142,14 +143,15 @@ char *ws_login()
 	rp = ws_execute(rq);
 	json_object_put(rq);
 
+	str = NULL;
 	if (rp) {
 		j = json_object_object_get(rp, "session_id");
-		str = strdup(json_object_get_string(j));
+
+		if (j)
+			str = strdup(json_object_get_string(j));
 
 		json_object_put(rp);
-	} else {
-		str = NULL;
-	}
+	} 
 
 	return str;
 }
@@ -165,7 +167,7 @@ int ws_open_session()
 
 	if (session_id) {
 		version = ws_get_api_version();
-		printf("API version: %d\n", version);
+		log_debug("API version= %d", version);
 
 		if (version > 0) {
 			result = 1;
@@ -212,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;
 
@@ -250,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)
@@ -266,7 +266,7 @@ struct feed **ws_update_feeds(struct feed **feeds)
 	struct feed *feed, **tmp;
 	const char *title, *url;
 
-	printf("ttrss_get_feeds\n");
+	log_debug("ttrss_get_feeds()");
 
 	rq = ws_request_new("getFeeds");
 
@@ -296,21 +296,18 @@ struct feed **ws_update_feeds(struct feed **feeds)
 				tmp = feeds_add(feeds, feed);
 				free(feeds);
 				feeds = tmp;
-			} else {
-				printf("found!\n");
 			}
 
 			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);
-
-	printf("ttrss_get_feeds ended\n");
+	log_debug("ttrss_get_feeds() done");
 
 	return feeds;
 }