From: Roy Marples <roy@marples.name>
Date: Thu, 11 Sep 2008 09:56:57 +0000 (+0000)
Subject: Tidy up some valgrind errors.
X-Git-Tag: v5.0.0~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ede5017e8c2fd5232d1ffaec67346250a0ed8eb7;p=thirdparty%2Fdhcpcd.git

Tidy up some valgrind errors.
---

diff --git a/if-linux.c b/if-linux.c
index 8419b5ec..3840f931 100644
--- 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 e51a09f6..7e2d4faa 100644
--- 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);