|
|
@@ -0,0 +1,46 @@
|
|
|
+--- lemon.c.dist 2003-07-18 14:52:02.000000000 +0200
|
|
|
++++ lemon.c 2003-07-18 14:56:02.000000000 +0200
|
|
|
+@@ -26,7 +26,7 @@
|
|
|
+ ** http://www.hwaci.com/drh/
|
|
|
+ */
|
|
|
+ #include <stdio.h>
|
|
|
+-#include <varargs.h>
|
|
|
++#include <stdarg.h>
|
|
|
+ #include <string.h>
|
|
|
+ #include <ctype.h>
|
|
|
+
|
|
|
+@@ -89,7 +89,7 @@
|
|
|
+ void Configlist_reset(/* void */);
|
|
|
+
|
|
|
+ /********* From the file "error.h" ***************************************/
|
|
|
+-void ErrorMsg( /* char *, int, char *, ... */ );
|
|
|
++void ErrorMsg(char *, int, char *, ... );
|
|
|
+
|
|
|
+ /****** From the file "option.h" ******************************************/
|
|
|
+ struct s_options {
|
|
|
+@@ -1108,12 +1108,8 @@
|
|
|
+ #define ERRMSGSIZE 10000 /* Hope this is big enough. No way to error check */
|
|
|
+ #define LINEWIDTH 79 /* Max width of any output line */
|
|
|
+ #define PREFIXLIMIT 30 /* Max width of the prefix on each line */
|
|
|
+-void ErrorMsg(va_alist)
|
|
|
+-va_dcl
|
|
|
++void ErrorMsg(char *filename, int lineno, char *format, ...)
|
|
|
+ {
|
|
|
+- char *filename;
|
|
|
+- int lineno;
|
|
|
+- char *format;
|
|
|
+ char errmsg[ERRMSGSIZE];
|
|
|
+ char prefix[PREFIXLIMIT+10];
|
|
|
+ int errmsgsize;
|
|
|
+@@ -1122,10 +1118,7 @@
|
|
|
+ va_list ap;
|
|
|
+ int end, restart, base;
|
|
|
+
|
|
|
+- va_start(ap);
|
|
|
+- filename = va_arg(ap,char*);
|
|
|
+- lineno = va_arg(ap,int);
|
|
|
+- format = va_arg(ap,char*);
|
|
|
++ va_start(ap, format);
|
|
|
+ /* Prepare a prefix to be prepended to every output line */
|
|
|
+ if( lineno>0 ){
|
|
|
+ sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
|