Tidy up some valgrind errors.

diff --git a/if-linux.c b/if-linux.c
index 8419b5ec1ba9d8e30510dae58bd533d8d62ab372..3840f931ecd4c90213589bd4dc6355769631b159 100644 (file)
--- a/if-linux.c
+++ b/if-linux.c
@@ -398,6 +398,7 @@ discover_interfaces(int argc, char * const *argv)
        FILE *f;
        char *buffer = NULL, *p;
        size_t len = 0, ln = 0, n;
+       int i;
        struct interface *ifs = NULL, *ifp, *ifl;
 
        if ((f = fopen("/proc/net/dev", "r"))) {
@@ -418,21 +419,21 @@ discover_interfaces(int argc, char * const *argv)
                        if (ifp)
                                continue;
                        if (argc > 0) {
-                               for (n = 0; n < argc; n++)
-                                       if (strcmp(argv[n], p) == 0)
+                               for (i = 0; i < argc; i++)
+                                       if (strcmp(argv[i], p) == 0)
                                                break;
-                               if (n == argc)
+                               if (i == argc)
                                        continue;
                        } else {
-                               for (n = 0; n < ifdc; n++)
-                                       if (!fnmatch(ifdv[n], ifr->ifr_name, 0))
+                               for (i = 0; i < ifdc; i++)
+                                       if (!fnmatch(ifdv[i], p, 0))
                                                break;
-                               if (n < ifdc)
+                               if (i < ifdc)
                                        continue;
-                               for (n = 0; n < ifac; n++)
-                                       if (!fnmatch(ifav[n], ifr->ifr_name, 0))
+                               for (i = 0; i < ifac; i++)
+                                       if (!fnmatch(ifav[i], p, 0))
                                                break;
-                               if (ifac && n == ifac)
+                               if (ifac && i == ifac)
                                        continue;
                        }
                        if ((ifp = init_interface(p))) {

diff --git a/if-options.c b/if-options.c
index e51a09f6757fbe38ccf01887e619afd75e5429dd..7e2d4faac6c688085dce5e8566e240f869d9e0ee 100644 (file)
--- a/if-options.c
+++ b/if-options.c
@@ -259,7 +259,7 @@ splitv(int *argc, char **argv, const char *arg)
        p = o;
        while ((t = strsep(&p, ", "))) {
                (*argc)++;
-               v = xrealloc(v, *argc);
+               v = xrealloc(v, sizeof(char *) * ((*argc)));
                v[(*argc) - 1] = xstrdup(t);
        }
        free(o);