From 791928dc48bcd94ef5cb57b4da36fb5e398e30da Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 15 Apr 2011 18:53:51 -0500 Subject: Header inclusion cleanup This does touch a lot of things, and hopefully doesn't break things on other platforms, but allows us to also clean up a bunch of crud that no longer needs to be there. Signed-off-by: Dan McGee --- lib/libalpm/add.c | 2 -- lib/libalpm/alpm_list.c | 1 - lib/libalpm/be_local.c | 6 ------ lib/libalpm/be_package.c | 2 -- lib/libalpm/be_sync.c | 3 +-- lib/libalpm/db.c | 3 --- lib/libalpm/group.c | 1 - lib/libalpm/handle.c | 2 -- lib/libalpm/log.c | 3 --- lib/libalpm/package.c | 4 ---- lib/libalpm/remove.c | 4 +--- lib/libalpm/sync.c | 2 -- lib/libalpm/trans.c | 4 ---- lib/libalpm/util.c | 1 - src/pacman/database.c | 1 - src/pacman/deptest.c | 4 ---- src/pacman/package.c | 1 - src/pacman/pacman.c | 2 -- src/pacman/query.c | 1 - src/pacman/util.c | 1 - test/pacman/pmpkg.py | 4 ++-- 21 files changed, 4 insertions(+), 48 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b920465d..65795c74 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -44,8 +44,6 @@ #include "backup.h" #include "package.h" #include "db.h" -#include "conflict.h" -#include "deps.h" #include "remove.h" #include "handle.h" diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index d7019d79..d2e09478 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -20,7 +20,6 @@ #include #include -#include /* libalpm */ #include "alpm_list.h" diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index f4784e00..e5a8c7b1 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -31,10 +31,6 @@ #include #include /* PATH_MAX */ -/* libarchive */ -#include -#include - /* libalpm */ #include "db.h" #include "alpm_list.h" @@ -43,9 +39,7 @@ #include "alpm.h" #include "handle.h" #include "package.h" -#include "group.h" #include "deps.h" -#include "dload.h" #define LAZY_LOAD(info, errret) \ diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 1531a52e..0c3728f1 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -20,10 +20,8 @@ #include "config.h" -#include #include #include -#include #include /* libarchive */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 9183a074..752ef373 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -20,8 +20,7 @@ #include "config.h" -#include -#include +#include /* libarchive */ #include diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index c16133bb..cd741891 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -26,11 +26,8 @@ #include #include -#include #include -#include #include -#include /* libalpm */ #include "db.h" diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index b13908c1..dbcc7554 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include /* libalpm */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 1c7d6590..6905ca69 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -27,9 +27,7 @@ #include #include #include -#include #include -#include /* libalpm */ #include "handle.h" diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 0d936e22..9093af7b 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -22,10 +22,7 @@ #include #include -#include -#include #include -#include /* libalpm */ #include "log.h" diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 2bd93e2a..3e787d45 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -23,13 +23,9 @@ #include "config.h" -#include #include #include -#include -#include #include -#include /* libalpm */ #include "package.h" diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 31b20131..67ad9a6a 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -26,8 +26,6 @@ #include #include -#include -#include #include #include #include @@ -36,6 +34,7 @@ /* libalpm */ #include "remove.h" #include "alpm_list.h" +#include "alpm.h" #include "trans.h" #include "util.h" #include "log.h" @@ -44,7 +43,6 @@ #include "db.h" #include "deps.h" #include "handle.h" -#include "alpm.h" int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index df255152..cb73c7eb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -26,11 +26,9 @@ #include /* off_t */ #include #include -#include #include #include /* intmax_t */ #include -#include #include /* libalpm */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index a7edb97e..6e32054d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include #include @@ -41,11 +39,9 @@ #include "util.h" #include "log.h" #include "handle.h" -#include "add.h" #include "remove.h" #include "sync.h" #include "alpm.h" -#include "deps.h" /** \addtogroup alpm_trans Transaction Functions * @brief Functions to manipulate libalpm transactions diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 667e31e1..99dd3bea 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -53,7 +53,6 @@ /* libalpm */ #include "util.h" #include "log.h" -#include "package.h" #include "alpm.h" #include "alpm_list.h" #include "handle.h" diff --git a/src/pacman/database.c b/src/pacman/database.c index 9d6edab5..123f72d2 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -20,7 +20,6 @@ #include "config.h" -#include #include #include diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index cc1e565b..19e4da4a 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -20,17 +20,13 @@ #include "config.h" -#include #include -#include #include #include /* pacman */ #include "pacman.h" -#include "util.h" -#include "conf.h" int pacman_deptest(alpm_list_t *targets) { diff --git a/src/pacman/package.c b/src/pacman/package.c index 93c56ad9..346d3125 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7e9fd6b9..a4cfe75c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -39,7 +39,6 @@ #include #include /* uname */ #include /* setlocale */ -#include /* time_t */ #include #include #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) @@ -55,7 +54,6 @@ #include "util.h" #include "callback.h" #include "conf.h" -#include "package.h" /* list of targets specified on command line */ static alpm_list_t *pm_targets; diff --git a/src/pacman/query.c b/src/pacman/query.c index 4208d2a2..a3546bad 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/pacman/util.c b/src/pacman/util.c index 7fb2322d..8d7e8e98 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -31,7 +31,6 @@ #include /* intmax_t */ #include #include -#include #include #include #include diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index ec51e5d4..59204265 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -27,7 +27,7 @@ import util class pmpkg(object): """Package object. - Object holding data from an ArchLinux package. + Object holding data from an Arch Linux package. """ def __init__(self, name, version = "1.0-1"): @@ -89,7 +89,7 @@ class pmpkg(object): return "%s%s" % (self.fullname(), util.PM_EXT_PKG) def makepkg(self, path): - """Creates an ArchLinux package archive. + """Creates an Arch Linux package archive. A package archive is generated in the location 'path', based on the data from the object. -- cgit v1.2.3-70-g09d2