From 42ebdc8129f038e06e17d7b3da7fc11897323814 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 26 Aug 2016 14:19:03 -0400 Subject: [PATCH] Put static forward declarations in elog.c back into same order as code. The guiding principle for the last few patches in this area apparently involved throwing darts. Cosmetic only, but back-patch to 9.6 because there is no reason for 9.6 and HEAD to diverge yet in this file. --- src/backend/utils/error/elog.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 86e0cd9315..03c4a39761 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -79,11 +79,10 @@ #include "utils/ps_status.h" +/* In this module, access gettext() via err_gettext() */ #undef _ #define _(x) err_gettext(x) -static const char *err_gettext(const char *str) pg_attribute_format_arg(1); -static void set_errdata_field(MemoryContextData *cxt, char **ptr, const char *str); /* Global variables */ ErrorContextCallback *error_context_stack = NULL; @@ -129,10 +128,9 @@ static int syslog_facility = LOG_LOCAL0; static void write_syslog(int level, const char *line); #endif -static void write_console(const char *line, int len); - #ifdef WIN32 extern char *event_source; + static void write_eventlog(int level, const char *line, int len); #endif @@ -149,7 +147,6 @@ static int recursion_depth = 0; /* to detect actual recursion */ * Saved timeval and buffers for formatted timestamps that might be used by * both log_line_prefix and csv logs. */ - static struct timeval saved_timeval; static bool saved_timeval_set = false; @@ -169,9 +166,16 @@ static char formatted_log_time[FORMATTED_TS_LEN]; } while (0) +static const char *err_gettext(const char *str) pg_attribute_format_arg(1); +static void set_errdata_field(MemoryContextData *cxt, char **ptr, const char *str); +static void write_console(const char *line, int len); +static void setup_formatted_log_time(void); +static void setup_formatted_start_time(void); static const char *process_log_prefix_padding(const char *p, int *padding); static void log_line_prefix(StringInfo buf, ErrorData *edata); +static void write_csvlog(ErrorData *edata); static void send_message_to_server_log(ErrorData *edata); +static void write_pipe_chunks(char *data, int len, int dest); static void send_message_to_frontend(ErrorData *edata); static char *expand_fmt_string(const char *fmt, ErrorData *edata); static const char *useful_strerror(int errnum); @@ -179,10 +183,6 @@ static const char *get_errno_symbol(int errnum); static const char *error_severity(int elevel); static void append_with_tabs(StringInfo buf, const char *str); static bool is_log_level_output(int elevel, int log_min_level); -static void write_pipe_chunks(char *data, int len, int dest); -static void write_csvlog(ErrorData *edata); -static void setup_formatted_log_time(void); -static void setup_formatted_start_time(void); /*