mirror of
https://github.com/postgres/postgres.git
synced 2025-07-07 00:36:50 +03:00
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)
This commit is contained in:
@ -9,7 +9,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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
|
static void
|
||||||
do_start()
|
do_start(void)
|
||||||
{
|
{
|
||||||
StartTransactionCommand();
|
StartTransactionCommand();
|
||||||
elog(DEBUG4, "start transaction");
|
elog(DEBUG4, "start transaction");
|
||||||
@ -60,7 +60,7 @@ do_start()
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
do_end()
|
do_end(void)
|
||||||
{
|
{
|
||||||
CommitTransactionCommand();
|
CommitTransactionCommand();
|
||||||
elog(DEBUG4, "commit transaction");
|
elog(DEBUG4, "commit transaction");
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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);
|
len = strlen(str);
|
||||||
|
|
||||||
node = FindStr(str, len, 0);
|
node = FindStr(str, len, NULL);
|
||||||
if (node)
|
if (node)
|
||||||
return node->strnum;
|
return node->strnum;
|
||||||
else
|
else
|
||||||
|
@ -38,10 +38,7 @@
|
|||||||
#include "mb/pg_wchar.h"
|
#include "mb/pg_wchar.h"
|
||||||
|
|
||||||
int
|
int
|
||||||
pg_wchar_strncmp(s1, s2, n)
|
pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n)
|
||||||
register const pg_wchar *s1,
|
|
||||||
*s2;
|
|
||||||
register size_t n;
|
|
||||||
{
|
{
|
||||||
if (n == 0)
|
if (n == 0)
|
||||||
return 0;
|
return 0;
|
||||||
@ -56,10 +53,7 @@ register size_t n;
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
pg_char_and_wchar_strncmp(s1, s2, n)
|
pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n)
|
||||||
register const char *s1;
|
|
||||||
register const pg_wchar *s2;
|
|
||||||
register size_t n;
|
|
||||||
{
|
{
|
||||||
if (n == 0)
|
if (n == 0)
|
||||||
return 0;
|
return 0;
|
||||||
@ -74,10 +68,9 @@ register size_t n;
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
pg_wchar_strlen(str)
|
pg_wchar_strlen(const pg_wchar *str)
|
||||||
const pg_wchar *str;
|
|
||||||
{
|
{
|
||||||
register const pg_wchar *s;
|
const pg_wchar *s;
|
||||||
|
|
||||||
for (s = str; *s; ++s)
|
for (s = str; *s; ++s)
|
||||||
;
|
;
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
* Written by Peter Eisentraut <peter_e@gmx.net>.
|
* Written by Peter Eisentraut <peter_e@gmx.net>.
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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);
|
define_custom_variable(&var->gen);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void
|
void
|
||||||
EmitWarningsOnPlaceholders(const char *className)
|
EmitWarningsOnPlaceholders(const char *className)
|
||||||
{
|
{
|
||||||
struct config_generic **vars = guc_variables;
|
struct config_generic **vars = guc_variables;
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
* Portions taken from FreeBSD.
|
* 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".
|
* call exit_nicely() if we got a signal, or else output "ok".
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
check_ok()
|
check_ok(void)
|
||||||
{
|
{
|
||||||
if (caught_signal)
|
if (caught_signal)
|
||||||
{
|
{
|
||||||
@ -2066,7 +2066,7 @@ main(int argc, char *argv[])
|
|||||||
{"debug", no_argument, NULL, 'd'},
|
{"debug", no_argument, NULL, 'd'},
|
||||||
{"show", no_argument, NULL, 's'},
|
{"show", no_argument, NULL, 's'},
|
||||||
{"noclean", no_argument, NULL, 'n'},
|
{"noclean", no_argument, NULL, 'n'},
|
||||||
{0, 0, 0, 0}
|
{NULL, 0, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
int c,
|
int c,
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
*
|
*
|
||||||
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
|
* 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 char *progname;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
help()
|
help(void)
|
||||||
{
|
{
|
||||||
printf(_("\n%s provides information about the installed version of PostgreSQL.\n\n"), progname);
|
printf(_("\n%s provides information about the installed version of PostgreSQL.\n\n"), progname);
|
||||||
printf(_("Usage:\n"));
|
printf(_("Usage:\n"));
|
||||||
@ -52,7 +52,7 @@ help()
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
advice()
|
advice(void)
|
||||||
{
|
{
|
||||||
fprintf(stderr, _("\nTry \"%s --help\" for more information\n"), progname);
|
fprintf(stderr, _("\nTry \"%s --help\" for more information\n"), progname);
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
|
* 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'},
|
{"mode", required_argument, NULL, 'm'},
|
||||||
{"pgdata", required_argument, NULL, 'D'},
|
{"pgdata", required_argument, NULL, 'D'},
|
||||||
{"silent", no_argument, NULL, 's'},
|
{"silent", no_argument, NULL, 's'},
|
||||||
{0, 0, 0, 0}
|
{NULL, 0, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
int option_index;
|
int option_index;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
*
|
*
|
||||||
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
|
* 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 "postgres_fe.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
@ -268,7 +268,7 @@ handle_sigint(SIGNAL_ARGS)
|
|||||||
* Returns whether our backend connection is still there.
|
* Returns whether our backend connection is still there.
|
||||||
*/
|
*/
|
||||||
static bool
|
static bool
|
||||||
ConnectionUp()
|
ConnectionUp(void)
|
||||||
{
|
{
|
||||||
return PQstatus(pset.db) != CONNECTION_BAD;
|
return PQstatus(pset.db) != CONNECTION_BAD;
|
||||||
}
|
}
|
||||||
|
@ -315,7 +315,7 @@ struct variable *
|
|||||||
descriptor_variable(const char *name, int input)
|
descriptor_variable(const char *name, int input)
|
||||||
{
|
{
|
||||||
static char descriptor_names[2][MAX_DESCRIPTOR_NAMELEN];
|
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] = {
|
static const struct variable varspace[2] = {
|
||||||
{descriptor_names[0], (struct ECPGtype *) & descriptor_type, 0, NULL},
|
{descriptor_names[0], (struct ECPGtype *) & descriptor_type, 0, NULL},
|
||||||
{descriptor_names[1], (struct ECPGtype *) & descriptor_type, 0, NULL}
|
{descriptor_names[1], (struct ECPGtype *) & descriptor_type, 0, NULL}
|
||||||
|
@ -97,7 +97,7 @@ ECPGmake_simple_type(enum ECPGttype type, char *size)
|
|||||||
|
|
||||||
ne->type = type;
|
ne->type = type;
|
||||||
ne->size = size;
|
ne->size = size;
|
||||||
ne->u.element = 0;
|
ne->u.element = NULL;
|
||||||
ne->struct_sizeof = NULL;
|
ne->struct_sizeof = NULL;
|
||||||
|
|
||||||
return ne;
|
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))
|
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");
|
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);
|
ECPGdump_a_simple(o, ind_name, ind_type->type, ind_type->size, make_str("-1"), NULL, ind_prefix);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* procedural language
|
* procedural language
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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.
|
* This software is copyrighted by Jan Wieck - Hamburg.
|
||||||
*
|
*
|
||||||
@ -166,7 +166,7 @@ plpgsql_ns_push(char *label)
|
|||||||
* ----------
|
* ----------
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
plpgsql_ns_pop()
|
plpgsql_ns_pop(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
PLpgSQL_ns *old;
|
PLpgSQL_ns *old;
|
||||||
@ -503,7 +503,7 @@ static void dump_expr(PLpgSQL_expr *expr);
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
dump_ind()
|
dump_ind(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user