diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-11-28 17:47:58 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-11-28 17:47:58 +0200 |
| commit | 6d2214791328708254279b872f53db5aca1d7095 (patch) | |
| tree | 82830c692e16be7f73572672ac2abc373da42e45 /lib/query.c | |
| parent | 9e098f531234cfe776aa63b86e8afafb11865c30 (diff) | |
| download | librpm-tizen-6d2214791328708254279b872f53db5aca1d7095.tar.gz librpm-tizen-6d2214791328708254279b872f53db5aca1d7095.tar.bz2 librpm-tizen-6d2214791328708254279b872f53db5aca1d7095.zip | |
Add rpmgiGetFlags() method to avoid rpmgi_internal.h in query
Diffstat (limited to 'lib/query.c')
| -rw-r--r-- | lib/query.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/query.c b/lib/query.c index 6f10579fa..f87b67a45 100644 --- a/lib/query.c +++ b/lib/query.c @@ -14,12 +14,13 @@ #include <rpmdb.h> #include <rpmfi.h> -#include "lib/rpmgi_internal.h" +#include <rpmgi.h> #include <rpmts.h> #include "lib/manifest.h" #include <rpmlog.h> #include <rpmfileutil.h> /* rpmCleanPath */ +#include "rpmio/fts.h" /* FTS_* flags */ #include "debug.h" #include "lib/misc.h" /* XXX for currentDirectory */ @@ -693,7 +694,7 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_t argv) qva->qva_gi = rpmgiNew(ts, RPMDBI_PACKAGES, NULL, 0); qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, RPMGI_NONE); - if (qva->qva_gi != NULL && (qva->qva_gi->flags & RPMGI_TSADD)) /* Load the ts with headers. */ + if (qva->qva_gi != NULL && (rpmgiGetFlags(qva->qva_gi) & RPMGI_TSADD)) /* Load the ts with headers. */ while ((rpmrc = rpmgiNext(qva->qva_gi)) == RPMRC_OK) {}; if (rpmrc != RPMRC_NOTFOUND) @@ -707,7 +708,7 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_t argv) qva->qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0); qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, giFlags); - if (qva->qva_gi != NULL && (qva->qva_gi->flags & RPMGI_TSADD)) /* Load the ts with headers. */ + if (qva->qva_gi != NULL && (rpmgiGetFlags(qva->qva_gi) & RPMGI_TSADD)) /* Load the ts with headers. */ while ((rpmrc = rpmgiNext(qva->qva_gi)) == RPMRC_OK) {}; if (rpmrc != RPMRC_NOTFOUND) @@ -721,7 +722,7 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_t argv) qva->qva_gi = rpmgiNew(ts, RPMDBI_HDLIST, NULL, 0); qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, giFlags); - if (qva->qva_gi != NULL && (qva->qva_gi->flags & RPMGI_TSADD)) /* Load the ts with headers. */ + if (qva->qva_gi != NULL && (rpmgiGetFlags(qva->qva_gi) & RPMGI_TSADD)) /* Load the ts with headers. */ while ((rpmrc = rpmgiNext(qva->qva_gi)) == RPMRC_OK) {}; if (rpmrc != RPMRC_NOTFOUND) @@ -737,7 +738,7 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_t argv) qva->qva_gi = rpmgiNew(ts, RPMDBI_FTSWALK, NULL, 0); qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, giFlags); - if (qva->qva_gi != NULL && (qva->qva_gi->flags & RPMGI_TSADD)) /* Load the ts with headers. */ + if (qva->qva_gi != NULL && (rpmgiGetFlags(qva->qva_gi) & RPMGI_TSADD)) /* Load the ts with headers. */ while ((rpmrc = rpmgiNext(qva->qva_gi)) == RPMRC_OK) {}; if (rpmrc != RPMRC_NOTFOUND) |