Skip to content

Commit

Permalink
config: blobmsg_check_attr expects bool type as last argument
Browse files Browse the repository at this point in the history
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
  • Loading branch information
Hans Dedecker committed Dec 15, 2015
1 parent c5cb116 commit 25f7c94
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/config.c
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion src/ubus.c
Expand Up @@ -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;
Expand Down

0 comments on commit 25f7c94

Please sign in to comment.