Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9383c6a9de6f8783e3d4c20fad58484b7c120dc1
commit 9383c6a9de6f8783e3d4c20fad58484b7c120dc1 Author: Michel Hermier <[email protected]> Date: Sun Sep 7 10:11:18 2014 +0200 libpacman: Now that all the FPtrList::add calls have been corrected fix its return signature. diff --git a/lib/libpacman/util/fptrlist.cpp b/lib/libpacman/util/fptrlist.cpp index cdfb18b..0175981 100644 --- a/lib/libpacman/util/fptrlist.cpp +++ b/lib/libpacman/util/fptrlist.cpp @@ -199,38 +199,33 @@ int f_ptrlist_delete(FPtrList *self, FVisitor *visitor) #endif } -FPtrList *FPtrList::add(const void *data) +FPtrList &FPtrList::add(const void *data) { #ifndef F_NOCOMPAT - return f_ptrlist_add(this, data); -#else - f_ptrlistitem_insert_after(new FPtrListItem(data), last()); - return this; -#endif -} - -// FIXME: Change return value to bool -FPtrList *f_ptrlist_add(FPtrList *list, void *data) -{ - if (list == NULL) { - list = new FPtrList(); - } -#ifndef F_NOCOMPAT - if(list->m_data == NULL) { - list->m_data = data; + if(m_data == NULL) { + m_data = data; } else { #endif - FPtrListIterator *lp = f_ptrlist_last(list); + FPtrListIterator *lp = last(); f_ptrlistitem_insert_after(new FCListItem(), lp); lp = lp->m_next; lp->m_data = data; #ifndef F_NOCOMPAT } #endif + #if 0 - list->add(data); + f_ptrlistitem_insert_after(new FPtrListItem(data), last()); #endif + return *this; +} +FPtrList *f_ptrlist_add(FPtrList *list, void *data) +{ + if (list == NULL) { + list = new FPtrList(); + } + list->add(data); return list; } diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index a2b069f..ac87e20 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -517,7 +517,7 @@ public: return this->m_data == NULL; } - FPtrList *add(const void *data); + FPtrList &add(const void *data); void clear() { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
