From: George Koehler <xkernigh@netscape.net>
Date: Fri, 7 Sep 2012 20:28:10 +0000 (-0400)
Subject: Fix more functions in util/ack for 64-bit hosts.
X-Git-Tag: release-6-0-pre-5~42
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=96ea0a590334d993df72644e61fa94eb95e7a2db;p=ack.git

Fix more functions in util/ack for 64-bit hosts.

This continues the fix from changeset aabde0589450.  We must use
va_list to forward the arguments, because some of the arguments might
be 64-bit pointers.  A pointer does not fit in an int.
---

diff --git a/util/ack/util.c b/util/ack/util.c
index 530e4ccb3..a3d2d0511 100644
--- a/util/ack/util.c
+++ b/util/ack/util.c
@@ -116,30 +116,38 @@ prns(s) register char *s ; {
 #endif
 
 /* VARARGS1 */
-fuerror(fmt,p1,p2,p3,p4,p5,p6,p7) char *fmt ; {
+void fuerror(const char *fmt, ...) {
 	/* Fatal user error */
+	va_list ap;
+	va_start(ap, fmt);
 	fprintf(STDOUT,"%s: ",progname) ;
-	fprintf(STDOUT,fmt,p1,p2,p3,p4,p5,p6,p7);
+	vfprintf(STDOUT, fmt, ap);
 	fprintf(STDOUT,"\n") ;
 	quit(-1) ;
 }
 
 /* VARARGS1 */
-werror(fmt,p1,p2,p3,p4,p5,p6,p7) char *fmt ; {
+void werror(const char *fmt, ...) {
 	/* Warning user error, w_flag */
+	va_list ap;
 	if ( w_flag ) return ;
+	va_start(ap, fmt);
 	fprintf(STDOUT,"%s: warning, ",progname) ;
-	fprintf(STDOUT,fmt,p1,p2,p3,p4,p5,p6,p7);
+	vfprintf(STDOUT, fmt, ap);
 	fprintf(STDOUT,"\n") ;
+	va_end(ap);
 }
 
 /* VARARGS1 */
-error(fmt,p1,p2,p3,p4,p5,p6,p7) char *fmt ; {
+void error(const char *fmt, ...) {
 	/* User error, it is the callers responsibility to quit */
+	va_list ap;
+	va_start(ap, fmt);
 	fprintf(STDOUT,"%s: ",progname) ;
-	fprintf(STDOUT,fmt,p1,p2,p3,p4,p5,p6,p7);
+	vfprintf(STDOUT, fmt, ap);
 	fprintf(STDOUT,"\n") ;
 	n_error++ ;
+	va_end(ap);
 }
 
 do_flush() {