diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-07-10 11:00:04 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-07-10 11:00:04 +0300 |
| commit | c9ce3241df1bc64dc61299a0a4c213530c6cef1a (patch) | |
| tree | 4705bcd3f95f55f338d21a0f5d7546ef66850a5f | |
| parent | fbf324936b2fcc876da545720c7d1c2240c24f07 (diff) | |
| download | librpm-tizen-c9ce3241df1bc64dc61299a0a4c213530c6cef1a.tar.gz librpm-tizen-c9ce3241df1bc64dc61299a0a4c213530c6cef1a.tar.bz2 librpm-tizen-c9ce3241df1bc64dc61299a0a4c213530c6cef1a.zip | |
Remove / #ifdef out unused variables as appropriate.
| -rw-r--r-- | build/rpmfc.c | 1 | ||||
| -rw-r--r-- | lib/fsm.c | 1 | ||||
| -rw-r--r-- | lib/signature.c | 2 | ||||
| -rw-r--r-- | lib/verify.c | 1 | ||||
| -rw-r--r-- | rpmdb/legacy.c | 1 | ||||
| -rw-r--r-- | rpmio/rpmsw.c | 4 |
6 files changed, 5 insertions, 5 deletions
diff --git a/build/rpmfc.c b/build/rpmfc.c index 8ed27bc41..12669351c 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1244,7 +1244,6 @@ assert(xx != -1); /* XXX figger a proper return path. */ for (fc->ix = 0; fc->ix < fc->nfiles; fc->ix++) { const char * ftype; int_16 mode = (fmode ? fmode[fc->ix] : 0); - char dbuf[1024]; s = argv[fc->ix]; assert(s != NULL); @@ -902,7 +902,6 @@ static int writeFile(/*@special@*/ /*@partial@*/ FSM_t fsm, int writeData) struct stat * ost = &fsm->osb; char * symbuf = NULL; int left; - int xx; int rc; st->st_size = (writeData ? ost->st_size : 0); diff --git a/lib/signature.c b/lib/signature.c index 5617e3240..afea8d593 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -406,8 +406,10 @@ static int makePGPSignature(const char * file, int_32 * sigTagp, struct stat st; const char * cmd; char *const *av; +#ifdef NOTYET pgpDig dig = NULL; pgpDigParams sigp = NULL; +#endif int rc; /*@-boundswrite@*/ diff --git a/lib/verify.c b/lib/verify.c index 162a8e583..c5305070b 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -474,7 +474,6 @@ int showVerifyPackage(QVA_t qva, rpmts ts, Header h) int rpmcliVerify(rpmts ts, QVA_t qva, const char ** argv) { - const char * arg; rpmVSFlags vsflags, ovsflags; int ec = 0; diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c index 3968369e2..fe13b0aa1 100644 --- a/rpmdb/legacy.c +++ b/rpmdb/legacy.c @@ -157,7 +157,6 @@ int domd5(const char * fn, unsigned char * digest, int asAscii, size_t *fsizep) pid_t pid = 0; int rc = 0; int fdno; - int xx; /*@-globs -internalglobs -mods @*/ fdno = open_dso(path, &pid, &fsize); diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.c index 53347822d..e98d3607a 100644 --- a/rpmio/rpmsw.c +++ b/rpmio/rpmsw.c @@ -180,10 +180,12 @@ rpmtime_t rpmswInit(void) rpmsw_type @*/ { struct rpmsw_s begin, end; +#if defined(HP_TIMING_NOW) unsigned long long sum_cycles = 0; rpmtime_t sum_usecs = 0; - rpmtime_t sum_overhead = 0; rpmtime_t cycles; +#endif + rpmtime_t sum_overhead = 0; int i; rpmsw_initialized = 1; |