diff options
Diffstat (limited to 'archival')
-rw-r--r-- | archival/dpkg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index 27512eb5d..1db53f494 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -602,7 +602,7 @@ static unsigned fill_package_struct(char *control_buffer) | |||
602 | &field_name, &field_value); | 602 | &field_name, &field_value); |
603 | 603 | ||
604 | if (field_name == NULL) { | 604 | if (field_name == NULL) { |
605 | goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement! */ | 605 | goto fill_package_struct_cleanup; |
606 | } | 606 | } |
607 | 607 | ||
608 | field_num = index_in_strings(field_names, field_name); | 608 | field_num = index_in_strings(field_names, field_name); |
@@ -745,7 +745,7 @@ static void index_status_file(const char *filename) | |||
745 | unsigned status_num; | 745 | unsigned status_num; |
746 | 746 | ||
747 | status_file = xfopen(filename, "r"); | 747 | status_file = xfopen(filename, "r"); |
748 | while ((control_buffer = xmalloc_fgets_str(status_file, "\n\n")) != NULL) { | 748 | while ((control_buffer = xmalloc_fgetline_str(status_file, "\n\n")) != NULL) { |
749 | const unsigned package_num = fill_package_struct(control_buffer); | 749 | const unsigned package_num = fill_package_struct(control_buffer); |
750 | if (package_num != -1) { | 750 | if (package_num != -1) { |
751 | status_node = xmalloc(sizeof(status_node_t)); | 751 | status_node = xmalloc(sizeof(status_node_t)); |
@@ -798,7 +798,7 @@ static void write_status_file(deb_file_t **deb_file) | |||
798 | int i = 0; | 798 | int i = 0; |
799 | 799 | ||
800 | /* Update previously known packages */ | 800 | /* Update previously known packages */ |
801 | while ((control_buffer = xmalloc_fgets_str(old_status_file, "\n\n")) != NULL) { | 801 | while ((control_buffer = xmalloc_fgetline_str(old_status_file, "\n\n")) != NULL) { |
802 | tmp_string = strstr(control_buffer, "Package:"); | 802 | tmp_string = strstr(control_buffer, "Package:"); |
803 | if (tmp_string == NULL) { | 803 | if (tmp_string == NULL) { |
804 | continue; | 804 | continue; |