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

Update utilities for new initialize/release methods

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-03 15:46:06 -05:00
parent fb4b422fc4
commit 19755b648c
4 changed files with 29 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/util/cleanupdelta.c
View file

@ -29,9 +29,11 @@
#define BASENAME "cleanupdelta" #define BASENAME "cleanupdelta"
pmhandle_t *handle = NULL;
static void cleanup(int signum) { static void cleanup(int signum) {
if(alpm_release() == -1) { if(handle && alpm_release(handle) == -1) {
fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); fprintf(stderr, "error releasing alpm\n");
} }
exit(signum); exit(signum);
@ -94,6 +96,7 @@ static void usage(void) {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const char *dbpath = DBPATH; const char *dbpath = DBPATH;
enum _pmerrno_t err;
int a = 1; int a = 1;
alpm_list_t *dbnames = NULL; alpm_list_t *dbnames = NULL;
@ -117,16 +120,15 @@ int main(int argc, char *argv[])
usage(); usage();
} }
if(alpm_initialize() == -1) { handle = alpm_initialize(ROOTDIR, dbpath, &err);
fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); if(!handle) {
fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerror(err));
return 1; return 1;
} }
/* let us get log messages from libalpm */ /* let us get log messages from libalpm */
alpm_option_set_logcb(output_cb); alpm_option_set_logcb(output_cb);
alpm_option_set_dbpath(dbpath);
checkdbs(dbpath,dbnames); checkdbs(dbpath,dbnames);
alpm_list_free(dbnames); alpm_list_free(dbnames);

21
src/util/pactree.c
View file

@ -74,6 +74,7 @@ static struct color_choices no_color = {
}; };
/* globals */ /* globals */
pmhandle_t *handle = NULL;
pmdb_t *db_local; pmdb_t *db_local;
alpm_list_t *walked = NULL; alpm_list_t *walked = NULL;
alpm_list_t *provisions = NULL; alpm_list_t *provisions = NULL;
@ -89,21 +90,11 @@ const char *dbpath = DBPATH;
static int alpm_local_init(void) static int alpm_local_init(void)
{ {
int ret; enum _pmerrno_t err;
ret = alpm_initialize(); handle = alpm_initialize(ROOTDIR, dbpath, &err);
if(ret != 0) { if(!handle) {
return ret; return -1;
}
ret = alpm_option_set_root(ROOTDIR);
if(ret != 0) {
return ret;
}
ret = alpm_option_set_dbpath(dbpath);
if(ret != 0) {
return ret;
} }
db_local = alpm_option_get_localdb(); db_local = alpm_option_get_localdb();
@ -196,7 +187,7 @@ static void cleanup(void)
{ {
alpm_list_free(walked); alpm_list_free(walked);
alpm_list_free(provisions); alpm_list_free(provisions);
alpm_release(); alpm_release(handle);
} }
/* pkg provides provision */ /* pkg provides provision */

17
src/util/testdb.c
View file

@ -31,9 +31,11 @@
#define BASENAME "testdb" #define BASENAME "testdb"
pmhandle_t *handle = NULL;
static void cleanup(int signum) { static void cleanup(int signum) {
if(alpm_release() == -1) { if(handle && alpm_release(handle) == -1) {
fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); fprintf(stderr, "error releasing alpm\n");
} }
exit(signum); exit(signum);
@ -184,6 +186,7 @@ static void usage(void) {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ret = 0; int ret = 0;
enum _pmerrno_t err;
const char *dbpath = DBPATH; const char *dbpath = DBPATH;
int a = 1; int a = 1;
alpm_list_t *dbnames = NULL; alpm_list_t *dbnames = NULL;
@ -204,19 +207,15 @@ int main(int argc, char *argv[])
a++; a++;
} }
if(alpm_initialize() == -1) { handle = alpm_initialize(ROOTDIR, dbpath, &err);
fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); if(!handle) {
fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerror(err));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* let us get log messages from libalpm */ /* let us get log messages from libalpm */
alpm_option_set_logcb(output_cb); alpm_option_set_logcb(output_cb);
if(alpm_option_set_dbpath(dbpath) != 0) {
fprintf(stderr, "cannot set dbpath: %s\n", alpm_strerrorlast());
return EXIT_FAILURE;
}
if(!dbnames) { if(!dbnames) {
ret = check_localdb(); ret = check_localdb();
} else { } else {

11
src/util/testpkg.c
View file

@ -40,6 +40,8 @@ static void output_cb(pmloglevel_t level, const char *fmt, va_list args)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int retval = 1; /* default = false */ int retval = 1; /* default = false */
pmhandle_t *handle;
enum _pmerrno_t err;
pmpkg_t *pkg = NULL; pmpkg_t *pkg = NULL;
if(argc != 2) { if(argc != 2) {
@ -47,8 +49,9 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
if(alpm_initialize() == -1) { handle = alpm_initialize(ROOTDIR, DBPATH, &err);
fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); if(!handle) {
fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerror(err));
return 1; return 1;
} }
@ -76,8 +79,8 @@ int main(int argc, char *argv[])
retval = 0; retval = 0;
} }
if(alpm_release() == -1) { if(alpm_release(handle) == -1) {
fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); fprintf(stderr, "error releasing alpm\n");
} }
return retval; return retval;