fix a few warnings reported by clang
- remove unused variables - some more sanity checks - safer printf Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
be2f43191d
commit
1aa1d00248
|
@ -483,6 +483,8 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
|
|||
|
||||
ALPM_LOG_FUNC;
|
||||
|
||||
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
|
||||
|
||||
snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
|
||||
_alpm_db_path(db), alpm_pkg_get_name(newpkg),
|
||||
alpm_pkg_get_version(newpkg));
|
||||
|
|
|
@ -140,8 +140,8 @@ static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist)
|
|||
entry[len+1] = '\0';
|
||||
*dirlist = alpm_list_add(*dirlist, entry);
|
||||
}
|
||||
closedir(dbdir);
|
||||
}
|
||||
closedir(dbdir);
|
||||
|
||||
*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
|
||||
return(0);
|
||||
|
|
|
@ -408,7 +408,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
|
|||
|
||||
ALPM_LOG_FUNC;
|
||||
|
||||
if(db == NULL || upgrade == NULL) {
|
||||
if(db == NULL || upgrade == NULL || trans == NULL) {
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
|
|
|
@ -459,7 +459,6 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
|
|||
struct archive *archive = NULL;
|
||||
struct archive_entry *entry;
|
||||
const char *pkgfile = pkg->origin_data.file;
|
||||
int ret = ARCHIVE_OK;
|
||||
|
||||
if((archive = archive_read_new()) == NULL) {
|
||||
RET_ERR(PM_ERR_LIBARCHIVE, NULL);
|
||||
|
@ -473,7 +472,7 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
|
|||
RET_ERR(PM_ERR_PKG_OPEN, NULL);
|
||||
}
|
||||
|
||||
while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
|
||||
while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
|
||||
const char *entry_name = archive_entry_pathname(entry);
|
||||
|
||||
if(strcmp(entry_name, ".CHANGELOG") == 0) {
|
||||
|
|
|
@ -371,6 +371,8 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
|
|||
case PM_TRANS_PROGRESS_CONFLICTS_START:
|
||||
opr = _("checking for file conflicts");
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
/* find # of digits in package counts to scale output */
|
||||
|
@ -517,7 +519,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
|
|||
gettimeofday(&initial_time, NULL);
|
||||
xfered_last = (off_t)0;
|
||||
rate_last = 0.0;
|
||||
timediff = get_update_timediff(1);
|
||||
get_update_timediff(1);
|
||||
}
|
||||
} else if(file_xfered == file_total) {
|
||||
/* compute final values */
|
||||
|
|
|
@ -219,7 +219,7 @@ static void setarch(const char *arch)
|
|||
static void cleanup(int ret) {
|
||||
/* free alpm library resources */
|
||||
if(alpm_release() == -1) {
|
||||
pm_printf(PM_LOG_ERROR, alpm_strerrorlast());
|
||||
pm_printf(PM_LOG_ERROR, "%s\n", alpm_strerrorlast());
|
||||
}
|
||||
|
||||
/* free memory */
|
||||
|
|
|
@ -229,7 +229,7 @@ void indentprint(const char *str, int indent)
|
|||
p = wcstr;
|
||||
cidx = indent;
|
||||
|
||||
if(!p) {
|
||||
if(!p || !len) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue