Mercurial > hg > dhcpcd

changeset 969:f5c92b2d9e46 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy up some valgrind errors.
author Roy Marples <roy@marples.name>
date Thu, 11 Sep 2008 09:56:57 +0000
parents fda8caac3a0c
children 0c2a3672b356
files if-linux.c if-options.c
diffstat 2 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/if-linux.c	Thu Sep 11 09:38:02 2008 +0000
+++ b/if-linux.c	Thu Sep 11 09:56:57 2008 +0000
@@ -398,6 +398,7 @@
 	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 @@
 			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))) {
--- a/if-options.c	Thu Sep 11 09:38:02 2008 +0000
+++ b/if-options.c	Thu Sep 11 09:56:57 2008 +0000
@@ -259,7 +259,7 @@
 	p = o;
 	while ((t = strsep(&p, ", "))) {
 		(*argc)++;
-		v = xrealloc(v, *argc);
+		v = xrealloc(v, sizeof(char *) * ((*argc)));
 		v[(*argc) - 1] = xstrdup(t);
 	}
 	free(o);