From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 25 Nov 2014 10:54:09 +0000 (+0100)
Subject: fix a few formatting issues
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b342283d2dda28083322e99ffae874ba92839c74;p=oweals%2Fuci.git

fix a few formatting issues

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/file.c b/file.c
index 8d4408d..ffa3afa 100644
--- a/file.c
+++ b/file.c
@@ -90,11 +90,11 @@ static bool parse_backslash(struct uci_context *ctx)
 	pctx->pos += 1;
 
 	/* undecoded backslash at the end of line, fetch the next line */
-	if (!pctx_cur_char(pctx)
-		    || pctx_cur_char(pctx) == '\n'
-		    || (pctx_cur_char(pctx) == '\r' &&
-			pctx_char(pctx, pctx_pos(pctx) + 1) == '\n' &&
-			!pctx_char(pctx, pctx_pos(pctx) + 2))) {
+	if (!pctx_cur_char(pctx) ||
+	    pctx_cur_char(pctx) == '\n' ||
+	    (pctx_cur_char(pctx) == '\r' &&
+	     pctx_char(pctx, pctx_pos(pctx) + 1) == '\n' &&
+	     !pctx_char(pctx, pctx_pos(pctx) + 2))) {
 		uci_getln(ctx, pctx->pos);
 		return false;
 	}
@@ -179,9 +179,9 @@ static void parse_single_quote(struct uci_context *ctx, int *target)
 		case 0:
 			/* Multi-line str value */
 			uci_getln(ctx, pctx->pos);
-			if (!pctx_cur_char(pctx)) {
+			if (!pctx_cur_char(pctx))
 				uci_parse_error(ctx, "EOF with unterminated \"");
-			}
+
 			break;
 		default:
 			addc(ctx, target, &pctx->pos);
diff --git a/util.c b/util.c
index 09f1817..f16a378 100644
--- a/util.c
+++ b/util.c
@@ -89,12 +89,10 @@ bool uci_validate_text(const char *str)
 {
 	while (*str) {
 		unsigned char c = *str;
-		if (((c < 32) &&
-		     (c != '\t') &&
-		     (c != '\n') &&
-		     (c != '\r'))) {
+
+		if (c < 32 && c != '\t' && c != '\n' && c != '\r')
 			return false;
-		}
+
 		str++;
 	}
 	return true;