From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 8 Feb 2006 20:14:49 +0000 (+0000)
Subject: in get_prompt_string(), use a do/while loop instead of a while loop, for
X-Git-Tag: v1.3.11~42
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=591c409f3fef82d365d6d5df172267ee84aeb2d6;p=nano.git

in get_prompt_string(), use a do/while loop instead of a while loop, for
consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3287 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 7a11e581..5e3ed6dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,10 @@ CVS code -
 - files.c:
   is_dir()
 	- Rename parameter ret to retval, for consistency. (DLR)
+- prompt.c:
+  get_prompt_string()
+	- Use a do/while loop instead of a while loop, for consistency.
+	  (DLR)
 - utils.c:
   ngetdelim()
 	- Do sanity checks manually again instead of in an assert, and
diff --git a/src/prompt.c b/src/prompt.c
index c745eb2b..e31da893 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -911,7 +911,7 @@ int get_prompt_string(bool allow_tabs,
 #endif
 	)
 {
-    int kbinput;
+    int kbinput = ERR;
     bool meta_key, func_key, s_or_t, ran_func, finished;
     size_t curranswer_len;
 #ifndef DISABLE_TABCOMP
@@ -961,10 +961,7 @@ int get_prompt_string(bool allow_tabs,
      * to files not specified on the command line.  In this case,
      * disable all keys that would change the text if the filename isn't
      * blank and we're at the "Write File" prompt. */
-    while ((kbinput = do_statusbar_input(&meta_key, &func_key,
-	&s_or_t, &ran_func, &finished, TRUE)) != NANO_CANCEL_KEY &&
-	kbinput != NANO_ENTER_KEY) {
-
+    do {
 	assert(statusbar_x <= strlen(answer));
 
 #ifndef DISABLE_TABCOMP
@@ -1063,7 +1060,9 @@ int get_prompt_string(bool allow_tabs,
 #endif
 
 	reset_statusbar_cursor();
-    }
+    } while ((kbinput = do_statusbar_input(&meta_key, &func_key,
+	&s_or_t, &ran_func, &finished, TRUE)) != NANO_CANCEL_KEY &&
+	kbinput != NANO_ENTER_KEY);
 
 #ifndef NANO_TINY
     /* Set the current position in the history list to the bottom and