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

function                                             old     new   delta
create_list                                          104      86     -18
This commit is contained in:
Denis Vlasenko 2008-06-21 22:10:52 +00:00
parent 3387538bbe
commit 20273138fc

View File

@ -1152,9 +1152,9 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
static char **create_list(const char *filename) static char **create_list(const char *filename)
{ {
FILE *list_stream; FILE *list_stream;
char **file_list = NULL; char **file_list;
char *line = NULL; char *line;
int count = 0; int count;
/* don't use [xw]fopen here, handle error ourself */ /* don't use [xw]fopen here, handle error ourself */
list_stream = fopen(filename, "r"); list_stream = fopen(filename, "r");
@ -1162,17 +1162,15 @@ static char **create_list(const char *filename)
return NULL; return NULL;
} }
file_list = NULL;
count = 0;
while ((line = xmalloc_fgetline(list_stream)) != NULL) { while ((line = xmalloc_fgetline(list_stream)) != NULL) {
file_list = xrealloc(file_list, sizeof(char *) * (count + 2)); file_list = xrealloc(file_list, sizeof(char *) * (count + 2));
file_list[count] = line; file_list[count++] = line;
count++; file_list[count] = NULL;
} }
fclose(list_stream); fclose(list_stream);
if (count == 0) {
return NULL;
}
file_list[count] = NULL;
return file_list; return file_list;
} }