Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0be29f00e4ccbfc8261036bee88b0324d91bc66f

commit 0be29f00e4ccbfc8261036bee88b0324d91bc66f
Author: Michel Hermier <[email protected]>
Date:   Mon Dec 30 13:58:44 2013 +0100

libpacman: Rework pmsyncpkg_t constructor/destructor. Add a pkg_local reference 
automagically filled.

diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c
index 3e961c9..08cf1cd 100644
--- a/lib/libpacman/sync.c
+++ b/lib/libpacman/sync.c
@@ -61,25 +61,23 @@

pmsyncpkg_t *_pacman_syncpkg_new(int type, pmpkg_t *spkg, void *data)
{
-       pmsyncpkg_t *ps = _pacman_zalloc(sizeof(pmsyncpkg_t));
+       pmsyncpkg_t *ps;

-       if(ps == NULL) {
-               return(NULL);
-       }
+       ASSERT(spkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL));
+       ASSERT((ps = f_zalloc(sizeof(*ps))) != NULL, return NULL);

ps->type = type;
ps->pkg_name = spkg->name;
ps->pkg = spkg;
ps->data = data;
+       ps->pkg_local = _pacman_db_get_pkgfromcache(handle->db_local, 
ps->pkg_name);

return(ps);
}

-void _pacman_syncpkg_delete(pmsyncpkg_t *ps)
+int _pacman_syncpkg_delete(pmsyncpkg_t *ps)
{
-       if(ps == NULL) {
-               return;
-       }
+       ASSERT(ps != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));

if(ps->type == PM_SYNC_TYPE_REPLACE) {
FREELISTPKGS(ps->data);
@@ -87,6 +85,7 @@ void _pacman_syncpkg_delete(pmsyncpkg_t *ps)
FREEPKG(ps->data);
}
free(ps);
+       return 0;
}

/* Helper functions for _pacman_list_remove
diff --git a/lib/libpacman/sync.h b/lib/libpacman/sync.h
index aecd429..1c79fde 100644
--- a/lib/libpacman/sync.h
+++ b/lib/libpacman/sync.h
@@ -32,10 +32,11 @@ struct __pmsyncpkg_t {
const char *pkg_name;
pmpkg_t *pkg;
void *data;
+       pmpkg_t *pkg_local;
};

pmsyncpkg_t *_pacman_syncpkg_new(int type, pmpkg_t *spkg, void *data);
-void _pacman_syncpkg_delete(pmsyncpkg_t *syncpkg);
+int _pacman_syncpkg_delete(pmsyncpkg_t *syncpkg);

const pmtrans_ops_t _pacman_sync_pmtrans_opts;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to