ubus: don't redeclare variable c

[project/odhcpd.git] / src / ubus.c

diff --git a/src/ubus.c b/src/ubus.c
index 317a9c1..47239fd 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -222,15 +222,15 @@ static void subscribe_netifd(void)
 
 void ubus_apply_network(void)
 {
-       struct blob_attr *c;
+       struct blob_attr *a;
        unsigned rem;
 
        if (!dump)
                return;
 
-       blobmsg_for_each_attr(c, dump, rem) {
+       blobmsg_for_each_attr(a, dump, rem) {
                struct blob_attr *tb[IFACE_ATTR_MAX];
-               blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
+               blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(a), blobmsg_data_len(a));
 
                if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA])
                        continue;
@@ -364,13 +364,13 @@ static const struct blobmsg_policy addr_attrs[ADDR_ATTR_MAX] = {
        [ADDR_ATTR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
 };
 
-uint16_t ubus_get_class(const char *ifname, const struct in6_addr *addr)
+bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass)
 {
        struct blob_attr *c, *cur;
        unsigned rem;
 
        if (!dump)
-               return 0;
+               return false;
 
        blobmsg_for_each_attr(c, dump, rem) {
                struct blob_attr *tb[IFACE_ATTR_MAX];
@@ -401,15 +401,17 @@ uint16_t ubus_get_class(const char *ifname, const struct in6_addr *addr)
                                struct in6_addr ip6addr;
                                inet_pton(AF_INET6, addrs, &ip6addr);
 
-                               if (IN6_ARE_ADDR_EQUAL(&ip6addr, addr))
-                                       return atoi(class);
+                               if (IN6_ARE_ADDR_EQUAL(&ip6addr, addr)) {
+                                       *pclass = atoi(class);
+                                       return true;
+                               }
                        }
                }
 
-               return 0;
+               return false;
        }
 
-       return 0;
+       return false;
 }