diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-19 21:48:56 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-19 21:48:56 +0000 |
commit | 88a2aa98e06cf6b0aa00a3cf88376a1d3497fb2c (patch) | |
tree | 16f9ce2ca7cf2943064acdd891fab8a86909d2a9 | |
parent | 97fd6d81b4f101a32c31c4711fb43d0f5c78c47b (diff) | |
download | busybox-w32-88a2aa98e06cf6b0aa00a3cf88376a1d3497fb2c.tar.gz busybox-w32-88a2aa98e06cf6b0aa00a3cf88376a1d3497fb2c.tar.bz2 busybox-w32-88a2aa98e06cf6b0aa00a3cf88376a1d3497fb2c.zip |
dpkg: free_package(NULL) is ok, so don't test for NULL, just free.
-rw-r--r-- | archival/dpkg.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index ebdf6c68a..0a42deb39 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -643,8 +643,7 @@ static unsigned fill_package_struct(char *control_buffer) | |||
643 | return -1; | 643 | return -1; |
644 | } | 644 | } |
645 | num = search_package_hashtable(new_node->name, new_node->version, VER_EQUAL); | 645 | num = search_package_hashtable(new_node->name, new_node->version, VER_EQUAL); |
646 | if (package_hashtable[num] != NULL) | 646 | free_package(package_hashtable[num]); |
647 | free_package(package_hashtable[num]); | ||
648 | package_hashtable[num] = new_node; | 647 | package_hashtable[num] = new_node; |
649 | return num; | 648 | return num; |
650 | } | 649 | } |
@@ -1739,9 +1738,7 @@ int dpkg_main(int argc, char **argv) | |||
1739 | } | 1738 | } |
1740 | 1739 | ||
1741 | for (i = 0; i < PACKAGE_HASH_PRIME; i++) { | 1740 | for (i = 0; i < PACKAGE_HASH_PRIME; i++) { |
1742 | if (package_hashtable[i] != NULL) { | 1741 | free_package(package_hashtable[i]); |
1743 | free_package(package_hashtable[i]); | ||
1744 | } | ||
1745 | } | 1742 | } |
1746 | 1743 | ||
1747 | for (i = 0; i < STATUS_HASH_PRIME; i++) { | 1744 | for (i = 0; i < STATUS_HASH_PRIME; i++) { |