diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-19 16:45:56 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-03-19 16:45:56 +0200 |
| commit | e0a1fb3bad4026cab25663bb4c4e1af392c17502 (patch) | |
| tree | b47b5ae6ab24fa20c6346827913dc0f3d99d1651 | |
| parent | 09423eb47039a6f830592cc326d40bcd71650530 (diff) | |
| download | rpm-e0a1fb3bad4026cab25663bb4c4e1af392c17502.tar.gz rpm-e0a1fb3bad4026cab25663bb4c4e1af392c17502.tar.bz2 rpm-e0a1fb3bad4026cab25663bb4c4e1af392c17502.zip | |
Lose unused qva_char and qva_rc fields from rpmQVKArguments struct
- both are only ever assigned to with useless values and never read...
| -rw-r--r-- | lib/poptQV.c | 1 | ||||
| -rw-r--r-- | lib/query.c | 4 | ||||
| -rw-r--r-- | lib/rpmcli.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/lib/poptQV.c b/lib/poptQV.c index 548c64a48..16880db57 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.c @@ -45,7 +45,6 @@ static void rpmQVSourceArgCallback( poptContext con, case 'R': /* from --resign */ if (qva->qva_mode == '\0' || strchr("qQ ", qva->qva_mode)) { qva->qva_mode = opt->val; - qva->qva_char = ' '; } break; case 'a': qva->qva_source |= RPMQV_ALL; qva->qva_sourceCount++; break; diff --git a/lib/query.c b/lib/query.c index 1995f8a11..1f52da493 100644 --- a/lib/query.c +++ b/lib/query.c @@ -536,7 +536,7 @@ static int rpmcliArgIterHelper(rpmts ts, QVA_t qva, rpmTag tag, ARGV_const_t arg int ec = 0; qva->qva_gi = rpmgiNew(ts, tag, NULL, 0); - qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, gFlgs); + rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, gFlgs); if (qva->qva_gi != NULL && (rpmgiGetFlags(qva->qva_gi) & RPMGI_TSADD)) /* Load the ts with headers. */ while ((rpmrc = rpmgiNext(qva->qva_gi)) == RPMRC_OK) @@ -573,7 +573,7 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_const_t argv) break; default: qva->qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0); - qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, + rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, (giFlags | (RPMGI_NOGLOB|RPMGI_NOHEADER))); while (rpmgiNext(qva->qva_gi) == RPMRC_OK) { ec += rpmQueryVerify(qva, ts, rpmgiHdrPath(qva->qva_gi)); diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 4b52e0a03..cc0e1390b 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -177,7 +177,6 @@ struct rpmQVKArguments_s { rpmfileAttrs qva_fflags; /*!< Bit(s) to filter on attribute. */ rpmdbMatchIterator qva_mi; /*!< Match iterator on selected headers. */ rpmgi qva_gi; /*!< Generalized iterator on args. */ - rpmRC qva_rc; /*!< Current return code. */ QVF_t qva_showPackage; /*!< Function to display iterator matches. */ QSpecF_t qva_specQuery; /*!< Function to query spec file. */ @@ -196,7 +195,6 @@ struct rpmQVKArguments_s { - 'K' from --checksig, -K - 'R' from --resign */ - char qva_char; /*!< (unused) always ' ' */ }; /** \ingroup rpmcli |