fix a few formatting issues

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

diff --git a/file.c b/file.c
index 8d4408d43e4b78bd6c3af86d98e5ef5df4c8f231..ffa3afa7c1d74ec7d9b1ac2cc0cb12eb46e97bd6 100644 (file)
--- 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 09f18171cede5399a020610050b9f202dd476ee7..f16a378b307ae5468a332bd0427828acec044ff8 100644 (file)
--- 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;