diff options
Diffstat (limited to 'src/interfaces/ecpg/preproc')
-rw-r--r-- | src/interfaces/ecpg/preproc/descriptor.c | 3 | ||||
-rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.c | 8 | ||||
-rw-r--r-- | src/interfaces/ecpg/preproc/ecpg_keywords.c | 14 | ||||
-rw-r--r-- | src/interfaces/ecpg/preproc/extern.h | 4 | ||||
-rw-r--r-- | src/interfaces/ecpg/preproc/keywords.c | 16 | ||||
-rw-r--r-- | src/interfaces/ecpg/preproc/type.c | 6 |
6 files changed, 27 insertions, 24 deletions
diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index 7d499225134..73631f69c99 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -114,7 +114,8 @@ drop_descriptor(char *name, char *connection) } struct descriptor -*lookup_descriptor(char *name, char *connection) + * +lookup_descriptor(char *name, char *connection) { struct descriptor *i; diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c index a3030098f3c..e2eccf41fd7 100644 --- a/src/interfaces/ecpg/preproc/ecpg.c +++ b/src/interfaces/ecpg/preproc/ecpg.c @@ -25,9 +25,9 @@ usage(char *progname) fprintf(stderr, "ecpg - the postgresql preprocessor, version: %d.%d.%d\n", MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL); fprintf(stderr, "Usage: %s: " #ifdef YYDEBUG - "[-d]" + "[-d]" #endif - " [-v] [-t] [-I include path] [ -o output file name] [-D define name] file1 [file2] ...\n", progname); + " [-v] [-t] [-I include path] [ -o output file name] [-D define name] file1 [file2] ...\n", progname); } static void @@ -92,9 +92,9 @@ main(int argc, char *const argv[]) case 'D': add_preprocessor_define(optarg); break; -#ifdef YYDEBUG +#ifdef YYDEBUG case 'd': - yydebug=1; + yydebug = 1; break; #endif default: diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c index c65730d9a33..587f1174471 100644 --- a/src/interfaces/ecpg/preproc/ecpg_keywords.c +++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c @@ -4,7 +4,7 @@ * lexical token lookup for reserved words in postgres embedded SQL * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.22 2001/02/21 18:53:47 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.23 2001/03/22 04:01:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -104,16 +104,16 @@ ScanECPGKeywordLookup(char *text) return NULL; /* - * Apply an ASCII-only downcasing. We must not use tolower() since - * it may produce the wrong translation in some locales (eg, Turkish), + * Apply an ASCII-only downcasing. We must not use tolower() since it + * may produce the wrong translation in some locales (eg, Turkish), * and we don't trust isupper() very much either. In an ASCII-based - * encoding the tests against A and Z are sufficient, but we also check - * isupper() so that we will work correctly under EBCDIC. The actual - * case conversion step should work for either ASCII or EBCDIC. + * encoding the tests against A and Z are sufficient, but we also + * check isupper() so that we will work correctly under EBCDIC. The + * actual case conversion step should work for either ASCII or EBCDIC. */ for (i = 0; i < len; i++) { - char ch = text[i]; + char ch = text[i]; if (ch >= 'A' && ch <= 'Z' && isupper((unsigned char) ch)) ch += 'a' - 'A'; diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index 3274515ff63..a6813c23795 100644 --- a/src/interfaces/ecpg/preproc/extern.h +++ b/src/interfaces/ecpg/preproc/extern.h @@ -19,8 +19,10 @@ extern char *connection; extern char *input_filename; extern char *yytext, errortext[128]; + #ifdef YYDEBUG -extern int yydebug; +extern int yydebug; + #endif extern int yylineno, yyleng; diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 2decc2b853b..5614a34b0fe 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.38 2001/02/21 18:53:47 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.39 2001/03/22 04:01:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ static ScanKeyword ScanKeywords[] = { {"aggregate", AGGREGATE}, {"all", ALL}, {"alter", ALTER}, - {"analyse", ANALYSE}, /* British spelling */ + {"analyse", ANALYSE}, /* British spelling */ {"analyze", ANALYZE}, {"and", AND}, {"any", ANY}, @@ -312,16 +312,16 @@ ScanKeywordLookup(char *text) return NULL; /* - * Apply an ASCII-only downcasing. We must not use tolower() since - * it may produce the wrong translation in some locales (eg, Turkish), + * Apply an ASCII-only downcasing. We must not use tolower() since it + * may produce the wrong translation in some locales (eg, Turkish), * and we don't trust isupper() very much either. In an ASCII-based - * encoding the tests against A and Z are sufficient, but we also check - * isupper() so that we will work correctly under EBCDIC. The actual - * case conversion step should work for either ASCII or EBCDIC. + * encoding the tests against A and Z are sufficient, but we also + * check isupper() so that we will work correctly under EBCDIC. The + * actual case conversion step should work for either ASCII or EBCDIC. */ for (i = 0; i < len; i++) { - char ch = text[i]; + char ch = text[i]; if (ch >= 'A' && ch <= 'Z' && isupper((unsigned char) ch)) ch += 'a' - 'A'; diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 5a1a7d1fa02..017a80888d5 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -203,10 +203,10 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * typ, const char *in { /* if (ind_typ == NULL) { - ind_typ = &ecpg_no_indicator; - ind_name = "no_indicator"; + ind_typ = &ecpg_no_indicator; + ind_name = "no_indicator"; }*/ - + switch (typ->typ) { case ECPGt_array: |