ncurses 6.4 - patch 20240420

[ncurses.git] / ncurses / tinfo / comp_scan.c

diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index c4b077de0046fa72e721e3ca4f415fa51a7bcdb2..3ba0835e2fb807aed6d27d6e9a2625c909d76f55 100644 (file)
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.121 2023/05/20 18:33:33 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.122 2023/05/27 20:13:10 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -328,9 +328,11 @@ end_of_stream(void)
 static NCURSES_INLINE int
 eat_escaped_newline(int ch)
 {
-    if (ch == '\\')
-       while ((ch = next_char()) == '\n' || iswhite(ch))
-           continue;
+    if (ch == '\\') {
+       while ((ch = next_char()) == '\n' || iswhite(ch)) {
+           /* EMPTY */ ;
+       }
+    }
     return ch;
 }
 
@@ -434,7 +436,6 @@ _nc_get_token(bool silent)
     while ((ch = next_char()) == '\n' || iswhite(ch)) {
        if (ch == '\n')
            had_newline = TRUE;
-       continue;
     }
 
     ch = eat_escaped_newline(ch);
@@ -459,8 +460,9 @@ _nc_get_token(bool silent)
            dot_flag = TRUE;
            DEBUG(8, ("dot-flag set"));
 
-           while ((ch = next_char()) == '.' || iswhite(ch))
-               continue;
+           while ((ch = next_char()) == '.' || iswhite(ch)) {
+               /* EMPTY */ ;
+           }
        }
 
        if (ch == EOF) {
@@ -601,8 +603,9 @@ _nc_get_token(bool silent)
                /* throw away trailing /, *$/ */
                for (--tok_ptr;
                     iswhite(*tok_ptr) || *tok_ptr == ',';
-                    tok_ptr--)
-                   continue;
+                    tok_ptr--) {
+                   /* EMPTY */ ;
+               }
                tok_ptr[1] = '\0';
            }
 
@@ -831,7 +834,7 @@ _nc_get_token(bool silent)
  */
 
 NCURSES_EXPORT(int)
-_nc_trans_string(char *ptr, char *last)
+_nc_trans_string(char *ptr, const char *const last)
 {
     int count = 0;
     int number = 0;