From 0f9652535c818cd92489dbce3c44e777507b68bd Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Fri, 8 Nov 2002 22:27:08 +0000
Subject: Sanity.

CVS patchset: 5843
CVS date: 2002/11/08 22:27:08
---
 build/rpmfc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'build/rpmfc.c')

diff --git a/build/rpmfc.c b/build/rpmfc.c
index b0c17d8e1..03f94e8fb 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -45,7 +45,7 @@ static int rpmfcExpandAppend(/*@out@*/ ARGV_t * argvp, const ARGV_t av)
  * @return		buffered stdout from script, NULL on error
  */     
 /*@null@*/
-static StringBuf getOutputFrom(/*@null@*/ const char * dir, char * argv[],
+static StringBuf getOutputFrom(/*@null@*/ const char * dir, ARGV_t argv,
                         const char * writePtr, int writeBytesLeft,
                         int failNonZero)
         /*@globals fileSystem, internalState@*/
@@ -83,7 +83,7 @@ static StringBuf getOutputFrom(/*@null@*/ const char * dir, char * argv[],
 	}
 	
 	unsetenv("MALLOC_CHECK_");
-	(void) execvp(argv[0], argv);
+	(void) execvp(argv[0], (char *const *)argv);
 	/* XXX this error message is probably not seen. */
 	rpmError(RPMERR_EXEC, _("Couldn't exec %s: %s\n"),
 		argv[0], strerror(errno));
@@ -705,8 +705,6 @@ static int rpmfcELF(rpmfc fc)
 			    auxoffset += aux->vda_next;
 			    /*@innercontinue@*/ continue;
 			}
-assert(soname != NULL);
-
 			buf[0] = '\0';
 			t = buf;
 			sprintf(t, "%08d%c ", fc->ix, deptype);
-- 
cgit v1.2.3