Skip to content

P
Postgres FD Implementation
Commit 8386c814 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Reverse out addition of snprintf.

parent 99796606
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
src/backend/utils/misc/trace.c
View file @ 8386c814
...@@ -108,8 +108,7 @@ tprintf(int flag, const char *fmt,...) ...@@ -108,8 +108,7 @@ tprintf(int flag, const char *fmt,...)
#ifdef ELOG_TIMESTAMPS #ifdef ELOG_TIMESTAMPS
strcpy(line, tprintf_timestamp()); strcpy(line, tprintf_timestamp());
#endif #endif
vsnprintf(line + TIMESTAMP_SIZE, ELOG_MAXLEN, vsprintf(line + TIMESTAMP_SIZE, fmt, ap);
fmt, ap);
va_end(ap); va_end(ap);
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
...@@ -139,8 +138,7 @@ tprintf1(const char *fmt, ... ) ...@@ -139,8 +138,7 @@ tprintf1(const char *fmt, ... )
#ifdef ELOG_TIMESTAMPS #ifdef ELOG_TIMESTAMPS
strcpy(line, tprintf_timestamp()); strcpy(line, tprintf_timestamp());
#endif #endif
vsnprintf(line+TIMESTAMP_SIZE, ELOG_MAXLEN, vsprintf(line+TIMESTAMP_SIZE, fmt, ap);
fmt, ap);
va_end(ap); va_end(ap);
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
...@@ -168,8 +166,7 @@ eprintf(const char *fmt,...) ...@@ -168,8 +166,7 @@ eprintf(const char *fmt,...)
#ifdef ELOG_TIMESTAMPS #ifdef ELOG_TIMESTAMPS
strcpy(line, tprintf_timestamp()); strcpy(line, tprintf_timestamp());
#endif #endif
vsnprintf(line + TIMESTAMP_SIZE, ELOG_MAXLEN, vsprintf(line + TIMESTAMP_SIZE, fmt, ap);
fmt, ap);
va_end(ap); va_end(ap);
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
...@@ -347,8 +344,7 @@ read_pg_options(SIGNAL_ARGS) ...@@ -347,8 +344,7 @@ read_pg_options(SIGNAL_ARGS)
return; return;
} }
snprintf(buffer, BUF_SIZE - 1, sprintf(buffer, "%s/%s", DataDir, "pg_options");
"%s/%s", DataDir, "pg_options");
if ((fd = open(buffer, O_RDONLY)) < 0) if ((fd = open(buffer, O_RDONLY)) < 0)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment