diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-09-08 04:25:41 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-09-08 04:25:41 +0000 |
| commit | 8587a26b1a2ebc51611feee58f7ea587d0c90f05 (patch) | |
| tree | 0562d64f7722db0515c148b83bdda30308d1120d | |
| parent | d28ae65c706c593a6b7f56653a2e9cc763f63384 (diff) | |
| download | postgresql-8587a26b1a2ebc51611feee58f7ea587d0c90f05.tar.gz postgresql-8587a26b1a2ebc51611feee58f7ea587d0c90f05.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.
| -rw-r--r-- | src/interfaces/ecpg/preproc/extern.h | 5 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index 3581b35e3e1..46a93f8fac2 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.63 2006/03/11 04:38:40 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/extern.h,v 1.63.2.1 2009/09/08 04:25:40 tgl Exp $ */ #ifndef _ECPG_PREPROC_EXTERN_H #define _ECPG_PREPROC_EXTERN_H @@ -32,8 +32,7 @@ extern char *yytext, #ifdef YYDEBUG extern int yydebug; #endif -extern int yylineno, - yyleng; +extern int yylineno; extern FILE *yyin, *yyout; diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 4161d071962..64806cd051e 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.339.2.5 2008/10/10 12:19:47 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.339.2.6 2009/09/08 04:25:41 tgl Exp $ */ /* Copyright comment */ %{ @@ -164,11 +164,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 * |