diff options
| -rw-r--r-- | lib/libalpm/alpm.h | 8 | ||||
| -rw-r--r-- | lib/libalpm/trans.c | 4 | ||||
| -rw-r--r-- | lib/libalpm/trans.h | 4 | ||||
| -rw-r--r-- | src/pacman/conf.h | 2 | ||||
| -rw-r--r-- | src/pacman/util.c | 2 | ||||
| -rw-r--r-- | src/pacman/util.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 83dad5d8..f922be3c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -714,7 +714,7 @@ alpm_pkg_t *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync); */ /** Transaction flags */ -typedef enum _pmtransflag_t { +typedef enum _alpm_transflag_t { /** Ignore dependency checks. */ PM_TRANS_FLAG_NODEPS = 1, /** Ignore file conflicts and overwrite files. */ @@ -749,7 +749,7 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_RECURSEALL = (1 << 16), /** Do not lock the database during the operation. */ PM_TRANS_FLAG_NOLOCK = (1 << 17) -} pmtransflag_t; +} alpm_transflag_t; /** Transaction events. * NULL parameters are passed to in all events unless specified otherwise. @@ -866,7 +866,7 @@ typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, * @param handle the context handle * @return the bitfield of transaction flags */ -pmtransflag_t alpm_trans_get_flags(alpm_handle_t *handle); +alpm_transflag_t alpm_trans_get_flags(alpm_handle_t *handle); /** Returns a list of packages added by the transaction. * @param handle the context handle @@ -888,7 +888,7 @@ alpm_list_t * alpm_trans_get_remove(alpm_handle_t *handle); * @param progress progress callback function pointer * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int alpm_trans_init(alpm_handle_t *handle, pmtransflag_t flags, +int alpm_trans_init(alpm_handle_t *handle, alpm_transflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index fdcdcdc6..29a74bf9 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -48,7 +48,7 @@ */ /** Initialize the transaction. */ -int SYMEXPORT alpm_trans_init(alpm_handle_t *handle, pmtransflag_t flags, +int SYMEXPORT alpm_trans_init(alpm_handle_t *handle, alpm_transflag_t flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_progress progress) { @@ -359,7 +359,7 @@ cleanup: return retval; } -pmtransflag_t SYMEXPORT alpm_trans_get_flags(alpm_handle_t *handle) +alpm_transflag_t SYMEXPORT alpm_trans_get_flags(alpm_handle_t *handle) { /* Sanity checks */ CHECK_HANDLE(handle, return -1); diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 8fd01ae3..962e9ffd 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -37,7 +37,7 @@ typedef enum _pmtransstate_t { /* Transaction */ struct __alpm_trans_t { - pmtransflag_t flags; + alpm_transflag_t flags; pmtransstate_t state; alpm_list_t *add; /* list of (alpm_pkg_t *) */ alpm_list_t *remove; /* list of (alpm_pkg_t *) */ @@ -67,7 +67,7 @@ do { \ } while(0) void _alpm_trans_free(alpm_trans_t *trans); -int _alpm_trans_init(alpm_trans_t *trans, pmtransflag_t flags, +int _alpm_trans_init(alpm_trans_t *trans, alpm_transflag_t flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_progress progress); int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, diff --git a/src/pacman/conf.h b/src/pacman/conf.h index c0f35493..64b911ab 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -70,7 +70,7 @@ typedef struct __config_t { unsigned short group; unsigned short noask; unsigned int ask; - pmtransflag_t flags; + alpm_transflag_t flags; pgp_verify_t sigverify; /* conf file options */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 5dceead3..a661b2e9 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -49,7 +49,7 @@ #include "callback.h" -int trans_init(pmtransflag_t flags) +int trans_init(alpm_transflag_t flags) { int ret; if(config->print) { diff --git a/src/pacman/util.h b/src/pacman/util.h index 25e2f302..5d86dfda 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -39,7 +39,7 @@ /* update speed for the fill_progress based functions */ #define UPDATE_SPEED_SEC 0.2f -int trans_init(pmtransflag_t flags); +int trans_init(alpm_transflag_t flags); int trans_release(void); int needs_root(void); int getcols(void); |