Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit42ebdc8

Browse files
committed
Put static forward declarations in elog.c back into same order as code.
The guiding principle for the last few patches in this area apparentlyinvolved throwing darts.Cosmetic only, but back-patch to 9.6 because there is no reason for9.6 and HEAD to diverge yet in this file.
1 parent6e47c6c commit42ebdc8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

‎src/backend/utils/error/elog.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,10 @@
7979
#include"utils/ps_status.h"
8080

8181

82+
/* In this module, access gettext() via err_gettext() */
8283
#undef _
8384
#define_(x) err_gettext(x)
8485

85-
staticconstchar*err_gettext(constchar*str)pg_attribute_format_arg(1);
86-
staticvoidset_errdata_field(MemoryContextData*cxt,char**ptr,constchar*str);
8786

8887
/* Global variables */
8988
ErrorContextCallback*error_context_stack=NULL;
@@ -129,10 +128,9 @@ static intsyslog_facility = LOG_LOCAL0;
129128
staticvoidwrite_syslog(intlevel,constchar*line);
130129
#endif
131130

132-
staticvoidwrite_console(constchar*line,intlen);
133-
134131
#ifdefWIN32
135132
externchar*event_source;
133+
136134
staticvoidwrite_eventlog(intlevel,constchar*line,intlen);
137135
#endif
138136

@@ -149,7 +147,6 @@ static intrecursion_depth = 0;/* to detect actual recursion */
149147
* Saved timeval and buffers for formatted timestamps that might be used by
150148
* both log_line_prefix and csv logs.
151149
*/
152-
153150
staticstructtimevalsaved_timeval;
154151
staticboolsaved_timeval_set= false;
155152

@@ -169,20 +166,23 @@ static char formatted_log_time[FORMATTED_TS_LEN];
169166
} while (0)
170167

171168

169+
staticconstchar*err_gettext(constchar*str)pg_attribute_format_arg(1);
170+
staticvoidset_errdata_field(MemoryContextData*cxt,char**ptr,constchar*str);
171+
staticvoidwrite_console(constchar*line,intlen);
172+
staticvoidsetup_formatted_log_time(void);
173+
staticvoidsetup_formatted_start_time(void);
172174
staticconstchar*process_log_prefix_padding(constchar*p,int*padding);
173175
staticvoidlog_line_prefix(StringInfobuf,ErrorData*edata);
176+
staticvoidwrite_csvlog(ErrorData*edata);
174177
staticvoidsend_message_to_server_log(ErrorData*edata);
178+
staticvoidwrite_pipe_chunks(char*data,intlen,intdest);
175179
staticvoidsend_message_to_frontend(ErrorData*edata);
176180
staticchar*expand_fmt_string(constchar*fmt,ErrorData*edata);
177181
staticconstchar*useful_strerror(interrnum);
178182
staticconstchar*get_errno_symbol(interrnum);
179183
staticconstchar*error_severity(intelevel);
180184
staticvoidappend_with_tabs(StringInfobuf,constchar*str);
181185
staticboolis_log_level_output(intelevel,intlog_min_level);
182-
staticvoidwrite_pipe_chunks(char*data,intlen,intdest);
183-
staticvoidwrite_csvlog(ErrorData*edata);
184-
staticvoidsetup_formatted_log_time(void);
185-
staticvoidsetup_formatted_start_time(void);
186186

187187

188188
/*

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp