summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-10 00:00:35 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-10 00:00:35 (EST)
commit94b0a6bec6a0d3301e28385ee3fdf4c19f67b866 (patch)
tree2da25cc95540cd11549f06c73e1fb322851eca22
parentabc03cc413d81c734fac76bed348aecf4c3cf74c (diff)
Ensure that the hash_table messages show useful information.
git-svn-id: http://opkg.googlecode.com/svn/trunk@275 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
-rw-r--r--libopkg/opkg_conf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index ce68ae1..4b2ad03 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -370,12 +370,6 @@ void opkg_conf_deinit(opkg_conf_t *conf)
pkg_src_list_deinit(&conf->pkg_src_list);
pkg_dest_list_deinit(&conf->pkg_dest_list);
nv_pair_list_deinit(&conf->arch_list);
- if (&conf->pkg_hash)
- pkg_hash_deinit(&conf->pkg_hash);
- if (&conf->file_hash)
- hash_table_deinit(&conf->file_hash);
- if (&conf->obs_file_hash)
- hash_table_deinit(&conf->obs_file_hash);
opkg_conf_free_string(&conf->offline_root);
opkg_conf_free_string(&conf->offline_root_path);
@@ -425,9 +419,15 @@ void opkg_conf_deinit(opkg_conf_t *conf)
}
opkg_message(conf, OPKG_DEBUG, "hash_table[%s] n_buckets=%d n_elements=%d max_conflicts=%d n_conflicts=%d\n",
hash->name, hash->n_entries, hash->n_elements, c, n_conflicts);
- hash_table_deinit(hash);
}
}
+
+ if (&conf->pkg_hash)
+ pkg_hash_deinit(&conf->pkg_hash);
+ if (&conf->file_hash)
+ hash_table_deinit(&conf->file_hash);
+ if (&conf->obs_file_hash)
+ hash_table_deinit(&conf->obs_file_hash);
}
static int opkg_conf_set_default_dest(opkg_conf_t *conf,