svn commit: trunk/busybox/archival

[vda at busybox.net]

Author: vda
Date: 2008-06-21 15:10:52 -0700 (Sat, 21 Jun 2008)
New Revision: 22465

Log:
dpkg: code shrink (by Peter Korsgaard <jacmet at uclibc.org>)

function                                             old     new   delta
create_list                                          104      86     -18



Modified:
   trunk/busybox/archival/dpkg.c


Changeset:
Modified: trunk/busybox/archival/dpkg.c
===================================================================
--- trunk/busybox/archival/dpkg.c	2008-06-21 20:31:50 UTC (rev 22464)
+++ trunk/busybox/archival/dpkg.c	2008-06-21 22:10:52 UTC (rev 22465)
@@ -1152,9 +1152,9 @@
 static char **create_list(const char *filename)
 {
 	FILE *list_stream;
-	char **file_list = NULL;
-	char *line = NULL;
-	int count = 0;
+	char **file_list;
+	char *line;
+	int count;
 
 	/* don't use [xw]fopen here, handle error ourself */
 	list_stream = fopen(filename, "r");
@@ -1162,17 +1162,15 @@
 		return NULL;
 	}
 
+	file_list = NULL;
+	count = 0;
 	while ((line = xmalloc_fgetline(list_stream)) != NULL) {
 		file_list = xrealloc(file_list, sizeof(char *) * (count + 2));
-		file_list[count] = line;
-		count++;
+		file_list[count++] = line;
+		file_list[count] = NULL;
 	}
 	fclose(list_stream);
 
-	if (count == 0) {
-		return NULL;
-	}
-	file_list[count] = NULL;
 	return file_list;
 }