CVS commit: src/tests/lib/libcurses/director

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Thu Feb 25 00:32:44 UTC 2021

Modified Files:
        src/tests/lib/libcurses/director: testlang_conf.l

Log Message:
tests/libcurses: reduce indentation

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/lib/libcurses/director/testlang_conf.l

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/lib/libcurses/director/testlang_conf.l
diff -u src/tests/lib/libcurses/director/testlang_conf.l:1.22 src/tests/lib/libcurses/director/testlang_conf.l:1.23
--- src/tests/lib/libcurses/director/testlang_conf.l:1.22	Thu Feb 25 00:25:31 2021
+++ src/tests/lib/libcurses/director/testlang_conf.l	Thu Feb 25 00:32:44 2021
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: testlang_conf.l,v 1.22 2021/02/25 00:25:31 rillig Exp $ 	*/
+/*	$NetBSD: testlang_conf.l,v 1.23 2021/02/25 00:32:44 rillig Exp $ 	*/
 
 /*-
  * Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -79,6 +79,7 @@ dequote(const char *s, size_t *len)
 	while (*p) {
 		if (*p == '\\' && *(p+1)) {
 			++p;
+
 			if (isdigit(*p)) {
 				if (*(p+1) && isdigit(*(p+1)) && *(p+2) &&
 				    isdigit(*(p+2))) {
@@ -87,45 +88,46 @@ dequote(const char *s, size_t *len)
 				} else {
 					*q++ = *p++;
 				}
-			} else {
-				switch (*p) {
-				case 'e':
-					/* escape */
-					*q++ = '\e';
-					p++;
-					break;
-
-				case 'n':
-					/* newline */
-					*q++ = '\n';
-					p++;
-					break;
-
-				case 'r':
-					/* carriage return */
-					*q++ = '\r';
-					p++;
-					break;
-
-				case 't':
-					/* tab */
-					*q++ = '\t';
-					p++;
-					break;
-
-				case '\\':
-					/* backslash */
-					*q++ = '\\';
-					p++;
-					break;
-
-				default:
-					if (isalpha((unsigned char)*p))
-						errx(2,
-						    "%s:%zu: invalid escape sequence '\\%c' in string literal",
-						    cur_file, line, *p);
-					*q++ = *p++;
-				}
+				continue;
+			}
+
+			switch (*p) {
+			case 'e':
+				/* escape */
+				*q++ = '\e';
+				p++;
+				break;
+
+			case 'n':
+				/* newline */
+				*q++ = '\n';
+				p++;
+				break;
+
+			case 'r':
+				/* carriage return */
+				*q++ = '\r';
+				p++;
+				break;
+
+			case 't':
+				/* tab */
+				*q++ = '\t';
+				p++;
+				break;
+
+			case '\\':
+				/* backslash */
+				*q++ = '\\';
+				p++;
+				break;
+
+			default:
+				if (isalpha(*p))
+					errx(2,
+					    "%s:%zu: invalid escape sequence '\\%c' in string literal",
+					    cur_file, line, *p);
+				*q++ = *p++;
 			}
 		} else
 			*q++ = *p++;