diff options
| author | Steven Barth <steven@midlink.org> | 2016-01-31 16:19:05 +0100 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2016-01-31 16:19:05 +0100 |
| commit | 1fcf0388078c7675187ff4f2f644aaf65138f261 (patch) | |
| tree | 21f3d9b303a13b6c358747799dbe29d5750381ae | |
| parent | c5cb11650a1f7ff321b4ac190c8be7f533cf9636 (diff) | |
| parent | 25f7c94b65dcd501c8f12e7515e3e33332ce3c9e (diff) | |
| download | odhcpd-1fcf0388078c7675187ff4f2f644aaf65138f261.tar.gz | |
Merge pull request #68 from dedeckeh/bugfixes
config: blobmsg_check_attr expects bool type as last argument
| -rw-r--r-- | src/config.c | 8 | ||||
| -rw-r--r-- | 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]; @@ -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; |