1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Change lemon to use <stdarg.h> instead of <varargs.h> because GCC no longer

supports varargs.h.  Tickets #288 and #280.  Ironically, lemon originally
used varargs.h because stdarg.h was not supported by the compiler I was
using in 1989 (which was gcc if I recall correctly.) (CVS 905)

FossilOrigin-Name: 7902e4778ec86e25ad949ae7a6d55b63ac0e85f3
This commit is contained in:
drh
2003-04-15 01:49:48 +00:00
parent 13bff81537
commit f9a2e7bb8d
3 changed files with 11 additions and 19 deletions

View File

@ -7,7 +7,7 @@
** The author of this program disclaims copyright.
*/
#include <stdio.h>
#include <varargs.h>
#include <stdarg.h>
#include <string.h>
#include <ctype.h>
@ -70,7 +70,7 @@ void Configlist_eat(/* struct config * */);
void Configlist_reset(/* void */);
/********* From the file "error.h" ***************************************/
void ErrorMsg( /* char *, int, char *, ... */ );
void ErrorMsg(const char *, int,const char *, ...);
/****** From the file "option.h" ******************************************/
struct s_options {
@ -1102,12 +1102,7 @@ int max;
#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
{
char *filename;
int lineno;
char *format;
void ErrorMsg(const char *filename, int lineno, const char *format, ...){
char errmsg[ERRMSGSIZE];
char prefix[PREFIXLIMIT+10];
int errmsgsize;
@ -1116,10 +1111,7 @@ va_dcl
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);