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

error codes cleanup

Browse source
This commit is contained in:
Aurelien Foret 2006-02-07 22:01:50 +00:00
parent c5aca9529f
commit 5aa5142815
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/libalpm/alpm.c
View file

@ -312,7 +312,7 @@ int alpm_db_update(PM_DB *db, char *archive, char *ts)
_alpm_log(PM_LOG_ERROR, "could not remove database entry %s/%s", db->treename, _alpm_log(PM_LOG_ERROR, "could not remove database entry %s/%s", db->treename,
((pmpkg_t *)lp->data)->name); ((pmpkg_t *)lp->data)->name);
} }
RET_ERR(PM_ERR_XXX, -1); RET_ERR(PM_ERR_DB_REMOVE, -1);
} }
} }
@ -325,12 +325,12 @@ int alpm_db_update(PM_DB *db, char *archive, char *ts)
db_write each entry (see sync_load_dbarchive to get archive content) */ db_write each entry (see sync_load_dbarchive to get archive content) */
_alpm_log(PM_LOG_FLOW2, "unpacking %s", archive); _alpm_log(PM_LOG_FLOW2, "unpacking %s", archive);
if(_alpm_unpack(archive, db->path, NULL)) { if(_alpm_unpack(archive, db->path, NULL)) {
RET_ERR(PM_ERR_XXX, -1); RET_ERR(PM_ERR_SYSTEM, -1);
} }
if(ts && strlen(ts) != 0) { if(ts && strlen(ts) != 0) {
if(db_setlastupdate(db, ts) == -1) { if(db_setlastupdate(db, ts) == -1) {
RET_ERR(PM_ERR_XXX, -1); RET_ERR(PM_ERR_SYSTEM, -1);
} }
} }
@ -527,9 +527,11 @@ int alpm_pkg_load(char *filename, pmpkg_t **pkg)
int alpm_pkg_free(pmpkg_t *pkg) int alpm_pkg_free(pmpkg_t *pkg)
{ {
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
ASSERT(pkg->origin != PKG_FROM_CACHE, RET_ERR(PM_ERR_XXX, -1));
/* Only free packages loaded in user space */
if(pkg->origin != PKG_FROM_CACHE) {
pkg_free(pkg); pkg_free(pkg);
}
return(0); return(0);
} }
@ -545,7 +547,7 @@ int alpm_pkg_checkmd5sum(pmpkg_t *pkg)
int retval = 0; int retval = 0;
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
ASSERT(pkg->md5sum[0] != 0, RET_ERR(PM_ERR_XXX, -1)); ASSERT(pkg->md5sum[0] != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
asprintf(&path, "%s%s/%s-%s" PM_EXT_PKG, asprintf(&path, "%s%s/%s-%s" PM_EXT_PKG,
handle->root, handle->cachedir, handle->root, handle->cachedir,
@ -719,7 +721,7 @@ int alpm_trans_sysupgrade()
trans = handle->trans; trans = handle->trans;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_XXX, -1)); ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
return(trans_sysupgrade(trans)); return(trans_sysupgrade(trans));
} }

6
lib/libalpm/alpm.h
View file

@ -348,6 +348,7 @@ extern enum __pmerrno_t {
PM_ERR_DB_NOT_NULL, PM_ERR_DB_NOT_NULL,
PM_ERR_DB_NOT_FOUND, PM_ERR_DB_NOT_FOUND,
PM_ERR_DB_WRITE, PM_ERR_DB_WRITE,
PM_ERR_DB_REMOVE,
PM_ERR_DB_UPTODATE, PM_ERR_DB_UPTODATE,
/* Configuration */ /* Configuration */
PM_ERR_OPT_LOGFILE, PM_ERR_OPT_LOGFILE,
@ -359,10 +360,10 @@ extern enum __pmerrno_t {
PM_ERR_TRANS_NOT_NULL, PM_ERR_TRANS_NOT_NULL,
PM_ERR_TRANS_NULL, PM_ERR_TRANS_NULL,
PM_ERR_TRANS_DUP_TARGET, PM_ERR_TRANS_DUP_TARGET,
PM_ERR_TRANS_INITIALIZED,
PM_ERR_TRANS_NOT_INITIALIZED, PM_ERR_TRANS_NOT_INITIALIZED,
PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_NOT_PREPARED,
PM_ERR_TRANS_ABORT, PM_ERR_TRANS_ABORT,
PM_ERR_TRANS_TYPE,
/* Packages */ /* Packages */
PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_NOT_FOUND,
PM_ERR_PKG_INVALID, PM_ERR_PKG_INVALID,
@ -379,8 +380,7 @@ extern enum __pmerrno_t {
PM_ERR_FILE_CONFLICTS, PM_ERR_FILE_CONFLICTS,
/* Misc */ /* Misc */
PM_ERR_USER_ABORT, PM_ERR_USER_ABORT,
PM_ERR_INTERNAL_ERROR, PM_ERR_INTERNAL_ERROR
PM_ERR_XXX
} pm_errno; } pm_errno;
char *alpm_strerror(int err); char *alpm_strerror(int err);

7
lib/libalpm/error.c
View file

@ -55,6 +55,8 @@ char *alpm_strerror(int err)
return "could not find database"; return "could not find database";
case PM_ERR_DB_WRITE: case PM_ERR_DB_WRITE:
return "could not update database"; return "could not update database";
case PM_ERR_DB_REMOVE:
return "could not remove database entry";
case PM_ERR_DB_UPTODATE: case PM_ERR_DB_UPTODATE:
return "database is up to date"; return "database is up to date";
/* Configuration */ /* Configuration */
@ -71,14 +73,14 @@ char *alpm_strerror(int err)
return "transaction already initialized"; return "transaction already initialized";
case PM_ERR_TRANS_DUP_TARGET: case PM_ERR_TRANS_DUP_TARGET:
return "duplicate target"; return "duplicate target";
case PM_ERR_TRANS_INITIALIZED:
return "transaction already initialized";
case PM_ERR_TRANS_NOT_INITIALIZED: case PM_ERR_TRANS_NOT_INITIALIZED:
return "transaction not initialized"; return "transaction not initialized";
case PM_ERR_TRANS_NOT_PREPARED: case PM_ERR_TRANS_NOT_PREPARED:
return "transaction not prepared"; return "transaction not prepared";
case PM_ERR_TRANS_ABORT: case PM_ERR_TRANS_ABORT:
return "transaction aborted"; return "transaction aborted";
case PM_ERR_TRANS_TYPE:
return "operation not compatible with the transaction type";
/* Packages */ /* Packages */
case PM_ERR_PKG_NOT_FOUND: case PM_ERR_PKG_NOT_FOUND:
return "could not find or read package"; return "could not find or read package";
@ -109,7 +111,6 @@ char *alpm_strerror(int err)
return "user aborted"; return "user aborted";
case PM_ERR_INTERNAL_ERROR: case PM_ERR_INTERNAL_ERROR:
return "internal error"; return "internal error";
case PM_ERR_XXX:
default: default:
return "unexpected error"; return "unexpected error";
} }