From 0e72b9d4408ddb8bf3355d02e3a3e3c885357e9b Mon Sep 17 00:00:00 2001 From: Neil Conway Date: Sun, 10 Oct 2004 23:37:45 +0000 Subject: [PATCH] Cosmetic improvements/code cleanup: - replace some function signatures of the form "some_type foo()" with "some_type foo(void)" - replace a few instances of a literal 0 being used as a NULL pointer; there are more instances of this in the code, but I just fixed a few - in src/backend/utils/mb/wstrncmp.c, replace K&R style function declarations with ANSI style, remove use of 'register' keyword - remove an "extern" modifier that was applied to a function definition (rather than a declaration) --- src/backend/bootstrap/bootparse.y | 6 +++--- src/backend/bootstrap/bootstrap.c | 4 ++-- src/backend/utils/mb/wstrncmp.c | 15 ++++----------- src/backend/utils/misc/guc.c | 4 ++-- src/bin/initdb/initdb.c | 6 +++--- src/bin/pg_config/pg_config.c | 6 +++--- src/bin/pg_ctl/pg_ctl.c | 4 ++-- src/bin/psql/common.c | 4 ++-- src/interfaces/ecpg/preproc/descriptor.c | 2 +- src/interfaces/ecpg/preproc/type.c | 4 ++-- src/pl/plpgsql/src/pl_funcs.c | 6 +++--- 11 files changed, 27 insertions(+), 34 deletions(-) diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 9bab19784a..9c5333061e 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.73 2004/08/31 17:10:36 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.74 2004/10/10 23:37:16 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ static void -do_start() +do_start(void) { StartTransactionCommand(); elog(DEBUG4, "start transaction"); @@ -60,7 +60,7 @@ do_start() static void -do_end() +do_end(void) { CommitTransactionCommand(); elog(DEBUG4, "commit transaction"); diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index d85692cb62..04792c7261 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.194 2004/10/08 01:36:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.195 2004/10/10 23:37:16 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -1012,7 +1012,7 @@ EnterString(char *str) len = strlen(str); - node = FindStr(str, len, 0); + node = FindStr(str, len, NULL); if (node) return node->strnum; else diff --git a/src/backend/utils/mb/wstrncmp.c b/src/backend/utils/mb/wstrncmp.c index c1aac9c66e..45d26f029a 100644 --- a/src/backend/utils/mb/wstrncmp.c +++ b/src/backend/utils/mb/wstrncmp.c @@ -38,10 +38,7 @@ #include "mb/pg_wchar.h" int -pg_wchar_strncmp(s1, s2, n) -register const pg_wchar *s1, - *s2; -register size_t n; +pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n) { if (n == 0) return 0; @@ -56,10 +53,7 @@ register size_t n; } int -pg_char_and_wchar_strncmp(s1, s2, n) -register const char *s1; -register const pg_wchar *s2; -register size_t n; +pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n) { if (n == 0) return 0; @@ -74,10 +68,9 @@ register size_t n; } size_t -pg_wchar_strlen(str) -const pg_wchar *str; +pg_wchar_strlen(const pg_wchar *str) { - register const pg_wchar *s; + const pg_wchar *s; for (s = str; *s; ++s) ; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index a788e53266..deb361e247 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.241 2004/10/09 23:13:10 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.242 2004/10/10 23:37:28 neilc Exp $ * *-------------------------------------------------------------------- */ @@ -4378,7 +4378,7 @@ DefineCustomStringVariable( define_custom_variable(&var->gen); } -extern void +void EmitWarningsOnPlaceholders(const char *className) { struct config_generic **vars = guc_variables; diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 2ed9c3c83f..cf4f404220 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -39,7 +39,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.59 2004/10/07 18:57:26 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.60 2004/10/10 23:37:31 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -1881,7 +1881,7 @@ trapsig(int signum) * call exit_nicely() if we got a signal, or else output "ok". */ static void -check_ok() +check_ok(void) { if (caught_signal) { @@ -2066,7 +2066,7 @@ main(int argc, char *argv[]) {"debug", no_argument, NULL, 'd'}, {"show", no_argument, NULL, 's'}, {"noclean", no_argument, NULL, 'n'}, - {0, 0, 0, 0} + {NULL, 0, NULL, 0} }; int c, diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c index 02ad203ae5..58e0cd9743 100644 --- a/src/bin/pg_config/pg_config.c +++ b/src/bin/pg_config/pg_config.c @@ -17,7 +17,7 @@ * * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.7 2004/10/06 17:21:45 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.8 2004/10/10 23:37:34 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ static char *progname; static void -help() +help(void) { printf(_("\n%s provides information about the installed version of PostgreSQL.\n\n"), progname); printf(_("Usage:\n")); @@ -52,7 +52,7 @@ help() } static void -advice() +advice(void) { fprintf(stderr, _("\nTry \"%s --help\" for more information\n"), progname); } diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index d756d4ca39..3bc3cbaf22 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.32 2004/10/07 15:21:55 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.33 2004/10/10 23:37:37 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -1190,7 +1190,7 @@ main(int argc, char **argv) {"mode", required_argument, NULL, 'm'}, {"pgdata", required_argument, NULL, 'D'}, {"silent", no_argument, NULL, 's'}, - {0, 0, 0, 0} + {NULL, 0, NULL, 0} }; int option_index; diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 27b9a290fc..0ca6fa4f55 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2004, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.91 2004/09/20 18:51:19 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.92 2004/10/10 23:37:40 neilc Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -268,7 +268,7 @@ handle_sigint(SIGNAL_ARGS) * Returns whether our backend connection is still there. */ static bool -ConnectionUp() +ConnectionUp(void) { return PQstatus(pset.db) != CONNECTION_BAD; } diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index 7ba6aa520d..a89eec2780 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -315,7 +315,7 @@ struct variable * descriptor_variable(const char *name, int input) { static char descriptor_names[2][MAX_DESCRIPTOR_NAMELEN]; - static const struct ECPGtype descriptor_type = {ECPGt_descriptor, 0}; + static const struct ECPGtype descriptor_type = {ECPGt_descriptor, NULL}; static const struct variable varspace[2] = { {descriptor_names[0], (struct ECPGtype *) & descriptor_type, 0, NULL}, {descriptor_names[1], (struct ECPGtype *) & descriptor_type, 0, NULL} diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 2418522204..c55b0ae32f 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -97,7 +97,7 @@ ECPGmake_simple_type(enum ECPGttype type, char *size) ne->type = type; ne->size = size; - ne->u.element = 0; + ne->u.element = NULL; ne->struct_sizeof = NULL; return ne; @@ -291,7 +291,7 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * type, if (indicator_set && (ind_type->type == ECPGt_struct || ind_type->type == ECPGt_array)) mmerror(INDICATOR_NOT_SIMPLE, ET_FATAL, "Indicator for simple datatype has to be simple.\n"); - ECPGdump_a_simple(o, name, type->type, 0, make_str("-1"), NULL, prefix); + ECPGdump_a_simple(o, name, type->type, NULL, make_str("-1"), NULL, prefix); ECPGdump_a_simple(o, ind_name, ind_type->type, ind_type->size, make_str("-1"), NULL, ind_prefix); break; default: diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c index e2812e9df6..555d0d652d 100644 --- a/src/pl/plpgsql/src/pl_funcs.c +++ b/src/pl/plpgsql/src/pl_funcs.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.37 2004/09/14 23:46:46 neilc Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.38 2004/10/10 23:37:45 neilc Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -166,7 +166,7 @@ plpgsql_ns_push(char *label) * ---------- */ void -plpgsql_ns_pop() +plpgsql_ns_pop(void) { int i; PLpgSQL_ns *old; @@ -503,7 +503,7 @@ static void dump_expr(PLpgSQL_expr *expr); static void -dump_ind() +dump_ind(void) { int i; -- 2.40.0