ifupdown: save some 100+ bytes of code in addstr()

[oweals/busybox.git] / archival / dpkg.c

diff --git a/archival/dpkg.c b/archival/dpkg.c
index 2f7372100b52c9539560e72f0bcdcb1d9ef44486..9024d41d237ecfdff522ebe464cac557f36957c9 100644 (file)
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -644,7 +644,7 @@ static unsigned int fill_package_struct(char *control_buffer)
                        goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement ! */
                }
 
-               field_num = compare_string_array(field_names, field_name);
+               field_num = index_in_str_array(field_names, field_name);
                switch (field_num) {
                        case 0: /* Package */
                                new_node->name = search_name_hashtable(field_value);
@@ -787,7 +787,7 @@ static void index_status_file(const char *filename)
        unsigned int status_num;
 
        status_file = xfopen(filename, "r");
-       while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) {
+       while ((control_buffer = xmalloc_fgets_str(status_file, "\n\n")) != NULL) {
                const unsigned int package_num = fill_package_struct(control_buffer);
                if (package_num != -1) {
                        status_node = xmalloc(sizeof(status_node_t));
@@ -842,7 +842,7 @@ static void write_status_file(deb_file_t **deb_file)
        int i = 0;
 
        /* Update previously known packages */
-       while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) {
+       while ((control_buffer = xmalloc_fgets_str(old_status_file, "\n\n")) != NULL) {
                if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) {
                        continue;
                }