mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Change\ssome\svariable\snames\sand\scomments\sin\sthe\snew\sin-memory\sdatabase\sfile\nimplementation.\s\sPartial\s(non-working)\simplementation\sof\sthe\sVACUUM\scommand.\s(CVS\s904) C Change\slemon\sto\suse\s<stdarg.h>\sinstead\sof\s<varargs.h>\sbecause\sGCC\sno\slonger\nsupports\svarargs.h.\s\sTickets\s#288\sand\s#280.\s\sIronically,\slemon\soriginally\nused\svarargs.h\sbecause\sstdarg.h\swas\snot\ssupported\sby\sthe\scompiler\sI\swas\nusing\sin\s1989\s(which\swas\sgcc\sif\sI\srecall\scorrectly.)\s(CVS\s905)
D 2003-04-15T01:19:48 D 2003-04-15T01:49:49
F Makefile.in df3a4db41a7450468b5fe934d9dd8f723b631249 F Makefile.in df3a4db41a7450468b5fe934d9dd8f723b631249
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@ -127,7 +127,7 @@ F test/version.test 605fd0d7e7d571370c32b12dbf395b58953de246
F test/view.test c64fa39ea57f3c2066c854290f032ad13b23b83d F test/view.test c64fa39ea57f3c2066c854290f032ad13b23b83d
F test/where.test ffaa91611edb8961d887d02492aa13f82782ff66 F test/where.test ffaa91611edb8961d887d02492aa13f82782ff66
F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
F tool/lemon.c 022adc2830c2705828f744d2c59798bd462eb465 F tool/lemon.c 14fedcde9cf70aa6040b89de164cf8f56f92a4b9
F tool/lempar.c 73a991cc3017fb34804250fa901488b5147b3717 F tool/lempar.c 73a991cc3017fb34804250fa901488b5147b3717
F tool/memleak.awk 16ef9493dcd36146f806e75148f4bb0201a123ec F tool/memleak.awk 16ef9493dcd36146f806e75148f4bb0201a123ec
F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@ -161,7 +161,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
P 96336bffde6c441af197a521ee9e56fdfd7efff8 P e76787f877c456abdc8bc88bfefc50eaeed68744
R 502f917ded2eef9644690cdab0eeb915 R 2082ff273f79da67ec128510ffa08236
U drh U drh
Z 288074bf98169396dec5124561acfdbb Z 21cc95134a25d7c9da7271d70e2e3747

2
manifest.uuid
View File

@ -1 +1 @@
e76787f877c456abdc8bc88bfefc50eaeed68744 7902e4778ec86e25ad949ae7a6d55b63ac0e85f3

16
tool/lemon.c
View File

@ -7,7 +7,7 @@
** The author of this program disclaims copyright. ** The author of this program disclaims copyright.
*/ */
#include <stdio.h> #include <stdio.h>
#include <varargs.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
@ -70,7 +70,7 @@ void Configlist_eat(/* struct config * */);
void Configlist_reset(/* void */); void Configlist_reset(/* void */);
/********* From the file "error.h" ***************************************/ /********* From the file "error.h" ***************************************/
void ErrorMsg( /* char *, int, char *, ... */ ); void ErrorMsg(const char *, int,const char *, ...);
/****** From the file "option.h" ******************************************/ /****** From the file "option.h" ******************************************/
struct s_options { struct s_options {
@ -1102,12 +1102,7 @@ int max;
#define ERRMSGSIZE 10000 /* Hope this is big enough. No way to error check */ #define ERRMSGSIZE 10000 /* Hope this is big enough. No way to error check */
#define LINEWIDTH 79 /* Max width of any output line */ #define LINEWIDTH 79 /* Max width of any output line */
#define PREFIXLIMIT 30 /* Max width of the prefix on each line */ #define PREFIXLIMIT 30 /* Max width of the prefix on each line */
void ErrorMsg(va_alist) void ErrorMsg(const char *filename, int lineno, const char *format, ...){
va_dcl
{
char *filename;
int lineno;
char *format;
char errmsg[ERRMSGSIZE]; char errmsg[ERRMSGSIZE];
char prefix[PREFIXLIMIT+10]; char prefix[PREFIXLIMIT+10];
int errmsgsize; int errmsgsize;
@ -1116,10 +1111,7 @@ va_dcl
va_list ap; va_list ap;
int end, restart, base; int end, restart, base;
va_start(ap); va_start(ap, format);
filename = va_arg(ap,char*);
lineno = va_arg(ap,int);
format = va_arg(ap,char*);
/* Prepare a prefix to be prepended to every output line */ /* Prepare a prefix to be prepended to every output line */
if( lineno>0 ){ if( lineno>0 ){
sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);