diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-12 22:43:20 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-12 22:43:20 +0000 |
| commit | 2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c (patch) | |
| tree | 08de18a783dbb518dfbe5832751a214aff7d0a7a /archival | |
| parent | 372686bde7b4c0abaf01123d8dda1dc6ab9a92e2 (diff) | |
| download | busybox-w32-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.tar.gz busybox-w32-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.tar.bz2 busybox-w32-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.zip | |
bb_get_[chomped]line_from_file wasn't descriptive enough.
Renaming...
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/dpkg.c | 2 | ||||
| -rw-r--r-- | archival/tar.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index 825a8c1d2..4d0f3fbf3 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
| @@ -1206,7 +1206,7 @@ static char **create_list(const char *filename) | |||
| 1206 | return NULL; | 1206 | return NULL; |
| 1207 | } | 1207 | } |
| 1208 | 1208 | ||
| 1209 | while ((line = bb_get_chomped_line_from_file(list_stream)) != NULL) { | 1209 | while ((line = xmalloc_getline(list_stream)) != NULL) { |
| 1210 | file_list = xrealloc(file_list, sizeof(char *) * (count + 2)); | 1210 | file_list = xrealloc(file_list, sizeof(char *) * (count + 2)); |
| 1211 | file_list[count] = line; | 1211 | file_list[count] = line; |
| 1212 | count++; | 1212 | count++; |
diff --git a/archival/tar.c b/archival/tar.c index 5ebb3dff4..5935ccaa3 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -523,7 +523,7 @@ static llist_t *append_file_list_to_list(llist_t *list) | |||
| 523 | tmp = cur; | 523 | tmp = cur; |
| 524 | cur = cur->link; | 524 | cur = cur->link; |
| 525 | free(tmp); | 525 | free(tmp); |
| 526 | while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { | 526 | while ((line = xmalloc_getline(src_stream)) != NULL) { |
| 527 | char *filename_ptr = last_char_is(line, '/'); | 527 | char *filename_ptr = last_char_is(line, '/'); |
| 528 | if (filename_ptr > line) | 528 | if (filename_ptr > line) |
| 529 | *filename_ptr = '\0'; | 529 | *filename_ptr = '\0'; |