>From 3219b14205f33e4e6c3682cf9ca795159d59e611 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 3 Apr 2014 12:51:40 +0200 Subject: [PATCH 1/3] Fix a bunch of somewhat pedantic compiler warnings. In C89 it's not allowed to have a trailing comma after the last enumerator value, compound literals have to be compile time constant and strictly speaking a void * pointer isn't a function pointer... --- src/backend/access/transam/xlog.c | 2 +- src/bin/pg_dump/parallel.c | 5 ++++- src/bin/psql/tab-complete.c | 10 +++++----- src/include/catalog/objectaccess.h | 2 +- src/include/pgstat.h | 2 +- src/include/utils/jsonapi.h | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index f9d6609..5096999 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -651,7 +651,7 @@ typedef enum XLOG_FROM_ANY = 0, /* request to read WAL from any source */ XLOG_FROM_ARCHIVE, /* restored using restore_command */ XLOG_FROM_PG_XLOG, /* existing file in pg_xlog */ - XLOG_FROM_STREAM, /* streamed from master */ + XLOG_FROM_STREAM /* streamed from master */ } XLogSource; /* human-readable names for XLogSources, for debugging output */ diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index 6f2634b..7d6e146 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -558,7 +558,10 @@ ParallelBackupStart(ArchiveHandle *AH, RestoreOptions *ropt) { /* we are the worker */ int j; - int pipefd[2] = {pipeMW[PIPE_READ], pipeWM[PIPE_WRITE]}; + int pipefd[2]; + + pipefd[0] = pipeMW[PIPE_READ]; + pipefd[1] = pipeWM[PIPE_WRITE]; /* * Store the fds for the reverse communication in pstate. Actually diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 1d69b95..202ffce 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -781,7 +781,7 @@ static const pgsql_thing_t words_after_create[] = { /* Forward declaration of functions */ -static char **psql_completion(char *text, int start, int end); +static char **psql_completion(const char *text, int start, int end); static char *create_command_generator(const char *text, int state); static char *drop_command_generator(const char *text, int state); static char *complete_from_query(const char *text, int state); @@ -790,7 +790,7 @@ static char *_complete_from_query(int is_schema_query, const char *text, int state); static char *complete_from_list(const char *text, int state); static char *complete_from_const(const char *text, int state); -static char **complete_from_variables(char *text, +static char **complete_from_variables(const char *text, const char *prefix, const char *suffix); static char *complete_from_files(const char *text, int state); @@ -812,7 +812,7 @@ void initialize_readline(void) { rl_readline_name = (char *) pset.progname; - rl_attempted_completion_function = (void *) psql_completion; + rl_attempted_completion_function = psql_completion; rl_basic_word_break_characters = WORD_BREAKS; @@ -834,7 +834,7 @@ initialize_readline(void) * completion_matches() function, so we don't have to worry about it. */ static char ** -psql_completion(char *text, int start, int end) +psql_completion(const char *text, int start, int end) { /* This is the variable we'll return. */ char **matches = NULL; @@ -3847,7 +3847,7 @@ complete_from_const(const char *text, int state) * to support quoting usages. */ static char ** -complete_from_variables(char *text, const char *prefix, const char *suffix) +complete_from_variables(const char *text, const char *prefix, const char *suffix) { char **matches; char **varnames; diff --git a/src/include/catalog/objectaccess.h b/src/include/catalog/objectaccess.h index e2f6b14..ac8260b 100644 --- a/src/include/catalog/objectaccess.h +++ b/src/include/catalog/objectaccess.h @@ -45,7 +45,7 @@ typedef enum ObjectAccessType OAT_DROP, OAT_POST_ALTER, OAT_NAMESPACE_SEARCH, - OAT_FUNCTION_EXECUTE, + OAT_FUNCTION_EXECUTE } ObjectAccessType; /* diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 932c83d..5f131f8 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -676,7 +676,7 @@ typedef enum BackendState STATE_IDLEINTRANSACTION, STATE_FASTPATH, STATE_IDLEINTRANSACTION_ABORTED, - STATE_DISABLED, + STATE_DISABLED } BackendState; /* ---------- diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h index 7a4fbfe..e4a2bd5 100644 --- a/src/include/utils/jsonapi.h +++ b/src/include/utils/jsonapi.h @@ -30,7 +30,7 @@ typedef enum JSON_TOKEN_TRUE, JSON_TOKEN_FALSE, JSON_TOKEN_NULL, - JSON_TOKEN_END, + JSON_TOKEN_END } JsonTokenType; -- 1.8.5.rc2.dirty