Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3e8487e379840df9dd79ec7104a61c635b5ef965
commit 3e8487e379840df9dd79ec7104a61c635b5ef965 Author: Michel Hermier <[email protected]> Date: Thu Oct 31 09:56:25 2013 +0100 libpacman: Move list to util. diff --git a/lib/libpacman/Makefile.am b/lib/libpacman/Makefile.am index 6c4dbca..f11aee1 100644 --- a/lib/libpacman/Makefile.am +++ b/lib/libpacman/Makefile.am @@ -13,13 +13,14 @@ HASH_TARGETS = \ hash/sha1.c UTIL_TARGETS = \ - util/log.c + util/log.c \ + util/logger.c \ + util/list.c TARGETS = \ $(HASH_TARGETS) \ $(UTIL_TARGETS) \ util.c \ - list.c \ error.c \ package.c \ group.c \ diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index ce0b320..953e046 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -44,8 +44,8 @@ #include "hash/md5.h" #include "hash/sha1.h" +#include "util/list.h" #include "util/log.h" -#include "list.h" #include "trans.h" #include "util.h" #include "error.h" diff --git a/lib/libpacman/backup.c b/lib/libpacman/backup.c index 0b22f6d..143a5a9 100644 --- a/lib/libpacman/backup.c +++ b/lib/libpacman/backup.c @@ -25,9 +25,12 @@ #include "config.h" #include <stdlib.h> #include <string.h> + /* pacman-g2 */ #include "backup.h" +#include "util/list.h" + /* Look for a filename in a pmpkg_t.backup list. If we find it, * then we return the md5 or sha1 hash (parsed from the same line) */ diff --git a/lib/libpacman/backup.h b/lib/libpacman/backup.h index 5984b21..19f0b04 100644 --- a/lib/libpacman/backup.h +++ b/lib/libpacman/backup.h @@ -21,7 +21,7 @@ #ifndef _PACMAN_BACKUP_H #define _PACMAN_BACKUP_H -#include "list.h" +#include "pacman.h" char *_pacman_needbackup(char *file, pmlist_t *backup); diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index 127f6a8..90215fc 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -39,9 +39,11 @@ /* pacman-g2 */ +#include "util/list.h" #include "util/log.h" #include "util.h" #include "db.h" +#include "package.h" #include "pacman.h" #include "error.h" #include "handle.h" diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c index 1bd5e74..aac5364 100644 --- a/lib/libpacman/cache.c +++ b/lib/libpacman/cache.c @@ -33,9 +33,9 @@ /* pacman-g2 */ #include "cache.h" +#include "util/list.h" #include "util/log.h" #include "pacman.h" -#include "list.h" #include "util.h" #include "package.h" #include "group.h" diff --git a/lib/libpacman/cache.h b/lib/libpacman/cache.h index d8c8946..c9b22a1 100644 --- a/lib/libpacman/cache.h +++ b/lib/libpacman/cache.h @@ -21,7 +21,6 @@ #ifndef _PACMAN_CACHE_H #define _PACMAN_CACHE_H -#include "list.h" #include "package.h" #include "group.h" #include "db.h" diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c index 6433338..d190f22 100644 --- a/lib/libpacman/conflict.c +++ b/lib/libpacman/conflict.c @@ -38,6 +38,7 @@ /* pacman-g2 */ #include "conflict.h" +#include "util/list.h" #include "util/log.h" #include "util.h" #include "error.h" diff --git a/lib/libpacman/conflict.h b/lib/libpacman/conflict.h index 75002f0..bb8152d 100644 --- a/lib/libpacman/conflict.h +++ b/lib/libpacman/conflict.h @@ -21,6 +21,7 @@ #ifndef _PACMAN_CONFLICT_H #define _PACMAN_CONFLICT_H +#include "package.h" #include "trans.h" #define CONFLICT_FILE_LEN 512 diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c index 04f2a69..16a5a0f 100644 --- a/lib/libpacman/db.c +++ b/lib/libpacman/db.c @@ -44,6 +44,7 @@ /* pacman-g2 */ #include "db.h" +#include "util/list.h" #include "util/log.h" #include "util.h" #include "error.h" diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index e1bd792..6b0492e 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -24,7 +24,7 @@ #define _PACMAN_DB_H #include <limits.h> -#include "package.h" + #include "pacman.h" /* Database entries */ diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index 0e61118..4c19890 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -33,10 +33,10 @@ /* pacman-g2 */ #include "deps.h" +#include "util/list.h" #include "util/log.h" #include "util.h" #include "error.h" -#include "list.h" #include "package.h" #include "db.h" #include "cache.h" diff --git a/lib/libpacman/group.c b/lib/libpacman/group.c index 257904c..236434f 100644 --- a/lib/libpacman/group.c +++ b/lib/libpacman/group.c @@ -28,6 +28,7 @@ /* pacman-g2 */ #include "group.h" +#include "util/list.h" #include "util.h" #include "error.h" #include "pacman.h" diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h index 4d8cafd..58cde75 100644 --- a/lib/libpacman/group.h +++ b/lib/libpacman/group.h @@ -21,7 +21,6 @@ #ifndef _PACMAN_GROUP_H #define _PACMAN_GROUP_H -#include "list.h" #include "pacman.h" #define GRP_NAME_LEN 256 diff --git a/lib/libpacman/handle.c b/lib/libpacman/handle.c index 90b1f00..b4b0161 100644 --- a/lib/libpacman/handle.c +++ b/lib/libpacman/handle.c @@ -37,13 +37,13 @@ /* pacman-g2 */ #include "handle.h" +#include "util/list.h" #include "util/log.h" -#include "util.h" -#include "list.h" #include "error.h" #include "trans.h" #include "pacman.h" #include "server.h" +#include "util.h" pmhandle_t *_pacman_handle_new() { diff --git a/lib/libpacman/handle.h b/lib/libpacman/handle.h index f5d7276..6fa0b99 100644 --- a/lib/libpacman/handle.h +++ b/lib/libpacman/handle.h @@ -29,7 +29,6 @@ typedef struct __pmhandle_t pmhandle_t; -#include "list.h" #include "db.h" #include "trans.h" diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index 841b253..c548ecd 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -35,10 +35,10 @@ /* pacman-g2 */ #include "package.h" +#include "util/list.h" #include "util/log.h" #include "util.h" #include "error.h" -#include "list.h" #include "db.h" #include "handle.h" #include "cache.h" diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index cff1698..5e5fae4 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -28,7 +28,6 @@ #if defined(__APPLE__) || defined(__sun__) #include <time.h> #endif -#include "list.h" #include "pacman.h" enum { diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index 553e337..ae80091 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -42,11 +42,11 @@ #include "hash/md5.h" #include "hash/sha1.h" +#include "util/list.h" #include "util/log.h" #include "error.h" #include "deps.h" #include "versioncmp.h" -#include "list.h" #include "package.h" #include "group.h" #include "util.h" diff --git a/lib/libpacman/po/POTFILES.in b/lib/libpacman/po/POTFILES.in index 558923c..1509df8 100644 --- a/lib/libpacman/po/POTFILES.in +++ b/lib/libpacman/po/POTFILES.in @@ -2,6 +2,7 @@ hash/md5.c hash/md5driver.c hash/sha1.c util/log.c +util/list.c add.c pacman.c backup.c @@ -13,9 +14,7 @@ deps.c error.c group.c handle.c -list.c package.c -provide.c remove.c sync.c trans.c diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index 9aa65ff..c765670 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -43,8 +43,8 @@ /* pacman-g2 */ #include "remove.h" +#include "util/list.h" #include "util/log.h" -#include "list.h" #include "trans.h" #include "util.h" #include "error.h" diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index 763f891..68ac9ed 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -35,6 +35,7 @@ /* pacman-g2 */ #include "server.h" +#include "util/list.h" #include "util/log.h" #include "error.h" #include "pacman.h" diff --git a/lib/libpacman/server.h b/lib/libpacman/server.h index d446bea..d5bd3f1 100644 --- a/lib/libpacman/server.h +++ b/lib/libpacman/server.h @@ -21,10 +21,11 @@ #ifndef _PACMAN_SERVER_H #define _PACMAN_SERVER_H -#include "list.h" #include <time.h> #include <ftplib.h> +#include "pacman.h" + #define FREESERVER(p) \ do { \ if(p) { \ diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index a8c6ff6..fbfbd52 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -39,9 +39,9 @@ #include "hash/md5.h" #include "hash/sha1.h" +#include "util/list.h" #include "util/log.h" #include "error.h" -#include "list.h" #include "package.h" #include "db.h" #include "cache.h" diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index 8e40165..bfd5bb2 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -31,11 +31,11 @@ /* pacman-g2 */ #include "trans.h" +#include "util/list.h" #include "util/log.h" #include "error.h" #include "package.h" #include "util.h" -#include "list.h" #include "handle.h" #include "add.h" #include "remove.h" diff --git a/lib/libpacman/trans_sysupgrade.c b/lib/libpacman/trans_sysupgrade.c index 4fc3aec..40902e4 100644 --- a/lib/libpacman/trans_sysupgrade.c +++ b/lib/libpacman/trans_sysupgrade.c @@ -38,9 +38,9 @@ /* pacman-g2 */ #include "trans_sysupgrade.h" +#include "util/list.h" #include "util/log.h" #include "error.h" -#include "list.h" #include "package.h" #include "db.h" #include "cache.h" diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index f17d640..ca3f8b8 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -56,8 +56,8 @@ /* pacman-g2 */ #include "util.h" +#include "util/list.h" #include "util/log.h" -#include "list.h" #include "trans.h" #include "sync.h" #include "error.h" diff --git a/lib/libpacman/list.c b/lib/libpacman/util/list.c similarity index 100% rename from lib/libpacman/list.c rename to lib/libpacman/util/list.c diff --git a/lib/libpacman/list.h b/lib/libpacman/util/list.h similarity index 100% rename from lib/libpacman/list.h rename to lib/libpacman/util/list.h _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
