diff options
| author | Michael Meskes <meskes@postgresql.org> | 2010-11-02 18:12:01 +0100 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2010-11-02 18:12:01 +0100 |
| commit | 35d5d962e1777560baf6f5edec906a907a853c9a (patch) | |
| tree | da8655d2409ebd61863735a1f321052eaedbc636 /src/interfaces/ecpg/preproc | |
| parent | 8c843fff2d8db7889b81782ab4f3324cbda4ed2a (diff) | |
Some cleanup in ecpg code:
Use bool as type for booleans instead of int.
Do not implicitely cast size_t to int.
Make the compiler stop complaining about unused variables by adding an empty statement.
Diffstat (limited to 'src/interfaces/ecpg/preproc')
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.c | 8 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.trailer | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/extern.h | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c index df1ddfd818f..917200abd0b 100644 --- a/src/interfaces/ecpg/preproc/ecpg.c +++ b/src/interfaces/ecpg/preproc/ecpg.c @@ -11,8 +11,8 @@ #include "extern.h" -int ret_value = 0, - autocommit = false, +int ret_value = 0; +bool autocommit = false, auto_create_c = false, system_includes = false, force_indicator = true, @@ -126,9 +126,9 @@ main(int argc, char *const argv[]) int fnr, c, - verbose = false, - header_mode = false, out_option = 0; + bool verbose = false, + header_mode = false; struct _include_path *ip; const char *progname; char my_exec_path[MAXPGPATH]; diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 2ef6c3618e8..2eaef25c534 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -270,7 +270,7 @@ prepared_name: name { $$ = $1; else /* not quoted => convert to lowercase */ { - int i; + size_t i; for (i = 0; i< strlen($1); i++) $1[i] = tolower((unsigned char) $1[i]); diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index 202baacc3d8..e9d5b7e83c0 100644 --- a/src/interfaces/ecpg/preproc/extern.h +++ b/src/interfaces/ecpg/preproc/extern.h @@ -18,17 +18,17 @@ /* variables */ -extern int braces_open, - autocommit, +extern bool autocommit, auto_create_c, system_includes, force_indicator, questionmarks, - ret_value, - struct_level, - ecpg_internal_var, regression_mode, auto_prepare; +extern int braces_open, + ret_value, + struct_level, + ecpg_internal_var; extern char *current_function; extern char *descriptor_index; extern char *descriptor_name; |