curl.test.patch: drop message shadow patch

Author: vszakats

curl.test.patch

@@ -1,108 +1,3 @@
-diff --git a/lib/imap.c b/lib/imap.c
-index e424cdb05..9b7318e42 100644
---- a/lib/imap.c
-+++ b/lib/imap.c
-@@ -357,24 +357,24 @@ static bool imap_endofresp(struct Curl_easy *data, struct connectdata *conn,
-  */
- static CURLcode imap_get_message(struct Curl_easy *data, struct bufref *out)
- {
--  char *message = Curl_dyn_ptr(&data->conn->proto.imapc.pp.recvbuf);
-+  char *msg = Curl_dyn_ptr(&data->conn->proto.imapc.pp.recvbuf);
-   size_t len = data->conn->proto.imapc.pp.nfinal;
- 
-   if(len > 2) {
-     /* Find the start of the message */
-     len -= 2;
--    for(message += 2; *message == ' ' || *message == '\t'; message++, len--)
-+    for(msg += 2; *msg == ' ' || *msg == '\t'; msg++, len--)
-       ;
- 
-     /* Find the end of the message */
-     while(len--)
--      if(message[len] != '\r' && message[len] != '\n' && message[len] != ' ' &&
--         message[len] != '\t')
-+      if(msg[len] != '\r' && msg[len] != '\n' && msg[len] != ' ' &&
-+         msg[len] != '\t')
-         break;
- 
-     /* Terminate the message */
--    message[++len] = '\0';
--    Curl_bufref_set(out, message, len, NULL);
-+    msg[++len] = '\0';
-+    Curl_bufref_set(out, msg, len, NULL);
-   }
-   else
-     /* junk input => zero length output */
-diff --git a/lib/pop3.c b/lib/pop3.c
-index db6ec04c7..b28edbf62 100644
---- a/lib/pop3.c
-+++ b/lib/pop3.c
-@@ -310,24 +310,24 @@ static bool pop3_endofresp(struct Curl_easy *data, struct connectdata *conn,
-  */
- static CURLcode pop3_get_message(struct Curl_easy *data, struct bufref *out)
- {
--  char *message = Curl_dyn_ptr(&data->conn->proto.pop3c.pp.recvbuf);
-+  char *msg = Curl_dyn_ptr(&data->conn->proto.pop3c.pp.recvbuf);
-   size_t len = data->conn->proto.pop3c.pp.nfinal;
- 
-   if(len > 2) {
-     /* Find the start of the message */
-     len -= 2;
--    for(message += 2; *message == ' ' || *message == '\t'; message++, len--)
-+    for(msg += 2; *msg == ' ' || *msg == '\t'; msg++, len--)
-       ;
- 
-     /* Find the end of the message */
-     while(len--)
--      if(message[len] != '\r' && message[len] != '\n' && message[len] != ' ' &&
--         message[len] != '\t')
-+      if(msg[len] != '\r' && msg[len] != '\n' && msg[len] != ' ' &&
-+         msg[len] != '\t')
-         break;
- 
-     /* Terminate the message */
--    message[++len] = '\0';
--    Curl_bufref_set(out, message, len, NULL);
-+    msg[++len] = '\0';
-+    Curl_bufref_set(out, msg, len, NULL);
-   }
-   else
-     /* junk input => zero length output */
-diff --git a/lib/smtp.c b/lib/smtp.c
-index d854d364f..49daeaa4e 100644
---- a/lib/smtp.c
-+++ b/lib/smtp.c
-@@ -253,24 +253,24 @@ static bool smtp_endofresp(struct Curl_easy *data, struct connectdata *conn,
-  */
- static CURLcode smtp_get_message(struct Curl_easy *data, struct bufref *out)
- {
--  char *message = Curl_dyn_ptr(&data->conn->proto.smtpc.pp.recvbuf);
-+  char *msg = Curl_dyn_ptr(&data->conn->proto.smtpc.pp.recvbuf);
-   size_t len = data->conn->proto.smtpc.pp.nfinal;
- 
-   if(len > 4) {
-     /* Find the start of the message */
-     len -= 4;
--    for(message += 4; *message == ' ' || *message == '\t'; message++, len--)
-+    for(msg += 4; *msg == ' ' || *msg == '\t'; msg++, len--)
-       ;
- 
-     /* Find the end of the message */
-     while(len--)
--      if(message[len] != '\r' && message[len] != '\n' && message[len] != ' ' &&
--         message[len] != '\t')
-+      if(msg[len] != '\r' && msg[len] != '\n' && msg[len] != ' ' &&
-+         msg[len] != '\t')
-         break;
- 
-     /* Terminate the message */
--    message[++len] = '\0';
--    Curl_bufref_set(out, message, len, NULL);
-+    msg[++len] = '\0';
-+    Curl_bufref_set(out, msg, len, NULL);
-   }
-   else
-     /* junk input => zero length output */
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index c4ba74d9fb5a05..aebbc719517713 100644
 --- a/CMakeLists.txt