Merge pull request #219 from antonlindstrom/cleanup/old-style-cast

Fix -Wold-style-cast warnings
libcpr · Oct 23, 2017 · 436a325 · 436a325
2 parents 27f9649 + 3b76835
commit 436a325
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/cpr/timeout.cpp b/cpr/timeout.cpp
@@ -20,7 +20,7 @@ long Timeout::Milliseconds() const {
                                    std::to_string(ms.count()) + " ms.");
     }
 
-    return static_cast<long>(ms.count());
+    return ms.count();
 }
 
 } // namespace cpr
diff --git a/cpr/util.cpp b/cpr/util.cpp
@@ -54,7 +54,7 @@ std::vector<std::string> split(const std::string& to_split, char delimiter) {
 }
 
 size_t writeFunction(void* ptr, size_t size, size_t nmemb, std::string* data) {
-    data->append((char*) ptr, size * nmemb);
+    data->append(static_cast<char*>(ptr), size * nmemb);
     return size * nmemb;
 }
 
@@ -71,7 +71,7 @@ std::string urlEncode(const std::string& value) {
             continue;
         }
         // Any other characters are percent-encoded
-        escaped << '%' << std::setw(2) << std::int32_t((unsigned char) c);
+        escaped << '%' << std::setw(2) << std::int32_t(static_cast<unsigned char>(c));
     }
 
     return escaped.str();

diff --git a/test/post_tests.cpp b/test/post_tests.cpp
@@ -32,7 +32,7 @@ TEST(UrlEncodedPostTests, UrlPostAddPayloadPair) {
     auto url = Url{base + "/url_post.html"};
     auto payload = Payload{{"x", "1"}};
     payload.AddPair({"y", "2"});
-    auto response = cpr::Post(url, Payload(payload));
+    auto response = cpr::Post(url, payload);
     auto expected_text = std::string{"{\n"
                                      "  \"x\": 1,\n"
                                      "  \"y\": 2,\n"

diff --git a/test/server.cpp b/test/server.cpp
@@ -99,7 +99,7 @@ static int basicCookies(struct mg_connection* conn) {
     mg_send_header(conn, "content-type", "text/html");
     time_t t = time(NULL) + 5;  // Valid for 1 hour
     char expire[100], expire_epoch[100];
-    snprintf(expire_epoch, sizeof(expire_epoch), "%lu", (unsigned long) t);
+    snprintf(expire_epoch, sizeof(expire_epoch), "%lu", static_cast<unsigned long>(t));
     strftime(expire, sizeof(expire), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&t));
     std::string cookie{"cookie=chocolate; expires=\"" + std::string{expire} + "\"; http-only;"};
     std::string cookie2{"icecream=vanilla; expires=\"" + std::string{expire} + "\"; http-only;"};
@@ -115,7 +115,7 @@ static int v1Cookies(struct mg_connection* conn) {
     mg_send_header(conn, "content-type", "text/html");
     time_t t = time(NULL) + 5; // Valid for 1 hour
     char expire[100], expire_epoch[100];
-    snprintf(expire_epoch, sizeof(expire_epoch), "%lu", (unsigned long) t);
+    snprintf(expire_epoch, sizeof(expire_epoch), "%lu", static_cast<unsigned long>(t));
     strftime(expire, sizeof(expire), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&t));
     std::string v1cookie{"cookie=\"value with spaces (v1 cookie)\"; expires=\"" +
                          std::string{expire} + "\"; http-only;"};
@@ -342,7 +342,7 @@ static int formPost(struct mg_connection* conn) {
         auto read_len = mg_parse_multipart(content, content_len,
                                            name, sizeof(name),
                                            filename, sizeof(filename),
-                                           (const char**) &data, &data_len);
+                                           const_cast<const char**>(&data), &data_len);
         if (read_len == 0) {
             delete[] data;
             break;
@@ -356,7 +356,7 @@ static int formPost(struct mg_connection* conn) {
             break;
         }
 
-        forms[name] = std::string{data, (unsigned long) data_len};
+        forms[name] = std::string{data, static_cast<unsigned long>(data_len)};
     }
 
     mg_send_status(conn, 201);
@@ -540,9 +540,9 @@ static int evHandler(struct mg_connection* conn, enum mg_event ev) {
             } else if (Url{conn->uri} == "/timeout.html") {
                 return timeout(conn);
             } else if (Url{conn->uri} == "/low_speed.html") {
-                return lowSpeed(conn);				
+                return lowSpeed(conn);
             } else if (Url{conn->uri} == "/low_speed_bytes.html") {
-                return lowSpeedBytes(conn);				
+                return lowSpeedBytes(conn);
             } else if (Url{conn->uri} == "/basic_cookies.html") {
                 return basicCookies(conn);
             } else if (Url{conn->uri} == "/check_cookies.html") {
@@ -684,7 +684,7 @@ std::string base64_decode(std::string const& encoded_string) {
 }
 
 static int lowercase(const char *s) {
-    return tolower(* (const unsigned char *) s);
+    return tolower(* reinterpret_cast<const unsigned char *>(s));
 }
 
 static int mg_strncasecmp(const char *s1, const char *s2, size_t len) {