get_line now uses a single buffer, strips leading space and skips comments. This reduces malloc usage slightly and gives a cleaner API at the expense of a slight bss increase.

1 files changed, 3 insertions, 7 deletions

diff --git a/if-linux.c b/if-linux.c
index bbbc5493..188a9af5 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -431,18 +431,15 @@ struct interface *
 discover_interfaces(int argc, char * const *argv)
 {
 	FILE *f;
-	char *buffer = NULL, *p;
-	size_t len = 0, ln = 0, n;
+	char *p;
+	size_t ln = 0, n;
 	int i;
 	struct interface *ifs = NULL, *ifp, *ifl;
 
 	if ((f = fopen("/proc/net/dev", "r"))) {
-		while (get_line(&buffer, &len, f)) {
+		while (p = get_line(f)) {
 			if (++ln < 2)
 				continue;
-			p = buffer;
-			while (isspace((unsigned int)*p))
-				p++;
 			n = strcspn(p, ": \t");
 			p[n]= '\0';
 			ifl = NULL;
@@ -479,7 +476,6 @@ discover_interfaces(int argc, char * const *argv)
 			}
 		}
 		fclose(f);
-		free(buffer);
 	}
 	return ifs;
 }