From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 19 Dec 2014 20:38:26 +0000 (+0000)
Subject: non-ascii: Prefer while loop rather than a do loop
X-Git-Tag: curl-7_40_0~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee9de01665b30ec03648c946702c5320f2096f51;p=curl

non-ascii: Prefer while loop rather than a do loop

This also removes the need to check that the 'form' argument is valid.
---

diff --git a/lib/non-ascii.c b/lib/non-ascii.c
index ef6a82cea..6c0f9e5a4 100644
--- a/lib/non-ascii.c
+++ b/lib/non-ascii.c
@@ -319,21 +319,21 @@ CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form)
   struct FormData *next;
   CURLcode result;
 
-  if(!form)
-    return CURLE_OK;
-
   if(!data)
     return CURLE_BAD_FUNCTION_ARGUMENT;
 
-  do {
-    next=form->next;  /* the following form line */
+  while(form) {
+    next = form->next;  /* the following form line */
     if(form->type == FORM_DATA) {
       result = Curl_convert_to_network(data, form->line, form->length);
       /* Curl_convert_to_network calls failf if unsuccessful */
       if(result)
         return result;
     }
-  } while((form = next) != NULL); /* continue */
+
+    form = next;
+  }
+
   return CURLE_OK;
 }