summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-04-16 16:42:43 +0000
committerAurelien Foret <aurelien@archlinux.org>2005-04-16 16:42:43 +0000
commit89f0ccc3ccb6de1037ee5a74bdb18c064e5c2d01 (patch)
tree800a6e6b6a832cbde427245dc9c447f234766d8d
parent31da982deb9155ffa99d066a9575fa72aa1f77f5 (diff)
downloadpacman-89f0ccc3ccb6de1037ee5a74bdb18c064e5c2d01.tar.xz
reworked transaction prototypes
-rw-r--r--lib/libalpm/add.c10
-rw-r--r--lib/libalpm/add.h6
-rw-r--r--lib/libalpm/remove.c6
-rw-r--r--lib/libalpm/remove.h6
4 files changed, 14 insertions, 14 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 15ebd089..268be3e3 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -48,7 +48,7 @@
extern pmhandle_t *handle;
-int add_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name)
+int add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
{
pmpkg_t *info, *dummy;
PMList *j;
@@ -116,7 +116,7 @@ error:
return(-1);
}
-int add_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
+int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
{
PMList *lp;
@@ -213,7 +213,7 @@ int add_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
return(0);
}
-int add_commit(pmdb_t *db, pmtrans_t *trans)
+int add_commit(pmtrans_t *trans, pmdb_t *db)
{
int i, ret = 0, errors = 0;
TAR *tar = NULL;
@@ -277,11 +277,11 @@ int add_commit(pmdb_t *db, pmtrans_t *trans)
/* copy over the install reason */
/* ORE?
info->reason = oldpkg->reason; */
- if(remove_loadtarget(db, tr, info->name) == -1) {
+ if(remove_loadtarget(tr, db, info->name) == -1) {
FREETRANS(tr);
RET_ERR(PM_ERR_TRANS_ABORT, -1);
}
- if(remove_commit(db, tr) == -1) {
+ if(remove_commit(tr, db) == -1) {
FREETRANS(tr);
RET_ERR(PM_ERR_TRANS_ABORT, -1);
}
diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h
index cc578537..65c7f850 100644
--- a/lib/libalpm/add.h
+++ b/lib/libalpm/add.h
@@ -25,9 +25,9 @@
#include "db.h"
#include "trans.h"
-int add_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name);
-int add_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data);
-int add_commit(pmdb_t *db, pmtrans_t *trans);
+int add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name);
+int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data);
+int add_commit(pmtrans_t *trans, pmdb_t *db);
#endif /* _ALPM_ADD_H */
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 735cf372..83786275 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -45,7 +45,7 @@
extern pmhandle_t *handle;
-int remove_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name)
+int remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
{
pmpkg_t *info;
@@ -65,7 +65,7 @@ int remove_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name)
return(0);
}
-int remove_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
+int remove_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
{
pmpkg_t *info;
PMList *lp;
@@ -118,7 +118,7 @@ int remove_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data)
return(0);
}
-int remove_commit(pmdb_t *db, pmtrans_t *trans)
+int remove_commit(pmtrans_t *trans, pmdb_t *db)
{
pmpkg_t *info;
struct stat buf;
diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h
index 2d5cec1b..3f3e05f1 100644
--- a/lib/libalpm/remove.h
+++ b/lib/libalpm/remove.h
@@ -25,9 +25,9 @@
#include "db.h"
#include "trans.h"
-int remove_loadtarget(pmdb_t *db, pmtrans_t *trans, char *name);
-int remove_prepare(pmdb_t *db, pmtrans_t *trans, PMList **data);
-int remove_commit(pmdb_t *db, pmtrans_t *trans);
+int remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name);
+int remove_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data);
+int remove_commit(pmtrans_t *trans, pmdb_t *db);
#endif /* _ALPM_REMOVE_H */