From: Jay Satiro <raysatiro@yahoo.com>
Date: Fri, 26 Jun 2020 06:26:41 +0000 (-0400)
Subject: tool_cb_hdr: Fix etag warning output and return code
X-Git-Tag: curl-7_71_1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb8527537788a33df245283206b71c807af21c5d;p=thirdparty%2Fcurl.git

tool_cb_hdr: Fix etag warning output and return code

- Return 'failure' on failure, to follow the existing style.

- Put Warning: and the warning message on the same line.

Ref: https://github.com/curl/curl/issues/5610

Closes https://github.com/curl/curl/pull/5612
---

diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index b80707fde5..5741f0abac 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -119,8 +119,8 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
 
       if(!first) {
         warnf(per->config->global,
-              "\nReceived header etag is missing double quote/s\n");
-        return 1;
+              "Received header etag is missing double quote/s\n");
+        return failure;
       }
       else {
         /* discard first double quote */
@@ -132,8 +132,8 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
 
       if(!last) {
         warnf(per->config->global,
-              "\nReceived header etag is missing double quote/s\n");
-        return 1;
+              "Received header etag is missing double quote/s\n");
+        return failure;
       }
 
       /* get length of desired etag */