Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f83f52867477a4858a8282acfc01c5a7345e5344
commit f83f52867477a4858a8282acfc01c5a7345e5344
Author: Michel Hermier <herm...@frugalware.org>
Date: Tue Dec 10 00:08:10 2013 +0100
libpacman: Finalise _pacman_syncpkg_* renaming.
diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c
index 2e29025..2ddafa0 100644
--- a/lib/libpacman/sync.c
+++ b/lib/libpacman/sync.c
@@ -191,7 +191,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char
*name)
RET_ERR(PM_ERR_MEMORY, -1);
}
}
- ps = _pacman_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy);
+ ps = _pacman_syncpkg_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy);
if(ps == NULL) {
FREEPKG(dummy);
RET_ERR(PM_ERR_MEMORY, -1);
@@ -271,7 +271,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data)
/* add the dependencies found by resolvedeps to the transaction set */
pmpkg_t *spkg = i->data;
if(!_pacman_trans_find(trans, spkg->name)) {
- pmsyncpkg_t *ps =
_pacman_sync_new(PM_SYNC_TYPE_DEPEND, spkg, NULL);
+ pmsyncpkg_t *ps =
_pacman_syncpkg_new(PM_SYNC_TYPE_DEPEND, spkg, NULL);
if(ps == NULL) {
ret = -1;
goto cleanup;
diff --git a/lib/libpacman/sync.h b/lib/libpacman/sync.h
index 55ae472..a5b10b8 100644
--- a/lib/libpacman/sync.h
+++ b/lib/libpacman/sync.h
@@ -34,13 +34,10 @@ struct __pmsyncpkg_t {
void *data;
};
-#define FREESYNC(p) do { if(p) { _pacman_sync_free(p); p = NULL; } } while(0)
-
-#define _pacman_sync_new _pacman_syncpkg_new
-#define _pacman_sync_free _pacman_syncpkg_delete
+#define FREESYNC(p) do { if(p) { _pacman_syncpkg_delete(p); p = NULL; } }
while(0)
pmsyncpkg_t *_pacman_syncpkg_new(int type, pmpkg_t *spkg, void *data);
-void _pacman_sync_delete(pmsyncpkg_t *syncpkg);
+void _pacman_syncpkg_delete(pmsyncpkg_t *syncpkg);
const pmtrans_ops_t _pacman_sync_pmtrans_opts;
diff --git a/lib/libpacman/trans_sysupgrade.c b/lib/libpacman/trans_sysupgrade.c
index dca1e5b..aa61c33 100644
--- a/lib/libpacman/trans_sysupgrade.c
+++ b/lib/libpacman/trans_sysupgrade.c
@@ -112,7 +112,7 @@ int _pacman_sync_sysupgrade(pmtrans_t *trans, pmdb_t
*db_local, pmlist_t *dbs_sy
ps->data = _pacman_list_add(ps->data, dummy);
} else {
/* none found -- enter pkg into the final sync list */
- ps =
_pacman_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL);
+ ps =
_pacman_syncpkg_new(PM_SYNC_TYPE_REPLACE, spkg, NULL);
if(ps == NULL) {
FREEPKG(dummy);
pm_errno = PM_ERR_MEMORY;
@@ -192,7 +192,7 @@ int _pacman_sync_sysupgrade(pmtrans_t *trans, pmdb_t
*db_local, pmlist_t *dbs_sy
if(dummy == NULL) {
goto error;
}
- ps = _pacman_sync_new(PM_SYNC_TYPE_UPGRADE,
spkg, dummy);
+ ps = _pacman_syncpkg_new(PM_SYNC_TYPE_UPGRADE,
spkg, dummy);
if(ps == NULL) {
FREEPKG(dummy);
goto error;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
