Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d1e91ce6952bcb4048e398c611c6a777c9053d58
commit d1e91ce6952bcb4048e398c611c6a777c9053d58 Author: Michel Hermier <[email protected]> Date: Mon Sep 8 14:13:20 2014 +0200 libpacman: Remove a bunch of warnings. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index ec7a073..a8ce1f0 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -45,6 +45,14 @@ using namespace libpacman; +typedef struct __pmgraph_t { + int state; /* 0: untouched, -1: entered, other: leaving time */ + Package *data; + struct __pmgraph_t *parent; /* where did we come from? */ + FPtrList children; + FPtrListIterator *childptr; /* points to a child in children list */ +} pmgraph_t; + static pmgraph_t *_pacman_graph_new(void) { pmgraph_t *graph = (pmgraph_t *)_pacman_zalloc(sizeof(pmgraph_t)); diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h index 91be75f..edb88df 100644 --- a/lib/libpacman/deps.h +++ b/lib/libpacman/deps.h @@ -41,14 +41,6 @@ struct __pmdepmissing_t { pmdepend_t depend; }; -typedef struct __pmgraph_t { - int state; /* 0: untouched, -1: entered, other: leaving time */ - void *data; - struct __pmgraph_t *parent; /* where did we come from? */ - FPtrList children; - FPtrListIterator *childptr; /* points to a child in children list */ -} pmgraph_t; - FPtrList &_pacman_depmisslist_add(FPtrList &misslist, pmdepmissing_t *miss); FPtrList _pacman_sortbydeps(const FPtrList &targets, int mode); diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h index 671636c..f80b55f 100644 --- a/lib/libpacman/group.h +++ b/lib/libpacman/group.h @@ -24,7 +24,7 @@ #include "pacman.h" #include "kernel/fobject.h" -#include "util/fptrlist.h" +#include "util/fstringlist.h" #define GRP_NAME_LEN 256 @@ -39,7 +39,7 @@ public: ~Group(); char name[GRP_NAME_LEN]; - FPtrList packages; /* List of unowned strings */ + FStringList packages; /* List of unowned strings */ }; } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index dacd377..6c2732c 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1351,7 +1351,7 @@ out: */ static int str_cmp(const void *s1, const void *s2) { - return(strcmp(s1, s2)); + return(strcmp((const char *)s1, (const char *)s2)); } static const _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
