diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-09-08 04:25:00 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-09-08 04:25:00 +0000 |
| commit | 4d3456e85dabfbe4182f94178ecb8789d9592bf7 (patch) | |
| tree | ac93867cc2dba192b37b3bc79a73e8f6807fdc47 /src | |
| parent | 9f0e84a65da4e57318086aa75d1650e043b7a29a (diff) | |
| download | postgresql-4d3456e85dabfbe4182f94178ecb8789d9592bf7.tar.gz postgresql-4d3456e85dabfbe4182f94178ecb8789d9592bf7.zip | |
Remove outside-the-scanner references to "yyleng".
It seems the flex developers have decided to change yyleng from int to size_t.
This has already happened in the latest release of OS X, and will start
happening elsewhere once the next release of flex appears. Rather than trying
to divine how it's declared in any particular build, let's just remove the one
existing not-very-necessary external usage.
Back-patch to all supported branches; not so much because users in the field
are likely to care about building old branches with cutting-edge flex, as
to keep OSX-based buildfarm members from having problems with old branches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.header | 10 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/extern.h | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index fae9e76e0a8..e483b481fdd 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.8 2009/08/07 10:51:20 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.9 2009/09/08 04:25:00 tgl Exp $ */ /* Copyright comment */ %{ @@ -184,11 +184,7 @@ make3_str(char *str1, char *str2, char *str3) static char * make_name(void) { - char * name = (char *)mm_alloc(yyleng + 1); - - strncpy(name, yytext, yyleng); - name[yyleng] = '\0'; - return(name); + return mm_strdup(yytext); } static char * @@ -220,7 +216,7 @@ create_questionmarks(char *name, bool array) for (; count > 0; count --) { sprintf(pacounter_buffer, "$%d", pacounter++); - result = cat_str(3, result, strdup(pacounter_buffer), make_str(" , ")); + result = cat_str(3, result, mm_strdup(pacounter_buffer), make_str(" , ")); } /* removed the trailing " ," */ diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index ff80a5f243b..9643ab24066 100644 --- a/src/interfaces/ecpg/preproc/extern.h +++ b/src/interfaces/ecpg/preproc/extern.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/extern.h,v 1.74 2009/07/14 20:24:10 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/extern.h,v 1.75 2009/09/08 04:25:00 tgl Exp $ */ #ifndef _ECPG_PREPROC_EXTERN_H #define _ECPG_PREPROC_EXTERN_H @@ -39,8 +39,7 @@ extern char *yytext, #ifdef YYDEBUG extern int yydebug; #endif -extern int yylineno, - yyleng; +extern int yylineno; extern FILE *yyin, *yyout; extern char *output_filename; |