projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move pkg_compare_name to pkg_vec and remove qsort in hash_get
[oweals/opkg-lede.git]
/
libopkg
/
pkg.c
diff --git
a/libopkg/pkg.c
b/libopkg/pkg.c
index 7ec34985b9c7af97ed2c7f64c7460effefbeca59..309af55db1ad6c2ba58a696089fa9bab45c0b45f 100644
(file)
--- a/
libopkg/pkg.c
+++ b/
libopkg/pkg.c
@@
-90,7
+90,6
@@
pkg_t *pkg_new(void)
int pkg_init(pkg_t *pkg)
{
int pkg_init(pkg_t *pkg)
{
- memset(pkg, 0, sizeof(pkg_t));
pkg->name = NULL;
pkg->epoch = 0;
pkg->version = NULL;
pkg->name = NULL;
pkg->epoch = 0;
pkg->version = NULL;
@@
-112,6
+111,8
@@
int pkg_init(pkg_t *pkg)
pkg->recommends_str = NULL;
pkg->suggests_count = 0;
pkg->recommends_count = 0;
pkg->recommends_str = NULL;
pkg->suggests_count = 0;
pkg->recommends_count = 0;
+
+ active_list_init(&pkg->list);
/* Abhaya: added init for conflicts fields */
pkg->conflicts = NULL;
/* Abhaya: added init for conflicts fields */
pkg->conflicts = NULL;
@@
-183,7
+184,8
@@
void pkg_deinit(pkg_t *pkg)
pkg->state_flag = SF_OK;
pkg->state_status = SS_NOT_INSTALLED;
pkg->state_flag = SF_OK;
pkg->state_status = SS_NOT_INSTALLED;
- //for (i = 0; i < pkg->replaces_count; i++)
+ active_list_clear(&pkg->list);
+
free (pkg->replaces);
pkg->replaces = NULL;
free (pkg->replaces);
pkg->replaces = NULL;
@@
-444,8
+446,6
@@
abstract_pkg_t *abstract_pkg_new(void)
int abstract_pkg_init(abstract_pkg_t *ab_pkg)
{
int abstract_pkg_init(abstract_pkg_t *ab_pkg)
{
- memset(ab_pkg, 0, sizeof(abstract_pkg_t));
-
ab_pkg->provided_by = abstract_pkg_vec_alloc();
if (ab_pkg->provided_by==NULL){
return -1;
ab_pkg->provided_by = abstract_pkg_vec_alloc();
if (ab_pkg->provided_by==NULL){
return -1;