Minor cleanups.

CVS patchset: 1600
CVS date: 1997/05/07 14:56:06

build/build.c

@@ -452,12 +452,12 @@ static char *do_patch(Spec spec, int c, int strip, char *db,
 
     if (isCompressed(file)) {
 	sprintf(buf,
-		"echo \"Patch #%s:\"\n"
+		"echo \"Patch #%d:\"\n"
 		"%s -dc %s | patch -p%d %s -s\n"
 		"if [ $? -ne 0 ]; then\n"
 		"  exit $?\n"
 		"fi",
-		rpmGetVar(RPMVAR_GZIPBIN), c, file, strip, args);
+		c, rpmGetVar(RPMVAR_GZIPBIN), file, strip, args);
     } else {
 	sprintf(buf,
 		"echo \"Patch #%d:\"\n"

build/myftw.c

@@ -19,6 +19,12 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
+#include "config.h"
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>

build/spec.c

@@ -10,6 +10,12 @@ TODO:
 
 ******************************/
 
+#include "config.h"
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>

lib/falloc.c

@@ -1,3 +1,9 @@
+#include "config.h"
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>

lib/misc.c

@@ -1,3 +1,9 @@
+#include "config.h"
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include <errno.h>
 #include <ctype.h>
 #include <grp.h>

lib/signature.c

@@ -24,6 +24,7 @@
 #include "intl.h"
 #include "md5.h"
 #include "misc.h"
+#include "miscfn.h"
 #include "rpmlib.h"
 #include "rpmlead.h"
 #include "signature.h"

rpm.c

@@ -1,3 +1,9 @@
+#include "config.h"
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <locale.h>
@@ -128,7 +134,7 @@ static void printHelpLine(char * prefix, char * help) {
 	while (ch > (help + 1) && isspace(*ch)) ch--;
 	ch++;
 
-	sprintf(format, "%%.%ds\n%%%ds", ch - help, indentLength);
+	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
 	printf(format, help, " ");
 	help = ch;
 	while (isspace(*help) && *help) help++;