Remove / #ifdef out unused variables as appropriate.

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

lib/fsm.c

@@ -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);

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

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;
 

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

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;