Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=292a2590fe8a2c169153412dc05903793ce01a97
commit 292a2590fe8a2c169153412dc05903793ce01a97 Author: Michel Hermier <[email protected]> Date: Tue Oct 29 12:32:32 2013 +0100 libpacman: Move log facilities to util directory. diff --git a/lib/libpacman/Makefile.am b/lib/libpacman/Makefile.am index dca794a..75529d8 100644 --- a/lib/libpacman/Makefile.am +++ b/lib/libpacman/Makefile.am @@ -12,11 +12,14 @@ HASH_TARGETS = \ hash/md5.c \ hash/sha1.c +UTIL_TARGETS = \ + util/log.c + TARGETS = \ $(HASH_TARGETS) \ + $(UTIL_TARGETS) \ util.c \ list.c \ - log.c \ error.c \ package.c \ group.c \ diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 40f3f86..8831dd4 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -40,9 +40,11 @@ #include <libintl.h> /* pacman-g2 */ +#include "add.h" + #include "hash/md5.h" #include "hash/sha1.h" - +#include "util/log.h" #include "list.h" #include "trans.h" #include "util.h" @@ -50,13 +52,11 @@ #include "cache.h" #include "deps.h" #include "versioncmp.h" -#include "log.h" #include "backup.h" #include "package.h" #include "db.h" #include "provide.h" #include "conflict.h" -#include "add.h" #include "remove.h" #include "handle.h" #include "packages_transaction.h" diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index a2bc484..127f6a8 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -36,8 +36,10 @@ #ifdef CYGWIN #include <limits.h> /* PATH_MAX */ #endif + /* pacman-g2 */ -#include "log.h" + +#include "util/log.h" #include "util.h" #include "db.h" #include "pacman.h" diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c index 62dbea5..e4d9d37 100644 --- a/lib/libpacman/cache.c +++ b/lib/libpacman/cache.c @@ -29,8 +29,11 @@ #include <sys/stat.h> #include <libintl.h> #include <dirent.h> + /* pacman-g2 */ -#include "log.h" +#include "cache.h" + +#include "util/log.h" #include "pacman.h" #include "list.h" #include "util.h" @@ -39,7 +42,6 @@ #include "db.h" #include "handle.h" #include "error.h" -#include "cache.h" /* Returns a new package cache from db. * It frees the cache if it already exists. diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c index f6e27b4..6433338 100644 --- a/lib/libpacman/conflict.c +++ b/lib/libpacman/conflict.c @@ -34,13 +34,15 @@ #include <limits.h> #include <sys/stat.h> #include <libintl.h> + /* pacman-g2 */ +#include "conflict.h" + +#include "util/log.h" #include "util.h" #include "error.h" -#include "log.h" #include "cache.h" #include "deps.h" -#include "conflict.h" /* Returns a pmlist_t* of pmdepmissing_t pointers. * diff --git a/lib/libpacman/conflict.h b/lib/libpacman/conflict.h index 3f326c7..1cdc1d9 100644 --- a/lib/libpacman/conflict.h +++ b/lib/libpacman/conflict.h @@ -22,6 +22,7 @@ #define _PACMAN_CONFLICT_H #include "db.h" +#include "trans.h" #define CONFLICT_FILE_LEN 512 diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c index 1d5b8d0..04f2a69 100644 --- a/lib/libpacman/db.c +++ b/lib/libpacman/db.c @@ -44,7 +44,7 @@ /* pacman-g2 */ #include "db.h" -#include "log.h" +#include "util/log.h" #include "util.h" #include "error.h" #include "server.h" diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index e11b611..a04ce23 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -21,6 +21,7 @@ * USA. */ +#include "config.h" #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -28,17 +29,18 @@ #include <strings.h> #endif #include <libintl.h> + /* pacman-g2 */ -#include "config.h" +#include "deps.h" + +#include "util/log.h" #include "util.h" -#include "log.h" #include "error.h" #include "list.h" #include "package.h" #include "db.h" #include "cache.h" #include "provide.h" -#include "deps.h" #include "versioncmp.h" #include "handle.h" diff --git a/lib/libpacman/error.h b/lib/libpacman/error.h index 1504125..907ed62 100644 --- a/lib/libpacman/error.h +++ b/lib/libpacman/error.h @@ -21,7 +21,7 @@ #ifndef _PACMAN_ERROR_H #define _PACMAN_ERROR_H -#include "log.h" +#include "util/log.h" #define RET_ERR(err, ret) do { pm_errno = (err); \ _pacman_log(PM_LOG_ERROR, _("returning error %d: %s\n"), pm_errno, pacman_strerror(pm_errno)); \ diff --git a/lib/libpacman/group.c b/lib/libpacman/group.c index 2e8b107..257904c 100644 --- a/lib/libpacman/group.c +++ b/lib/libpacman/group.c @@ -30,7 +30,6 @@ #include "util.h" #include "error.h" -#include "log.h" #include "pacman.h" pmgrp_t *_pacman_grp_new() diff --git a/lib/libpacman/handle.c b/lib/libpacman/handle.c index b75b0e1..90b1f00 100644 --- a/lib/libpacman/handle.c +++ b/lib/libpacman/handle.c @@ -33,15 +33,17 @@ #include <time.h> #include <ftplib.h> #include <locale.h> + /* pacman-g2 */ +#include "handle.h" + +#include "util/log.h" #include "util.h" -#include "log.h" #include "list.h" #include "error.h" #include "trans.h" #include "pacman.h" #include "server.h" -#include "handle.h" pmhandle_t *_pacman_handle_new() { diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index 65cb70d..841b253 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -35,7 +35,7 @@ /* pacman-g2 */ #include "package.h" -#include "log.h" +#include "util/log.h" #include "util.h" #include "error.h" #include "list.h" diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index c8f6abf..6260a47 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -22,6 +22,7 @@ * USA. */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -37,11 +38,11 @@ #include <libintl.h> /* pacman-g2 */ +#include "pacman.h" + #include "hash/md5.h" #include "hash/sha1.h" - -#include "config.h" -#include "log.h" +#include "util/log.h" #include "error.h" #include "deps.h" #include "versioncmp.h" diff --git a/lib/libpacman/po/POTFILES.in b/lib/libpacman/po/POTFILES.in index 6d558de..558923c 100644 --- a/lib/libpacman/po/POTFILES.in +++ b/lib/libpacman/po/POTFILES.in @@ -1,6 +1,7 @@ hash/md5.c hash/md5driver.c hash/sha1.c +util/log.c add.c pacman.c backup.c @@ -13,7 +14,6 @@ error.c group.c handle.c list.c -log.c package.c provide.c remove.c diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index d9bc8d9..58e51ce 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -41,19 +41,20 @@ #include <libintl.h> /* pacman-g2 */ +#include "remove.h" + +#include "util/log.h" #include "list.h" #include "trans.h" #include "util.h" #include "error.h" #include "deps.h" #include "versioncmp.h" -#include "log.h" #include "backup.h" #include "package.h" #include "db.h" #include "cache.h" #include "provide.h" -#include "remove.h" #include "handle.h" #include "pacman.h" #include "packages_transaction.h" diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c index 8ec54c2..763f891 100644 --- a/lib/libpacman/server.c +++ b/lib/libpacman/server.c @@ -19,6 +19,7 @@ * USA. */ +#include "config.h" #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -32,10 +33,10 @@ #include <errno.h> /* pacman-g2 */ -#include "config.h" #include "server.h" + +#include "util/log.h" #include "error.h" -#include "log.h" #include "pacman.h" #include "util.h" #include "handle.h" diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index d59f489..514fa11 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -35,10 +35,11 @@ #include <libintl.h> /* pacman-g2 */ +#include "sync.h" + #include "hash/md5.h" #include "hash/sha1.h" - -#include "log.h" +#include "util/log.h" #include "error.h" #include "list.h" #include "package.h" diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index de622a5..8e40165 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -27,11 +27,14 @@ #include <stdio.h> #include <string.h> #include <libintl.h> + /* pacman-g2 */ +#include "trans.h" + +#include "util/log.h" #include "error.h" #include "package.h" #include "util.h" -#include "log.h" #include "list.h" #include "handle.h" #include "add.h" diff --git a/lib/libpacman/trans_sysupgrade.c b/lib/libpacman/trans_sysupgrade.c index 37f8332..768b01c 100644 --- a/lib/libpacman/trans_sysupgrade.c +++ b/lib/libpacman/trans_sysupgrade.c @@ -34,8 +34,11 @@ #endif #include <dirent.h> #include <libintl.h> + /* pacman-g2 */ -#include "log.h" +#include "trans_sysupgrade.h" + +#include "util/log.h" #include "error.h" #include "list.h" #include "package.h" @@ -54,8 +57,6 @@ #include "handle.h" #include "server.h" -#include "trans_sysupgrade.h" - #include "sync.h" static int istoonew(pmpkg_t *pkg) diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index c434376..72eb971 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -57,11 +57,12 @@ #include <regex.h> /* pacman-g2 */ -#include "log.h" +#include "util.h" + +#include "util/log.h" #include "list.h" #include "trans.h" #include "sync.h" -#include "util.h" #include "error.h" #include "pacman.h" diff --git a/lib/libpacman/log.c b/lib/libpacman/util/log.c similarity index 99% rename from lib/libpacman/log.c rename to lib/libpacman/util/log.c index 7e6efdf..6428f09 100644 --- a/lib/libpacman/log.c +++ b/lib/libpacman/util/log.c @@ -23,10 +23,12 @@ #include <stdio.h> #include <stdarg.h> #include <time.h> + /* pacman-g2 */ -#include "pacman.h" #include "log.h" +#include "pacman.h" + /* Internal library log mechanism */ pacman_cb_log pm_logcb = NULL; unsigned char pm_logmask = 0; diff --git a/lib/libpacman/log.h b/lib/libpacman/util/log.h similarity index 100% rename from lib/libpacman/log.h rename to lib/libpacman/util/log.h diff --git a/lib/libpacman/versioncmp.c b/lib/libpacman/versioncmp.c index cdcb11e..7306a90 100644 --- a/lib/libpacman/versioncmp.c +++ b/lib/libpacman/versioncmp.c @@ -27,11 +27,11 @@ #include <ctype.h> #include <string.h> #include <libintl.h> + /* pacman-g2 */ -#include "config.h" -#include "deps.h" #include "versioncmp.h" -#include "log.h" + +#include "deps.h" #include "util.h" #ifndef HAVE_STRVERSCMP _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
