mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-03-07 19:47:50 +08:00
Fix some compiler warnings that clang emits with -pedantic.
Andres Freund
This commit is contained in:
parent
b1236f4b7b
commit
59202fae04
@ -651,7 +651,7 @@ typedef enum
|
|||||||
XLOG_FROM_ANY = 0, /* request to read WAL from any source */
|
XLOG_FROM_ANY = 0, /* request to read WAL from any source */
|
||||||
XLOG_FROM_ARCHIVE, /* restored using restore_command */
|
XLOG_FROM_ARCHIVE, /* restored using restore_command */
|
||||||
XLOG_FROM_PG_XLOG, /* existing file in pg_xlog */
|
XLOG_FROM_PG_XLOG, /* existing file in pg_xlog */
|
||||||
XLOG_FROM_STREAM, /* streamed from master */
|
XLOG_FROM_STREAM /* streamed from master */
|
||||||
} XLogSource;
|
} XLogSource;
|
||||||
|
|
||||||
/* human-readable names for XLogSources, for debugging output */
|
/* human-readable names for XLogSources, for debugging output */
|
||||||
|
@ -558,7 +558,10 @@ ParallelBackupStart(ArchiveHandle *AH, RestoreOptions *ropt)
|
|||||||
{
|
{
|
||||||
/* we are the worker */
|
/* we are the worker */
|
||||||
int j;
|
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
|
* Store the fds for the reverse communication in pstate. Actually
|
||||||
|
@ -781,7 +781,7 @@ static const pgsql_thing_t words_after_create[] = {
|
|||||||
|
|
||||||
|
|
||||||
/* Forward declaration of functions */
|
/* 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 *create_command_generator(const char *text, int state);
|
||||||
static char *drop_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);
|
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);
|
const char *text, int state);
|
||||||
static char *complete_from_list(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_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);
|
const char *prefix, const char *suffix);
|
||||||
static char *complete_from_files(const char *text, int state);
|
static char *complete_from_files(const char *text, int state);
|
||||||
|
|
||||||
@ -812,7 +812,7 @@ void
|
|||||||
initialize_readline(void)
|
initialize_readline(void)
|
||||||
{
|
{
|
||||||
rl_readline_name = (char *) pset.progname;
|
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;
|
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.
|
* completion_matches() function, so we don't have to worry about it.
|
||||||
*/
|
*/
|
||||||
static char **
|
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. */
|
/* This is the variable we'll return. */
|
||||||
char **matches = NULL;
|
char **matches = NULL;
|
||||||
@ -3847,7 +3847,7 @@ complete_from_const(const char *text, int state)
|
|||||||
* to support quoting usages.
|
* to support quoting usages.
|
||||||
*/
|
*/
|
||||||
static char **
|
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 **matches;
|
||||||
char **varnames;
|
char **varnames;
|
||||||
|
@ -45,7 +45,7 @@ typedef enum ObjectAccessType
|
|||||||
OAT_DROP,
|
OAT_DROP,
|
||||||
OAT_POST_ALTER,
|
OAT_POST_ALTER,
|
||||||
OAT_NAMESPACE_SEARCH,
|
OAT_NAMESPACE_SEARCH,
|
||||||
OAT_FUNCTION_EXECUTE,
|
OAT_FUNCTION_EXECUTE
|
||||||
} ObjectAccessType;
|
} ObjectAccessType;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -676,7 +676,7 @@ typedef enum BackendState
|
|||||||
STATE_IDLEINTRANSACTION,
|
STATE_IDLEINTRANSACTION,
|
||||||
STATE_FASTPATH,
|
STATE_FASTPATH,
|
||||||
STATE_IDLEINTRANSACTION_ABORTED,
|
STATE_IDLEINTRANSACTION_ABORTED,
|
||||||
STATE_DISABLED,
|
STATE_DISABLED
|
||||||
} BackendState;
|
} BackendState;
|
||||||
|
|
||||||
/* ----------
|
/* ----------
|
||||||
|
@ -30,7 +30,7 @@ typedef enum
|
|||||||
JSON_TOKEN_TRUE,
|
JSON_TOKEN_TRUE,
|
||||||
JSON_TOKEN_FALSE,
|
JSON_TOKEN_FALSE,
|
||||||
JSON_TOKEN_NULL,
|
JSON_TOKEN_NULL,
|
||||||
JSON_TOKEN_END,
|
JSON_TOKEN_END
|
||||||
} JsonTokenType;
|
} JsonTokenType;
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user