Tyo: RPMTAG_COMPFILENAMES is ...COMPFILELIST.

Remove compiler warnings.

CVS patchset: 3386
CVS date: 1999/10/20 18:38:37

4 files changed, 5 insertions, 8 deletions

diff --git a/lib/install.c b/lib/install.c
index 4bc53d74e..a02cd54c5 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -448,7 +448,7 @@ static int installSources(Header h, const char * rootdir, FD_t fd,
     }
     rpmMessage(RPMMESS_DEBUG, _("spec file in: %s\n"), realSpecDir);
 
-    if (h != NULL && headerIsEntry(h, RPMTAG_COMPFILENAMES)) {
+    if (h != NULL && headerIsEntry(h, RPMTAG_COMPFILELIST)) {
 	/* we can't remap v1 packages */
 	assembleFileList(h, &fileMem, &fileCount, &files, 0, NULL);
 
@@ -717,7 +717,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	/*@-unrecog@*/ chroot(rootdir); /*@=unrecog@*/
     }
 
-    if (!(flags & RPMTRANS_FLAG_JUSTDB) && headerIsEntry(h, RPMTAG_COMPFILENAMES)) {
+    if (!(flags & RPMTRANS_FLAG_JUSTDB) && headerIsEntry(h, RPMTAG_COMPFILELIST)) {
 	const char * defaultPrefix;
 	/* old format relocateable packages need the entire default
 	   prefix stripped to form the cpio list, while all other packages 
@@ -847,7 +847,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	if (fileMem) freeFileMemory(fileMem);
 	fileMem = NULL;
     } else if (flags & RPMTRANS_FLAG_JUSTDB) {
-	if (headerGetEntry(h, RPMTAG_COMPFILENAMES, NULL, NULL, &fileCount)) {
+	if (headerGetEntry(h, RPMTAG_COMPFILELIST, NULL, NULL, &fileCount)) {
 	    fileStates = xmalloc(sizeof(*fileStates) * fileCount);
 	    memset(fileStates, RPMFILE_STATE_NORMAL, fileCount);
 	    headerAddEntry(h, RPMTAG_FILESTATES, RPM_CHAR_TYPE, fileStates, 
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 5d32536a4..1bc1cf4e9 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -152,7 +152,7 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 #define	RPMTAG_ORIGCOMPFILELIST		1120 /* internal */
 #define	RPMTAG_ORIGCOMPDIRLIST		1121 /* internal */
 
-#define	RPMTAG_FIRSTFREE_TAG		1119 /* internal */
+#define	RPMTAG_FIRSTFREE_TAG		1122 /* internal */
 #define	RPMTAG_EXTERNAL_TAG		1000000
 
 #define	RPMFILE_STATE_NORMAL 		0
diff --git a/lib/transaction.c b/lib/transaction.c
index 7334c9c5c..6b04684f2 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -259,7 +259,6 @@ static Header relocateFileList(struct availablePackage * alp,
     rpmRelocation * rawRelocations = alp->relocs;
     rpmRelocation * relocations = NULL;
     const char ** validRelocations;
-    const char ** names;
     char ** baseFileNames, ** dirNames;
     int_32 * dirIndexes;
     int_32 * newDirIndexes;
@@ -531,8 +530,6 @@ static Header relocateFileList(struct availablePackage * alp,
     if (filespec) free(filespec);
     free(skipDirList);
 
-    xfree(names);
-
     return h;
 }
 
diff --git a/lib/verify.c b/lib/verify.c
index c63dadd51..dc676f78d 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -248,7 +248,7 @@ int rpmVerifyScript(const char * root, Header h, FD_t err)
 static int verifyHeader(QVA_t *qva, Header h)
 {
     char ** fileList;
-    int count, type;
+    int count;
     int verifyResult;
     int i, ec, rc;
     int_32 * fileFlagsList;