Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f28779fedaf533849818f7db0f4b1a3d74612ba2
commit f28779fedaf533849818f7db0f4b1a3d74612ba2 Author: Michel Hermier <[email protected]> Date: Mon Sep 8 12:29:40 2014 +0200 libpacman: Remove an other bunch of warnings. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index d458fc7..e0c9c5b 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -231,7 +231,7 @@ LocalDatabase::~LocalDatabase() static LocalPackage *_pacman_localdb_pkg_new(LocalDatabase *db, const struct dirent *dirent, unsigned int inforeq) { - Package *pkg; + LocalPackage *pkg; const char *dname; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); @@ -379,38 +379,6 @@ Package *LocalDatabase::scan(const char *target, unsigned int inforeq) } static -int _pacman_localdb_file_reader(Database *db, Package *info, unsigned int inforeq, unsigned int inforeq_masq, const char *file, int (*reader)(Package *, FILE *)) -{ - int ret = 0; - - if(inforeq & inforeq_masq) { - FILE *fp = NULL; - char path[PATH_MAX]; - - snprintf(path, PATH_MAX, "%s/%s-%s/%s", db->path, info->name(), info->version(), file); - fp = fopen(path, "r"); - if(fp == NULL) { - _pacman_log(PM_LOG_WARNING, "%s (%s)", path, strerror(errno)); - return -1; - } - if(reader(info, fp) == -1) - return -1; - fclose(fp); - } - return ret; -} - -/* -static -void _pacman_localdb_write_bool(const char *entry, int value, FILE *stream) -{ - if(value != 0) { - fprintf(stream, "%%%s%%\n\n", entry); - } -} -*/ - -static void _pacman_localdb_write_string(const char *entry, const char *value, FILE *stream) { if(!_pacman_strempty(value)) { @@ -419,18 +387,6 @@ void _pacman_localdb_write_string(const char *entry, const char *value, FILE *st } static -void _pacman_localdb_write_stringlist(const char *entry, const FPtrList *values, FILE *stream) -{ - if(values != NULL) { - fprintf(stream, "%%%s%%\n", entry); - for(auto lp = values->begin(), end = values->end(); lp != end; lp = lp->next()) { - fprintf(stream, "%s\n", f_stringlistitem_to_str(lp)); - } - fputc('\n', stream); - } -} - -static void _pacman_localdb_write_stringlist(const char *entry, const FStringList &values, FILE *stream) { if(!values.empty()) { diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 6d692b1..fdd6279 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -722,7 +722,7 @@ int inList(FPtrList *lst, char *lItem) { extern "C" { int pacman_output_generate(FPtrList *targets, FPtrList *dblist) { - FPtrList found; + FStringList found; Package *pkg = NULL; char *match = NULL; int foundMatch = 0; diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 8eb70d0..dacd377 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -579,7 +579,7 @@ int __pmtrans_t::prepare(FPtrList **data) deps = _pacman_checkconflicts(this, list); if(!deps.empty()) { int errorout = 0; - FPtrList asked; + FStringList asked; for(auto i = deps.begin(), end = deps.end(); i != end && !errorout; i = i->next()) { pmdepmissing_t *miss = f_ptrlistitem_data(i); @@ -1649,7 +1649,6 @@ int __pmtrans_t::commit(FPtrList **data) } return(retval); } else { - int ret = 0; time_t t; howmany = f_ptrlist_count(&packages); @@ -1802,7 +1801,6 @@ int __pmtrans_t::commit(FPtrList **data) int errors = _pacman_fpmpackage_install(pkg_new, type, this, trans_event_table[type].progress, howmany, remain, pkg_local); if(errors) { - ret = 1; _pacman_log(PM_LOG_WARNING, _("errors occurred while %s %s"), (type == PM_TRANS_TYPE_UPGRADE ? _("upgrading") : _("installing")), pkg_new->name()); } else { diff --git a/lib/libpacman/util.cpp b/lib/libpacman/util.cpp index f824fa3..c99a929 100644 --- a/lib/libpacman/util.cpp +++ b/lib/libpacman/util.cpp @@ -352,7 +352,7 @@ int _pacman_chroot_system(const char *cmdline, pmtrans_t *trans) return 0; } -int _pacman_runscriptlet(char *root, char *installfn, const char *script, char *ver, char *oldver, pmtrans_t *trans) +int _pacman_runscriptlet(char *root, char *installfn, const char *script, const char *ver, const char *oldver, pmtrans_t *trans) { char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; diff --git a/lib/libpacman/util.h b/lib/libpacman/util.h index c979ab3..a4503d6 100644 --- a/lib/libpacman/util.h +++ b/lib/libpacman/util.h @@ -62,7 +62,7 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn); int _pacman_ldconfig(char *root); #ifdef _PACMAN_TRANS_H int _pacman_chroot_system(const char *cmdline, pmtrans_t *trans); -int _pacman_runscriptlet(char *util, char *installfn, const char *script, char *ver, char *oldver, pmtrans_t *trans); +int _pacman_runscriptlet(char *util, char *installfn, const char *script, const char *ver, const char *oldver, pmtrans_t *trans); int _pacman_runhook(const char *hookname, pmtrans_t *trans); #ifndef __sun__ int _pacman_check_freespace(pmtrans_t *trans, pmlist_t **data); diff --git a/lib/libpacman/util/fptrlist.cpp b/lib/libpacman/util/fptrlist.cpp index 08032f0..f471d2b 100644 --- a/lib/libpacman/util/fptrlist.cpp +++ b/lib/libpacman/util/fptrlist.cpp @@ -197,7 +197,7 @@ int f_ptrlist_delete(FPtrList *self, FVisitor *visitor) #endif } -FPtrList &FPtrList::add(const void *data) +FPtrList &FPtrList::add(void *data) { #ifndef F_NOCOMPAT if(m_data == NULL) { diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 66fa43b..a9bdee6 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -166,7 +166,7 @@ public: return this->m_data == NULL; } - FPtrList &add(const void *data); + FPtrList &add(void *data); void clear() { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
