Handle non-string tag indices correctly.

Sync with rpm-4.0.2.

CVS patchset: 4583
CVS date: 2001/02/27 21:30:27

1 files changed, 0 insertions, 21 deletions

diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 2a71118a0..cfdee01bf 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -96,19 +96,6 @@ exit:
     return rc;
 }
 
-/*
- * XXX gcc-2.96-60 on alpha (at least) needs ALPHA_LOSSAGE defined.
- *
- * Otherwise, the (mis-compilation?!) symptom is the inability to pass sig_type
- * correctly to rpmReadSignature(FD_t *fd, Header *header, short sig_type)
- * (Note: the short in both struct rpmlead and in the prototype).
- */
-#ifdef	__alpha
-#define	ALPHA_LOSSAGE
-#else
-#undef	ALPHA_LOSSAGE
-#endif
-
 int rpmReSign(rpmResignFlags add, char *passPhrase, const char **argv)
 {
     FD_t fd = NULL;
@@ -122,9 +109,6 @@ int rpmReSign(rpmResignFlags add, char *passPhrase, const char **argv)
     int res = EXIT_FAILURE;
     rpmRC rc;
     
-#ifdef ALPHA_LOSSAGE
-l = malloc(sizeof(*l));
-#endif
     tmprpm[0] = '\0';
     while ((rpm = *argv++) != NULL) {
 
@@ -219,7 +203,6 @@ l = malloc(sizeof(*l));
     res = 0;
 
 exit:
-if (l != &lead) free(l);
     if (fd)	manageFile(&fd, NULL, 0, res);
     if (ofd)	manageFile(&ofd, NULL, 0, res);
 
@@ -259,9 +242,6 @@ int rpmCheckSig(rpmCheckSigFlags flags, const char **argv)
     int res = 0;
     rpmRC rc;
 
-#ifdef ALPHA_LOSSAGE
-l = malloc(sizeof(*l));
-#endif
     while ((rpm = *argv++) != NULL) {
 
 	if (manageFile(&fd, &rpm, O_RDONLY, 0)) {
@@ -472,7 +452,6 @@ l = malloc(sizeof(*l));
 	    free((void *)sigtarget);	sigtarget = NULL;
 	}
     }
-if (l != &lead) free(l);
 
     return res;
 }