(no commit message)

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index cdd7296..f34aaf1 100644 (file)
--- 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;
@@ -266,7 +268,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,8 +298,6 @@ 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");
@@ -310,7 +310,7 @@ struct feed **ws_update_feeds(struct feed **feeds)
 
        json_object_put(rp);
 
-       printf("ttrss_get_feeds ended\n");
+       log_debug("ttrss_get_feeds() done");
 
        return feeds;
 }