aboutsummaryrefslogtreecommitdiff
path: root/backends/networking/curl
diff options
context:
space:
mode:
authorAlexander Tkachev2016-07-26 15:54:48 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commit37859a92039fe6df705024f45f84e1fbc4df806d (patch)
tree18297ac52972617b9fdb0942444328989bdf956c /backends/networking/curl
parentbb529e6fd0bcbd69f804c599c9d685181560a337 (diff)
downloadscummvm-rg350-37859a92039fe6df705024f45f84e1fbc4df806d.tar.gz
scummvm-rg350-37859a92039fe6df705024f45f84e1fbc4df806d.tar.bz2
scummvm-rg350-37859a92039fe6df705024f45f84e1fbc4df806d.zip
CLOUD: Fix Requests
Remove unnecessary JSON warnings, fix a few places.
Diffstat (limited to 'backends/networking/curl')
-rw-r--r--backends/networking/curl/curljsonrequest.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp
index 6ff35d7b3d..1899cbd913 100644
--- a/backends/networking/curl/curljsonrequest.cpp
+++ b/backends/networking/curl/curljsonrequest.cpp
@@ -109,7 +109,7 @@ bool CurlJsonRequest::jsonIsObject(Common::JSONValue *item, const char *warningP
if (item->isObject()) return true;
- warning("%s: passed item is not an object!", warningPrefix);
+ warning("%s: passed item is not an object", warningPrefix);
debug(9, "%s", item->stringify(true).c_str());
return false;
}
@@ -120,13 +120,13 @@ bool CurlJsonRequest::jsonContainsObject(Common::JSONObject &item, const char *k
return true;
}
- warning("%s: passed item misses the \"%s\" attribute!", warningPrefix, key);
+ warning("%s: passed item misses the \"%s\" attribute", warningPrefix, key);
return false;
}
if (item.getVal(key)->isObject()) return true;
- warning("%s: passed item's \"%s\" attribute is not an object!", warningPrefix, key);
+ warning("%s: passed item's \"%s\" attribute is not an object", warningPrefix, key);
debug(9, "%s", item.getVal(key)->stringify(true).c_str());
return false;
}
@@ -137,13 +137,13 @@ bool CurlJsonRequest::jsonContainsString(Common::JSONObject &item, const char *k
return true;
}
- warning("%s: passed item misses the \"%s\" attribute!", warningPrefix, key);
+ warning("%s: passed item misses the \"%s\" attribute", warningPrefix, key);
return false;
}
if (item.getVal(key)->isString()) return true;
- warning("%s: passed item's \"%s\" attribute is not a string!", warningPrefix, key);
+ warning("%s: passed item's \"%s\" attribute is not a string", warningPrefix, key);
debug(9, "%s", item.getVal(key)->stringify(true).c_str());
return false;
}
@@ -154,13 +154,13 @@ bool CurlJsonRequest::jsonContainsIntegerNumber(Common::JSONObject &item, const
return true;
}
- warning("%s: passed item misses the \"%s\" attribute!", warningPrefix, key);
+ warning("%s: passed item misses the \"%s\" attribute", warningPrefix, key);
return false;
}
if (item.getVal(key)->isIntegerNumber()) return true;
- warning("%s: passed item's \"%s\" attribute is not an integer!", warningPrefix, key);
+ warning("%s: passed item's \"%s\" attribute is not an integer", warningPrefix, key);
debug(9, "%s", item.getVal(key)->stringify(true).c_str());
return false;
}
@@ -171,13 +171,13 @@ bool CurlJsonRequest::jsonContainsArray(Common::JSONObject &item, const char *ke
return true;
}
- warning("%s: passed item misses the \"%s\" attribute!", warningPrefix, key);
+ warning("%s: passed item misses the \"%s\" attribute", warningPrefix, key);
return false;
}
if (item.getVal(key)->isArray()) return true;
- warning("%s: passed item's \"%s\" attribute is not an array!", warningPrefix, key);
+ warning("%s: passed item's \"%s\" attribute is not an array", warningPrefix, key);
debug(9, "%s", item.getVal(key)->stringify(true).c_str());
return false;
}
@@ -188,13 +188,13 @@ bool CurlJsonRequest::jsonContainsStringOrIntegerNumber(Common::JSONObject &item
return true;
}
- warning("%s: passed item misses the \"%s\" attribute!", warningPrefix, key);
+ warning("%s: passed item misses the \"%s\" attribute", warningPrefix, key);
return false;
}
if (item.getVal(key)->isString() || item.getVal(key)->isIntegerNumber()) return true;
- warning("%s: passed item's \"%s\" attribute is neither a string or an integer!", warningPrefix, key);
+ warning("%s: passed item's \"%s\" attribute is neither a string or an integer", warningPrefix, key);
debug(9, "%s", item.getVal(key)->stringify(true).c_str());
return false;
}
@@ -205,7 +205,7 @@ bool CurlJsonRequest::jsonContainsAttribute(Common::JSONObject &item, const char
return true;
}
- warning("%s: passed item misses the \"%s\" attribute!", warningPrefix, key);
+ warning("%s: passed item misses the \"%s\" attribute", warningPrefix, key);
return false;
}