Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=96772ce80180a24d64e046c51d5bfc5b3935c47a
commit 96772ce80180a24d64e046c51d5bfc5b3935c47a Author: Michel Hermier <[email protected]> Date: Mon Sep 8 12:18:25 2014 +0200 libpacman: Remove a bunch of warnings. diff --git a/lib/libpacman/util/fdispatchlogger.cpp b/lib/libpacman/util/fdispatchlogger.cpp index 55f738c..26f29af 100644 --- a/lib/libpacman/util/fdispatchlogger.cpp +++ b/lib/libpacman/util/fdispatchlogger.cpp @@ -45,7 +45,7 @@ FDispatchLogger *f_dispatchlogger_new(unsigned char mask) { FDispatchLogger *dispatchlogger; - if ((dispatchlogger = f_zalloc(sizeof(*dispatchlogger))) == NULL) { + if ((dispatchlogger = (FDispatchLogger *)f_zalloc(sizeof(*dispatchlogger))) == NULL) { return NULL; } f_logger_init(&dispatchlogger->base, mask, f_dispatchlogger_log, f_ptrlist_new()); diff --git a/lib/libpacman/util/flist.h b/lib/libpacman/util/flist.h index 6431654..601d3be 100644 --- a/lib/libpacman/util/flist.h +++ b/lib/libpacman/util/flist.h @@ -216,7 +216,6 @@ namespace flib return tmp; } -#if 0 value_type operator * () const { return iterable_traits<Iterable>::value_of(m_iterable); @@ -226,7 +225,6 @@ namespace flib { return iterable_traits<Iterable>::pointer_of(m_iterable); } -#endif const_iterator next() const { diff --git a/lib/libpacman/util/fptrlist.cpp b/lib/libpacman/util/fptrlist.cpp index d3b9475..08032f0 100644 --- a/lib/libpacman/util/fptrlist.cpp +++ b/lib/libpacman/util/fptrlist.cpp @@ -39,8 +39,7 @@ FPtrList *f_ptrlist_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn) list->m_data = data; } else if(fn(data, list->m_data) <= 0) { /* Insert before in head */ - FPtrList *next = new FPtrListItem(); - next->m_data = list->m_data; + FPtrListItem *next = new FPtrListItem(list->m_data); list->m_data = data; f_ptrlistitem_insert_after(next, list); } else { @@ -202,7 +201,7 @@ FPtrList &FPtrList::add(const void *data) { #ifndef F_NOCOMPAT if(m_data == NULL) { - m_data = data; + m_data = (void *)data; } else { #endif FPtrListIterator *lp = last(); diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 489319b..66fa43b 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -40,12 +40,12 @@ public: FPtrListItem *next() const { - return flib::iterable_traits<FCListItem *>::next(this); + return (FPtrListItem *)flib::iterable_traits<FCListItem *>::next(this); } FPtrListItem *previous() const { - return flib::iterable_traits<FCListItem *>::previous(this); + return (FPtrListItem *)flib::iterable_traits<FCListItem *>::previous(this); } }; @@ -172,7 +172,8 @@ public: { // FIXME: lets leak for now ASSERT(this != NULL, pm_errno = PM_ERR_WRONG_ARGS; return); - m_next = m_previous = m_data = NULL; + m_next = m_previous = NULL; + m_data = NULL; } void swap(FPtrList &o) { diff --git a/lib/libpacman/util/fstringlist.cpp b/lib/libpacman/util/fstringlist.cpp index 8cd42ee..5f20188 100644 --- a/lib/libpacman/util/fstringlist.cpp +++ b/lib/libpacman/util/fstringlist.cpp @@ -64,12 +64,6 @@ FStringList *_pacman_list_remove_dupes(FStringList *list) return newlist; } -static -struct FVisitor f_stringlistitem_destroyvisitor = { - .fn = (FVisitorFunc)free, - .data = NULL, -}; - const char *f_stringlistitem_to_str(const FStringListIterator *self) { #ifndef F_NOCOMPAT @@ -81,7 +75,8 @@ const char *f_stringlistitem_to_str(const FStringListIterator *self) int f_stringlist_delete(FStringList *self) { - return f_ptrlist_delete(self, &f_stringlistitem_destroyvisitor); + delete self; + return 0; } FStringList *f_stringlist_add(FStringList *self, const char *s) @@ -105,7 +100,9 @@ FStringList *f_stringlist_add_stringlist(FStringList *self, const FStringList *s int f_stringlist_clear(FStringList *self) { - return f_ptrlist_clear(self, &f_stringlistitem_destroyvisitor); + ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); + self->clear(); + return 0; } FStringList::FStringList() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
