Make rpmerr.h private, include directly where needed.

build.c

@@ -12,6 +12,7 @@
 #include "rpmts.h"
 
 #include "build.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

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"

build/expression.c

@@ -15,6 +15,7 @@
 
 #include <rpmbuild.h>
 #include <rpmlib.h>
+#include "rpmerr.h"
 
 #include "debug.h"
 

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)++;}

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"
 
 /**

build/parseBuildInstallClean.c

@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 

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)

build/parseDescription.c

@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 extern int noLang;

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 */

build/parsePreamble.c

@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

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"
 

build/parseReqs.c

@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

build/parseScript.c

@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 #include <rpmlua.h>

build/parseSpec.c

@@ -9,6 +9,7 @@
 #include <rpmbuild.h>
 #include "rpmds.h"
 #include "rpmts.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**

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;

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>

build/spec.c

@@ -9,6 +9,7 @@
 #include "rpmds.h"
 #include "rpmfi.h"
 #include "rpmts.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 

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"
 
 

lib/idtx.c

@@ -5,6 +5,7 @@
 #include "rpmdb.h"
 #include "rpmts.h"
 #include "rpmmacro.h"
+#include "rpmerr.h"
 
 static int reverse = -1;
 

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"

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"

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

lib/query.c

@@ -19,6 +19,7 @@
 #include "rpmts.h"
 
 #include "manifest.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 #include "misc.h"

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() */

lib/rpmgi.c

@@ -13,6 +13,7 @@
 #include <rpmdb.h>
 #include <rpmmacro.h>		/* XXX rpmExpand */
 #include "manifest.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 

lib/rpminstall.c

@@ -14,6 +14,7 @@
 #include "rpmts.h"
 
 #include "manifest.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 int rpmcliPackagesTotal = 0;

lib/rpmlead.c

@@ -10,6 +10,7 @@
 
 #include "signature.h"
 #include "rpmlead.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 static unsigned char lead_magic[] = {

lib/rpmlib.h

@@ -10,7 +10,6 @@
 
 #include "rpmio.h"
 #include "rpmmessages.h"
-#include "rpmerr.h"
 #include "header.h"
 #include <popt.h>
 

lib/rpmrc.c

@@ -18,6 +18,7 @@
 #include <rpmmacro.h>
 #include <rpmlua.h>
 
+#include "rpmerr.h"
 #include "misc.h"
 #include "debug.h"
 

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"

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"

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"
 

rpmdb/dbconfig.c

@@ -7,6 +7,7 @@
 #include <rpmlib.h>
 #include <rpmmacro.h>
 
+#include "rpmerr.h"
 #include "rpmdb_internal.h"
 #include "debug.h"
 

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"

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@ \

rpmio/rpmerr.h

@@ -3,7 +3,6 @@
 
 /** \ingroup rpmio
  * \file rpmio/rpmerr.h
- * @todo Eliminate from API.
  */
 
 #include "rpmlog.h"

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;

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;