moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

testpkg rework 

* mainly code cosmetics (indent fixes)
* remove debug message "spam"
* print also user friendly result

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
[Dan: a few more whitespace/linebreak cleanups added]
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Nagy Gabor 2008-03-01 14:01:40 +01:00 committed by Dan McGee
parent aecc2fd190
commit 17eca54b32
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/util/testpkg.c
View File

@ -29,44 +29,58 @@
static void output_cb(pmloglevel_t level, char *fmt, va_list args) static void output_cb(pmloglevel_t level, char *fmt, va_list args)
{ {
if(strlen(fmt)) { if(fmt[0] == '\0') {
switch(level) { return;
case PM_LOG_ERROR: printf("error: "); break; }
case PM_LOG_WARNING: printf("warning: "); break; switch(level) {
default: break; case PM_LOG_ERROR: printf("error: "); break;
} case PM_LOG_WARNING: printf("warning: "); break;
vprintf(fmt, args); default: return; /* skip other messages */
} }
vprintf(fmt, args);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int retval = 1; /* default = false */ int retval = 1; /* default = false */
pmpkg_t *pkg = NULL; pmpkg_t *pkg = NULL;
if(argc != 2) { if(argc != 2) {
fprintf(stderr, "usage: %s <package file>\n", BASENAME); fprintf(stderr, "usage: %s <package file>\n", BASENAME);
return(1); return(1);
} }
if(alpm_initialize() == -1) { if(alpm_initialize() == -1) {
fprintf(stderr, "cannot initilize alpm: %s\n", alpm_strerrorlast()); fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast());
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);
if(alpm_pkg_load(argv[1], 1, &pkg) == -1 || pkg == NULL) { if(alpm_pkg_load(argv[1], 1, &pkg) == -1 || pkg == NULL) {
retval = 1; switch(pm_errno) {
case PM_ERR_PKG_OPEN:
printf("Cannot open the given file.\n");
break;
case PM_ERR_LIBARCHIVE_ERROR:
case PM_ERR_PKG_INVALID:
printf("Package is invalid.\n");
break;
default:
printf("libalpm error: %s\n", alpm_strerrorlast());
break;
}
retval = 1;
} else { } else {
alpm_pkg_free(pkg); alpm_pkg_free(pkg);
retval = 0; printf("Package is valid.\n");
retval = 0;
} }
if(alpm_release() == -1) { if(alpm_release() == -1) {
fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast());
} }
return(retval); return(retval);
} }