From 6ea172d0d91f2b6a0e8a8d552a63d97cbe1db536 Mon Sep 17 00:00:00 2001 From: David Given Date: Mon, 27 Feb 2012 22:36:36 +0000 Subject: [PATCH] Fix a 64-bitness issue (removed some untyped K&R C code that assumed ints and pointers were the same size). --- util/ack/util.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/util/ack/util.c b/util/ack/util.c index 6c8f1a68e..530e4ccb3 100644 --- a/util/ack/util.c +++ b/util/ack/util.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include "ack.h" @@ -83,19 +84,26 @@ char *firstblank(str) char *str ; { } /* VARARGS1 */ -fatal(fmt,p1,p2,p3,p4,p5,p6,p7) char *fmt ; { +void fatal(const char* fmt, ...) +{ /* Fatal internal error */ + va_list ap; + va_start(ap, fmt); fprintf(STDOUT,"%s: fatal internal error, ",progname) ; - fprintf(STDOUT,fmt,p1,p2,p3,p4,p5,p6,p7); + vfprintf(STDOUT, fmt, ap); fprintf(STDOUT,"\n") ; quit(-2) ; } /* VARARGS1 */ -vprint(fmt,p1,p2,p3,p4,p5,p6,p7) char *fmt ; { +void vprint(const char* fmt, ...) +{ /* Diagnostic print, no auto NL */ - fprintf(STDOUT,fmt,p1,p2,p3,p4,p5,p6,p7); + va_list ap; + va_start(ap, fmt); + vfprintf(STDOUT, fmt, ap); + va_end(ap); } #ifdef DEBUG