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

- changed flags type from char to int

Browse source 
- downloadonly implies FLAG_NOCONFLICTS
This commit is contained in:
Aurelien Foret 2006-03-04 15:33:44 +00:00
parent 297c5284b6
commit 1bd8f57a18
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libalpm/alpm.c
View file

@ -695,7 +695,7 @@ void *alpm_trans_getinfo(unsigned char parm)
* @param conv conversation callback function pointer * @param conv conversation 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(unsigned char type, unsigned char flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv) int alpm_trans_init(unsigned char type, unsigned int flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv)
{ {
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));

2
lib/libalpm/alpm.h
View file

@ -262,7 +262,7 @@ enum {
}; };
void *alpm_trans_getinfo(unsigned char parm); void *alpm_trans_getinfo(unsigned char parm);
int alpm_trans_init(unsigned char type, unsigned char flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv); int alpm_trans_init(unsigned char type, unsigned int flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv);
int alpm_trans_sysupgrade(void); int alpm_trans_sysupgrade(void);
int alpm_trans_addtarget(char *target); int alpm_trans_addtarget(char *target);
int alpm_trans_prepare(PM_LIST **data); int alpm_trans_prepare(PM_LIST **data);

2
lib/libalpm/trans.c
View file

@ -82,7 +82,7 @@ void _alpm_trans_free(void *data)
free(trans); free(trans);
} }
int _alpm_trans_init(pmtrans_t *trans, unsigned char type, unsigned char flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv) int _alpm_trans_init(pmtrans_t *trans, unsigned char type, unsigned int flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv)
{ {
/* Sanity checks */ /* Sanity checks */
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));

4
lib/libalpm/trans.h
View file

@ -32,7 +32,7 @@ enum {
typedef struct __pmtrans_t { typedef struct __pmtrans_t {
unsigned char type; unsigned char type;
unsigned char flags; unsigned int flags;
unsigned char state; unsigned char state;
PMList *targets; /* PMList of (char *) */ PMList *targets; /* PMList of (char *) */
PMList *packages; /* PMList of (pmpkg_t *) or (pmsyncpkg_t *) */ PMList *packages; /* PMList of (pmpkg_t *) or (pmsyncpkg_t *) */
@ -63,7 +63,7 @@ do { \
pmtrans_t *_alpm_trans_new(void); pmtrans_t *_alpm_trans_new(void);
void _alpm_trans_free(void *data); void _alpm_trans_free(void *data);
int _alpm_trans_init(pmtrans_t *trans, unsigned char type, unsigned char flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv); int _alpm_trans_init(pmtrans_t *trans, unsigned char type, unsigned int flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv);
int _alpm_trans_sysupgrade(pmtrans_t *trans); int _alpm_trans_sysupgrade(pmtrans_t *trans);
int _alpm_trans_addtarget(pmtrans_t *trans, char *target); int _alpm_trans_addtarget(pmtrans_t *trans, char *target);
int _alpm_trans_prepare(pmtrans_t *trans, PMList **data); int _alpm_trans_prepare(pmtrans_t *trans, PMList **data);

2
src/pacman/conf.h
View file

@ -52,7 +52,7 @@ typedef struct __config_t {
unsigned short op_s_search; unsigned short op_s_search;
unsigned short op_s_upgrade; unsigned short op_s_upgrade;
unsigned short group; unsigned short group;
unsigned char flags; unsigned int flags;
unsigned short debug; unsigned short debug;
/* configuration file option */ /* configuration file option */
char *proxyhost; char *proxyhost;

5
src/pacman/pacman.c
View file

@ -394,7 +394,10 @@ int parseargs(int argc, char *argv[])
break; break;
case 'u': config->op_s_upgrade = 1; break; case 'u': config->op_s_upgrade = 1; break;
case 'v': config->verbose++; break; case 'v': config->verbose++; break;
case 'w': config->op_s_downloadonly = 1; break; case 'w':
config->op_s_downloadonly = 1;
config->flags |= PM_TRANS_FLAG_NOCONFLICTS;
break;
case 'y': config->op_s_sync++; break; case 'y': config->op_s_sync++; break;
case '?': return(1); case '?': return(1);
default: return(1); default: return(1);