]>
Commit | Line | Data |
---|---|---|
d3845180 JB |
1 | --- newsbeuter-2.9/src/ttrss_api.cpp.orig 2018-05-17 20:41:01.189862343 +0200 |
2 | +++ newsbeuter-2.9/src/ttrss_api.cpp 2018-05-17 20:41:06.496528947 +0200 | |
3 | @@ -113,19 +113,19 @@ | |
4 | LOG(LOG_DEBUG, "ttrss_api::run_op(%s,...): post=%s reply = %s", op.c_str(), req_data.c_str(), result.c_str()); | |
5 | ||
6 | struct json_object * reply = json_tokener_parse(result.c_str()); | |
7 | - if (is_error(reply)) { | |
8 | + if (reply == nullptr) { | |
9 | LOG(LOG_ERROR, "ttrss_api::run_op: reply failed to parse: %s", result.c_str()); | |
10 | return NULL; | |
11 | } | |
12 | ||
13 | struct json_object * status = json_object_object_get(reply, "status"); | |
14 | - if (is_error(status)) { | |
15 | + if (status == nullptr) { | |
16 | LOG(LOG_ERROR, "ttrss_api::run_op: no status code"); | |
17 | return NULL; | |
18 | } | |
19 | ||
20 | struct json_object * content = json_object_object_get(reply, "content"); | |
21 | - if (is_error(content)) { | |
22 | + if (content == nullptr) { | |
23 | LOG(LOG_ERROR, "ttrss_api::run_op: no content part in answer from server"); | |
24 | return NULL; | |
25 | } | |
26 | --- newsbeuter-2.9/src/oldreader_api.cpp.orig 2015-02-19 11:56:59.000000000 +0100 | |
27 | +++ newsbeuter-2.9/src/oldreader_api.cpp 2018-05-17 20:43:12.683194179 +0200 | |
28 | @@ -134,7 +134,7 @@ | |
29 | // TODO: parse result | |
30 | ||
31 | struct json_object * reply = json_tokener_parse(result.c_str()); | |
32 | - if (is_error(reply)) { | |
33 | + if (reply == nullptr) { | |
34 | LOG(LOG_ERROR, "oldreader_api::get_subscribed_urls: failed to parse response as JSON."); | |
35 | return urls; | |
36 | } | |
37 | --- newsbeuter-2.9/src/feedhq_api.cpp.orig 2015-02-19 11:56:59.000000000 +0100 | |
38 | +++ newsbeuter-2.9/src/feedhq_api.cpp 2018-05-17 20:45:04.159859569 +0200 | |
39 | @@ -132,7 +132,7 @@ | |
40 | // TODO: parse result | |
41 | ||
42 | struct json_object * reply = json_tokener_parse(result.c_str()); | |
43 | - if (is_error(reply)) { | |
44 | + if (reply == nullptr) { | |
45 | LOG(LOG_ERROR, "feedhq_api::get_subscribed_urls: failed to parse response as JSON."); | |
46 | return urls; | |
47 | } |