Make rpmerr.h private, include directly where needed.

diff --git a/build.c b/build.c
index 93e3d11..87cf1bb 100644 (file)
--- a/build.c
+++ b/build.c
@@ -12,6 +12,7 @@
 #include "rpmts.h"
 
 #include "build.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

diff --git a/build/build.c b/build/build.c
index 235be0b..58b78b5 100644 (file)
--- a/build/build.c
+++ b/build/build.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "misc.h"      /* XXX for makeTempFile */
 
 #include "debug.h"

diff --git a/build/expression.c b/build/expression.c
index db0415b..985db1a 100644 (file)
--- a/build/expression.c
+++ b/build/expression.c
@@ -15,6 +15,7 @@
 
 #include <rpmbuild.h>
 #include <rpmlib.h>
+#include "rpmerr.h"
 
 #include "debug.h"
 

diff --git a/build/files.c b/build/files.c
index c713b8b..584eb34 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -30,6 +30,7 @@
 
 #include "legacy.h"    /* XXX domd5, expandFileList, compressFileList */
 #include "misc.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 #define        SKIPWHITE(_x)   {while(*(_x) && (xisspace(*_x) || *(_x) == ',')) (_x)++;}

diff --git a/build/pack.c b/build/pack.c
index 5af1faa..e1a3349 100644 (file)
--- a/build/pack.c
+++ b/build/pack.c
@@ -24,6 +24,7 @@
 #include "signature.h"
 #include "rpmlead.h"
 #include "misc.h"      /* XXX for makeTempFile */
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

diff --git a/build/parseBuildInstallClean.c b/build/parseBuildInstallClean.c
index a43b741..681d943 100644 (file)
--- a/build/parseBuildInstallClean.c
+++ b/build/parseBuildInstallClean.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 

diff --git a/build/parseChangelog.c b/build/parseChangelog.c
index 6b3b651..4b95bc6 100644 (file)
--- a/build/parseChangelog.c
+++ b/build/parseChangelog.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 void addChangelogEntry(Header h, time_t time, const char *name, const char *text)

diff --git a/build/parseDescription.c b/build/parseDescription.c
index 3d0308b..41fcf3c 100644 (file)
--- a/build/parseDescription.c
+++ b/build/parseDescription.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 extern int noLang;

diff --git a/build/parseFiles.c b/build/parseFiles.c
index bb40ac0..1fdb883 100644 (file)
--- a/build/parseFiles.c
+++ b/build/parseFiles.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /* These have to be global scope to make up for *stupid* compilers */

diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 3009faa..220b8e9 100644 (file)
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

diff --git a/build/parsePrep.c b/build/parsePrep.c
index 3c39bb2..785530a 100644 (file)
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "misc.h"      /* XXX for splitString */
 #include "debug.h"
 

diff --git a/build/parseReqs.c b/build/parseReqs.c
index fac52a6..2d70666 100644 (file)
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

diff --git a/build/parseScript.c b/build/parseScript.c
index 41e9e92..cad93f7 100644 (file)
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 #include <rpmlua.h>

diff --git a/build/parseSpec.c b/build/parseSpec.c
index 5506f7a..8ccb2e2 100644 (file)
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -9,6 +9,7 @@
 #include <rpmbuild.h>
 #include "rpmds.h"
 #include "rpmts.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

diff --git a/build/poptBT.c b/build/poptBT.c
index 0cedba0..2b6f833 100644 (file)
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -10,6 +10,7 @@
 
 #include "build.h"
 #include "legacy.h"    /* XXX _noDirTokens */
+#include "rpmerr.h"
 #include "debug.h"
 
 struct rpmBuildArguments_s         rpmBTArgs;

diff --git a/build/rpmfc.c b/build/rpmfc.c
index f46deae..9304e9c 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -5,6 +5,7 @@
 #include <rpmbuild.h>
 #include <argv.h>
 #include <rpmfc.h>
+#include "rpmerr.h"
 
 #define        _RPMDS_INTERNAL
 #include <rpmds.h>

diff --git a/build/spec.c b/build/spec.c
index d8765e9..ad3d536 100644 (file)
--- a/build/spec.c
+++ b/build/spec.c
@@ -9,6 +9,7 @@
 #include "rpmds.h"
 #include "rpmfi.h"
 #include "rpmts.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 

diff --git a/lib/fs.c b/lib/fs.c
index 68fbbf7..90778f4 100644 (file)
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -5,6 +5,7 @@
 #include "system.h"
 #include <rpmlib.h>
 #include <rpmmacro.h>  /* XXX for rpmGetPath */
+#include "rpmerr.h"
 #include "debug.h"
 
 

diff --git a/lib/idtx.c b/lib/idtx.c
index 5685a71..0166aa1 100644 (file)
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -5,6 +5,7 @@
 #include "rpmdb.h"
 #include "rpmts.h"
 #include "rpmmacro.h"
+#include "rpmerr.h"
 
 static int reverse = -1;
 

diff --git a/lib/misc.c b/lib/misc.c
index d5c7f82..ba39005 100644 (file)
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -11,6 +11,7 @@ const char * RPMVERSION = VERSION;
 #include <rpmurl.h>
 #include <rpmmacro.h>  /* XXX for rpmGetPath */
 #include <rpmlib.h>
+#include "rpmerr.h"
 #include "legacy.h"
 #include "misc.h"
 #include "debug.h"

diff --git a/lib/package.c b/lib/package.c
index 50c4943..3aa0fc5 100644 (file)
--- a/lib/package.c
+++ b/lib/package.c
@@ -15,6 +15,7 @@
 #include "legacy.h"    /* XXX legacyRetrofit() */
 #include "rpmlead.h"
 
+#include "rpmerr.h"
 #include "header_internal.h"   /* XXX headerCheck */
 #include "signature.h"
 #include "debug.h"

diff --git a/lib/psm.c b/lib/psm.c
index 836f35b..5f6927f 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -31,6 +31,7 @@
 #include "legacy.h"            /* XXX rpmfiBuildFNames() */
 #include "misc.h"              /* XXX stripTrailingChar() */
 #include "rpmdb.h"             /* XXX for db_chrootDone */
+#include "rpmerr.h"
 #include "debug.h"
 
 #define        _PSM_DEBUG      0

diff --git a/lib/query.c b/lib/query.c
index d877b62..79609fb 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -19,6 +19,7 @@
 #include "rpmts.h"
 
 #include "manifest.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 #include "misc.h"

diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index d88f29d..9750847 100644 (file)
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -12,6 +12,7 @@
 
 #include "rpmts.h"
 
+#include "rpmerr.h"
 #include "rpmlead.h"
 #include "signature.h"
 #include "misc.h"      /* XXX for makeTempFile() */

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index e04f0cc..ca7dfc0 100644 (file)
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -13,6 +13,7 @@
 #include <rpmdb.h>
 #include <rpmmacro.h>          /* XXX rpmExpand */
 #include "manifest.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 3212239..886c357 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -14,6 +14,7 @@
 #include "rpmts.h"
 
 #include "manifest.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 int rpmcliPackagesTotal = 0;

diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 20f81c3..9b42396 100644 (file)
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -10,6 +10,7 @@
 
 #include "signature.h"
 #include "rpmlead.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 static unsigned char lead_magic[] = {

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 5b6b0aa..2e7758f 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -10,7 +10,6 @@
 
 #include "rpmio.h"
 #include "rpmmessages.h"
-#include "rpmerr.h"
 #include "header.h"
 #include <popt.h>
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index bd60b59..f106401 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -18,6 +18,7 @@
 #include <rpmmacro.h>
 #include <rpmlua.h>
 
+#include "rpmerr.h"
 #include "misc.h"
 #include "debug.h"
 

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 1524f65..624dbdc 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -14,6 +14,7 @@
 #include "rpmds.h"
 #include "rpmfi.h"
 #include "rpmlock.h"
+#include "rpmerr.h"
 
 #define        _RPMTE_INTERNAL         /* XXX te->h */
 #include "rpmte.h"

diff --git a/lib/signature.c b/lib/signature.c
index 29d4f17..0d5dbfb 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -11,6 +11,7 @@
 
 #include "rpmts.h"
 
+#include "rpmerr.h"
 #include "misc.h"      /* XXX for dosetenv() and makeTempFile() */
 #include "legacy.h"    /* XXX for mdbinfile() */
 #include "rpmlead.h"

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index 87fe71e..974a355 100644 (file)
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -15,6 +15,7 @@ static int _debug = 1;        /* XXX if < 0 debugging, > 0 unusual error returns */
 #include <rpmurl.h>    /* XXX urlPath proto */
 
 #include <rpmdb_internal.h>
+#include "rpmerr.h"
 
 #include "debug.h"
 

diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 51fd389..64e369f 100644 (file)
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -7,6 +7,7 @@
 #include <rpmlib.h>
 #include <rpmmacro.h>
 
+#include "rpmerr.h"
 #include "rpmdb_internal.h"
 #include "debug.h"
 

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 322a493..ad79a2e 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -18,6 +18,7 @@
 #include <rpmmacro.h>
 #include <rpmsq.h>
 
+#include "rpmerr.h"
 #include "rpmdb_internal.h"
 #include "rpmdb.h"
 #include "fprint.h"

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index de3bdb2..7d8404e 100644 (file)
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
        argv.h \
-       rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \
+       rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmpgp.h \
        rpmsq.h rpmsw.h 
 
 usrlibdir = $(libdir)
@@ -20,7 +20,7 @@ librpmio_la_SOURCES = \
        argv.c digest.c fts.c macro.c \
        rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
        rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c \
-       rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h
+       rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h rpmerr.h
 librpmio_la_LDFLAGS = -release 4.4
 librpmio_la_LIBADD = \
        @WITH_BEECRYPT_LIB@ \

diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h
index a0864d9..ad76e25 100644 (file)
--- a/rpmio/rpmerr.h
+++ b/rpmio/rpmerr.h
@@ -3,7 +3,6 @@
 
 /** \ingroup rpmio
  * \file rpmio/rpmerr.h
- * @todo Eliminate from API.
  */
 
 #include "rpmlog.h"

diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index f07be71..2717b46 100644 (file)
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -13,6 +13,7 @@ const char *__progname;
 
 #include "manifest.h"
 #include "misc.h"              /* rpmGlob */
+#include "rpmerr.h"
 #include "debug.h"
 
 static int noDeps = 1;

diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index cb7c67b..b29986e 100644 (file)
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -12,6 +12,7 @@ const char *__progname;
 
 #include "manifest.h"
 #include "misc.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 static int _depends_debug;