From 8239d0b74b6363fa38576d40a3ab4531a047f028 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 7 Nov 2007 10:17:10 +0200 Subject: [PATCH] Remove bunch of unnecessary misc.h includes, document others --- build/files.c | 2 +- lib/manifest.c | 1 - lib/package.c | 1 - lib/psm.c | 2 +- lib/query.c | 2 +- lib/rpmps.c | 1 - lib/rpmrc.c | 1 - lib/transaction.c | 2 +- lib/trb.c | 1 - python/header-py.c | 1 - rpmdb/legacy.c | 2 +- tools/rpmcache.c | 3 ++- tools/rpmgraph.c | 1 - tools/rpmsort.c | 1 - 14 files changed, 7 insertions(+), 14 deletions(-) diff --git a/build/files.c b/build/files.c index f21720d..c8b0243 100644 --- a/build/files.c +++ b/build/files.c @@ -30,7 +30,7 @@ #include "buildio.h" #include "legacy.h" /* XXX domd5, expandFileList, compressFileList */ -#include "misc.h" +#include "misc.h" /* for splitString, freeSplitString */ #include "rpmerr.h" #include "debug.h" diff --git a/lib/manifest.c b/lib/manifest.c index 93bf4d0..3d0cda9 100644 --- a/lib/manifest.c +++ b/lib/manifest.c @@ -9,7 +9,6 @@ #include "stringbuf.h" #include "manifest.h" -#include "misc.h" #include "debug.h" diff --git a/lib/package.c b/lib/package.c index 525c5d7..1ad48c7 100644 --- a/lib/package.c +++ b/lib/package.c @@ -11,7 +11,6 @@ #include "rpmts.h" -#include "misc.h" /* XXX stripTrailingChar() */ #include "legacy.h" /* XXX legacyRetrofit() */ #include "rpmlead.h" diff --git a/lib/psm.c b/lib/psm.c index aa43a08..a8e6e2b 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -29,7 +29,7 @@ #include "rpmlead.h" /* writeLead proto */ #include "signature.h" /* signature constants */ #include "legacy.h" /* XXX rpmfiBuildFNames() */ -#include "misc.h" /* XXX stripTrailingChar() */ +#include "misc.h" /* XXX rpmMkdirPath, makeTempFile, doputenv */ #include "rpmdb.h" /* XXX for db_chrootDone */ #include "rpmerr.h" #include "debug.h" diff --git a/lib/query.c b/lib/query.c index 2f9369a..83d77f9 100644 --- a/lib/query.c +++ b/lib/query.c @@ -21,7 +21,7 @@ #include "rpmerr.h" #include "debug.h" -#include "misc.h" +#include "misc.h" /* XXX for currentDirectory */ /** diff --git a/lib/rpmps.c b/lib/rpmps.c index ce9453c..53a4c72 100644 --- a/lib/rpmps.c +++ b/lib/rpmps.c @@ -8,7 +8,6 @@ #include "rpmps.h" -#include "misc.h" #include "debug.h" /** diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 07a895d..dd121cb 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -19,7 +19,6 @@ #include "rpmlua.h" #include "rpmerr.h" -#include "misc.h" #include "debug.h" static const char *defrcfiles = diff --git a/lib/transaction.c b/lib/transaction.c index 649d3e7..e5fe873 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -28,7 +28,7 @@ #include "cpio.h" #include "fprint.h" #include "legacy.h" /* XXX domd5 */ -#include "misc.h" /* XXX stripTrailingChar, splitString, currentDirectory */ +#include "misc.h" /* XXX (free)splitString, currentDirectory */ #include "debug.h" diff --git a/lib/trb.c b/lib/trb.c index 59a38fd..153a31a 100644 --- a/lib/trb.c +++ b/lib/trb.c @@ -1,6 +1,5 @@ #include "system.h" #include "rpmcli.h" -#include "misc.h" #include "rpmts.h" #include "debug.h" diff --git a/python/header-py.c b/python/header-py.c index 36b889e..67c2d04 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -7,7 +7,6 @@ #include "rpmlib.h" #include "legacy.h" -#include "misc.h" #include "rpmts.h" /* XXX rpmtsCreate/rpmtsFree */ diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c index 51d906c..f8bfbe4 100644 --- a/rpmdb/legacy.c +++ b/rpmdb/legacy.c @@ -21,7 +21,7 @@ #include "rpmlead.h" #include "rpmlib.h" #include "rpmmacro.h" -#include "misc.h" +#include "misc.h" /* XXX stripTrailingChar */ #include "legacy.h" #include "debug.h" diff --git a/tools/rpmcache.c b/tools/rpmcache.c index 1529f46..4518f50 100644 --- a/tools/rpmcache.c +++ b/tools/rpmcache.c @@ -15,8 +15,9 @@ const char *__progname; #include "rpmds.h" #include "rpmts.h" +#include "misc.h" /* for rpmMkdirPath */ + #include "debug.h" -#include "misc.h" static int _debug = 0; diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c index e97ccda..63f95fa 100644 --- a/tools/rpmgraph.c +++ b/tools/rpmgraph.c @@ -11,7 +11,6 @@ const char *__progname; #include "rpmts.h" #include "manifest.h" -#include "misc.h" /* rpmGlob */ #include "rpmerr.h" #include "debug.h" diff --git a/tools/rpmsort.c b/tools/rpmsort.c index c590881..aed410e 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -11,7 +11,6 @@ const char *__progname; #include "rpmts.h" #include "manifest.h" -#include "misc.h" #include "rpmerr.h" #include "debug.h" -- 2.7.4