- updated to 2.9

[packages/newsbeuter.git] / newsbeuter-json_c.patch

diff --git a/newsbeuter-json_c.patch b/newsbeuter-json_c.patch
new file mode 100644 (file)
index 0000000..96c2d58
--- /dev/null
+++ b/newsbeuter-json_c.patch
@@ -0,0 +1,47 @@
+--- newsbeuter-2.9/src/ttrss_api.cpp.orig      2018-05-17 20:41:01.189862343 +0200
++++ newsbeuter-2.9/src/ttrss_api.cpp   2018-05-17 20:41:06.496528947 +0200
+@@ -113,19 +113,19 @@
+       LOG(LOG_DEBUG, "ttrss_api::run_op(%s,...): post=%s reply = %s", op.c_str(), req_data.c_str(), result.c_str());
+ 
+       struct json_object * reply = json_tokener_parse(result.c_str());
+-      if (is_error(reply)) {
++      if (reply == nullptr) {
+               LOG(LOG_ERROR, "ttrss_api::run_op: reply failed to parse: %s", result.c_str());
+               return NULL;
+       }
+ 
+       struct json_object * status = json_object_object_get(reply, "status");
+-      if (is_error(status)) {
++      if (status == nullptr) {
+               LOG(LOG_ERROR, "ttrss_api::run_op: no status code");
+               return NULL;
+       }
+ 
+       struct json_object * content = json_object_object_get(reply, "content");
+-      if (is_error(content)) {
++      if (content == nullptr) {
+               LOG(LOG_ERROR, "ttrss_api::run_op: no content part in answer from server");
+               return NULL;
+       }
+--- newsbeuter-2.9/src/oldreader_api.cpp.orig  2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-2.9/src/oldreader_api.cpp       2018-05-17 20:43:12.683194179 +0200
+@@ -134,7 +134,7 @@
+       // TODO: parse result
+ 
+       struct json_object * reply = json_tokener_parse(result.c_str());
+-      if (is_error(reply)) {
++      if (reply == nullptr) {
+               LOG(LOG_ERROR, "oldreader_api::get_subscribed_urls: failed to parse response as JSON.");
+               return urls;
+       }
+--- newsbeuter-2.9/src/feedhq_api.cpp.orig     2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-2.9/src/feedhq_api.cpp  2018-05-17 20:45:04.159859569 +0200
+@@ -132,7 +132,7 @@
+       // TODO: parse result
+ 
+       struct json_object * reply = json_tokener_parse(result.c_str());
+-      if (is_error(reply)) {
++      if (reply == nullptr) {
+               LOG(LOG_ERROR, "feedhq_api::get_subscribed_urls: failed to parse response as JSON.");
+               return urls;
+       }