bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename pmtransflag_t to alpm_transflag_t

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-06-28 14:42:24 +10:00
parent 0aef91bc4f
commit 590a8fcb1e
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/alpm.h
View file

@ -714,7 +714,7 @@ alpm_pkg_t *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync);
*/ */
/** Transaction flags */ /** Transaction flags */
typedef enum _pmtransflag_t { typedef enum _alpm_transflag_t {
/** Ignore dependency checks. */ /** Ignore dependency checks. */
PM_TRANS_FLAG_NODEPS = 1, PM_TRANS_FLAG_NODEPS = 1,
/** Ignore file conflicts and overwrite files. */ /** Ignore file conflicts and overwrite files. */
@ -749,7 +749,7 @@ typedef enum _pmtransflag_t {
PM_TRANS_FLAG_RECURSEALL = (1 << 16), PM_TRANS_FLAG_RECURSEALL = (1 << 16),
/** Do not lock the database during the operation. */ /** Do not lock the database during the operation. */
PM_TRANS_FLAG_NOLOCK = (1 << 17) PM_TRANS_FLAG_NOLOCK = (1 << 17)
} pmtransflag_t; } alpm_transflag_t;
/** Transaction events. /** Transaction events.
* NULL parameters are passed to in all events unless specified otherwise. * 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 * @param handle the context handle
* @return the bitfield of transaction flags * @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. /** Returns a list of packages added by the transaction.
* @param handle the context handle * @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 * @param progress progress callback function pointer
* @return 0 on success, -1 on error (pm_errno is set accordingly) * @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_event cb_event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress cb_progress); alpm_trans_cb_progress cb_progress);

4
lib/libalpm/trans.c
View file

@ -48,7 +48,7 @@
*/ */
/** Initialize the transaction. */ /** 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_event event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress progress) alpm_trans_cb_progress progress)
{ {
@ -359,7 +359,7 @@ cleanup:
return retval; 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 */ /* Sanity checks */
CHECK_HANDLE(handle, return -1); CHECK_HANDLE(handle, return -1);

4
lib/libalpm/trans.h
View file

@ -37,7 +37,7 @@ typedef enum _pmtransstate_t {
/* Transaction */ /* Transaction */
struct __alpm_trans_t { struct __alpm_trans_t {
pmtransflag_t flags; alpm_transflag_t flags;
pmtransstate_t state; pmtransstate_t state;
alpm_list_t *add; /* list of (alpm_pkg_t *) */ alpm_list_t *add; /* list of (alpm_pkg_t *) */
alpm_list_t *remove; /* list of (alpm_pkg_t *) */ alpm_list_t *remove; /* list of (alpm_pkg_t *) */
@ -67,7 +67,7 @@ do { \
} while(0) } while(0)
void _alpm_trans_free(alpm_trans_t *trans); 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_event event, alpm_trans_cb_conv conv,
alpm_trans_cb_progress progress); alpm_trans_cb_progress progress);
int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn,

2
src/pacman/conf.h
View file

@ -70,7 +70,7 @@ typedef struct __config_t {
unsigned short group; unsigned short group;
unsigned short noask; unsigned short noask;
unsigned int ask; unsigned int ask;
pmtransflag_t flags; alpm_transflag_t flags;
pgp_verify_t sigverify; pgp_verify_t sigverify;
/* conf file options */ /* conf file options */

2
src/pacman/util.c
View file

@ -49,7 +49,7 @@
#include "callback.h" #include "callback.h"
int trans_init(pmtransflag_t flags) int trans_init(alpm_transflag_t flags)
{ {
int ret; int ret;
if(config->print) { if(config->print) {

2
src/pacman/util.h
View file

@ -39,7 +39,7 @@
/* update speed for the fill_progress based functions */ /* update speed for the fill_progress based functions */
#define UPDATE_SPEED_SEC 0.2f #define UPDATE_SPEED_SEC 0.2f
int trans_init(pmtransflag_t flags); int trans_init(alpm_transflag_t flags);
int trans_release(void); int trans_release(void);
int needs_root(void); int needs_root(void);
int getcols(void); int getcols(void);