uci: Fix extra semicolons warnings

Found with clang's -Wextra-semi-stmt

Fixes:

error: empty expression statement has no effect; remove unnecessary ';' to
silence this warning [-Werror,-Wextra-semi-stmt]
                UCI_TRAP_SAVE(ctx, error);
                                         ^
error: empty expression statement has no effect; remove unnecessary ';' to
silence this warning [-Werror,-Wextra-semi-stmt]
        UCI_TRAP_SAVE(ctx, ignore);

error: empty expression statement has no effect; remove unnecessary ';' to
silence this warning [-Werror,-Wextra-semi-stmt]
        };

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/parse.c b/parse.c
index 499c32ea17d496ba1c63f644c7f1d7eac823ec2f..40645c58f396e3d6171a9e2a35a4a83252419dd1 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -83,7 +83,7 @@ static uint32_t hash_murmur2(uint32_t h, const void * key, int len)
                /* fall through */
        case 1: h ^= data[0];
                h *= m;
-       };
+       }
 
        h ^= h >> 13;
        h *= m;

diff --git a/uci_internal.h b/uci_internal.h
index 61f2da2ab337bc89cf9278f3cb26171d686428b1..f00b394972fad870c34e0e445b239b2c2e228be1 100644 (file)
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -215,7 +215,7 @@ struct uci_backend _var = {         \
                ctx->err = __val;       \
                memcpy(ctx->trap, __old_trap, sizeof(ctx->trap)); \
                goto handler;           \
-       }
+       } while(0)
 #define UCI_TRAP_RESTORE(ctx)          \
        memcpy(ctx->trap, __old_trap, sizeof(ctx->trap)); \
 } while(0)