Notes on portability, and on when #include <linux/blah> is appropriate.

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

diff --git a/archival/dpkg.c b/archival/dpkg.c
index 7ed17d711268dec22d90cd800dea89fd54b9d6a6..74d3a83d943ecab368cf6a5840a3c8634dae2d20 100644 (file)
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -544,17 +544,19 @@ static void free_package(common_node_t *node)
                for (i = 0; i < node->num_of_edges; i++) {
                        free(node->edge[i]);
                }
-               if ( node->edge )
-                       free(node->edge);
+               free(node->edge);
                free(node);
        }
 }
 
 static unsigned int fill_package_struct(char *control_buffer)
 {
+       static const char *const field_names[] = { "Package", "Version",
+               "Pre-Depends", "Depends","Replaces", "Provides",
+               "Conflicts", "Suggests", "Recommends", "Enhances", 0
+       };
+
        common_node_t *new_node = (common_node_t *) xcalloc(1, sizeof(common_node_t));
-       const char *field_names[] = { "Package", "Version", "Pre-Depends", "Depends",
-               "Replaces", "Provides", "Conflicts", "Suggests", "Recommends", "Enhances", 0};
        char *field_name;
        char *field_value;
        int field_start = 0;