diff options
| -rw-r--r-- | lib/poptALL.c | 4 | ||||
| -rw-r--r-- | lib/rpmgi.c | 7 | ||||
| -rw-r--r-- | lib/rpmgi.h | 4 |
3 files changed, 0 insertions, 15 deletions
diff --git a/lib/poptALL.c b/lib/poptALL.c index 0b331c509..2c2e3ae76 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -48,8 +48,6 @@ extern int _rpmds_debug; extern int _rpmfi_debug; -extern int _rpmgi_debug; - extern int _rpmps_debug; extern int _rpmsq_debug; @@ -242,8 +240,6 @@ struct poptOption rpmcliAllPoptTable[] = { NULL, NULL}, { "rpmfidebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmfi_debug, -1, NULL, NULL}, - { "rpmgidebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmgi_debug, -1, - NULL, NULL}, { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, N_("debug rpmio I/O"), NULL}, { "rpmpsdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmps_debug, -1, diff --git a/lib/rpmgi.c b/lib/rpmgi.c index c7407d83f..d0a6f94db 100644 --- a/lib/rpmgi.c +++ b/lib/rpmgi.c @@ -7,10 +7,8 @@ #include <rpm/rpmtypes.h> #include <rpm/rpmlib.h> /* rpmReadPackageFile */ -#include <rpm/rpmte.h> /* XXX rpmElementType */ #include <rpm/rpmts.h> #include <rpm/rpmgi.h> -#include <rpm/rpmdb.h> #include <rpm/rpmmacro.h> /* XXX rpmExpand */ #include <rpm/rpmfileutil.h> #include <rpm/rpmlog.h> @@ -19,8 +17,6 @@ #include "debug.h" -int _rpmgi_debug = 0; - rpmgiFlags giFlags = RPMGI_NONE; /** \ingroup rpmgi @@ -29,7 +25,6 @@ struct rpmgi_s { rpmts ts; /*!< Iterator transaction set. */ rpmgiFlags flags; /*!< Iterator control bits. */ - int active; /*!< Iterator is active? */ int i; /*!< Element index. */ int errors; Header h; /*!< Current iterator header. */ @@ -216,7 +211,6 @@ rpmgi rpmgiNew(rpmts ts, rpmgiFlags flags, ARGV_const_t argv) gi->ts = rpmtsLink(ts, __FUNCTION__); gi->flags = flags; - gi->active = 0; gi->i = -1; gi->errors = 0; gi->h = NULL; @@ -261,7 +255,6 @@ Header rpmgiNext(rpmgi gi) enditer: gi->h = headerFree(gi->h); gi->i = -1; - gi->active = 0; return NULL; } diff --git a/lib/rpmgi.h b/lib/rpmgi.h index 79abbe621..112aaafc4 100644 --- a/lib/rpmgi.h +++ b/lib/rpmgi.h @@ -12,10 +12,6 @@ extern "C" { #endif -/** - */ -extern int _rpmgi_debug; - /** \ingroup rpmgi */ typedef enum rpmgiFlags_e { |