From 25f7c94b65dcd501c8f12e7515e3e33332ce3c9e Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Tue, 15 Dec 2015 15:32:33 +0100 Subject: [PATCH] config: blobmsg_check_attr expects bool type as last argument Signed-off-by: Hans Dedecker --- src/config.c | 8 ++++---- src/ubus.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index 74ab3dd..8f2c6bf 100644 --- a/src/config.c +++ b/src/config.c @@ -370,7 +370,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr unsigned rem; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) continue; iface->upstream = realloc(iface->upstream, @@ -417,7 +417,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr unsigned rem; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) continue; struct in_addr addr4; @@ -440,7 +440,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr iface->always_rewrite_dns = true; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) continue; struct in_addr addr4; @@ -470,7 +470,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr unsigned rem; blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false)) continue; uint8_t buf[256]; diff --git a/src/ubus.c b/src/ubus.c index 0b51183..14d0a5f 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -345,7 +345,7 @@ bool ubus_has_prefix(const char *name, const char *ifname) continue; if ((cur = tb[IFACE_ATTR_PREFIX])) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL)) + if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, false)) continue; struct blob_attr *d; -- 2.11.0