Fix compiler warnings.

diff --git a/src/net_setup.c b/src/net_setup.c
index c4f2127ec0dee48bfe9a4f79c8ee48cfb35aef60..96a7224781bc1772d93e1bb20a46d4c9687b1bc6 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -445,7 +445,6 @@ bool setup_myself_reloadable(void) {
        char *fmode = NULL;
        char *bmode = NULL;
        char *afname = NULL;
-       char *address = NULL;
        char *space;
        bool choice;
 

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 592283117f8df39cf1e18f0ab9209526249fbeb1..5b0b4822eed56d862aeef1ff3de35b94878d714b 100644 (file)
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -262,10 +262,11 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
        if (double_colon) {
                /* Figure out how many zero groups we need to expand */
                int zero_group_count = 8;
-               for (const char* cur = str; *cur; *cur && cur++)
+               for (const char* cur = str; *cur; cur++)
                        if (*cur != ':') {
                                zero_group_count--;
-                               for (; *cur && *cur != ':'; cur++);
+                               while(cur[1] && cur[1] != ':')
+                                       cur++;
                        }
                if (zero_group_count < 1)
                        return false;
@@ -319,8 +320,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                                         subnet->net.mac.address.x[2],
                                         subnet->net.mac.address.x[3],
                                         subnet->net.mac.address.x[4],
-                                        subnet->net.mac.address.x[5],
-                                        subnet->weight);
+                                        subnet->net.mac.address.x[5]);
                        netstr += result;
                        len -= result;
                        break;