diff options
| author | Bruce Momjian | 2010-10-20 02:31:17 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2010-10-20 02:31:17 +0000 |
| commit | 691a67b922f2e8374356215228700958165e7d44 (patch) | |
| tree | 851e9d093b072049d1b11cfe25c443bf63133952 /contrib/pg_upgrade/util.c | |
| parent | 3325c9bddb332487914c5c96d838286350044814 (diff) | |
Rename pg_upgrade 'log' to 'log_opts', to avoid platform naming conflict.
Diffstat (limited to 'contrib/pg_upgrade/util.c')
| -rw-r--r-- | contrib/pg_upgrade/util.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c index a5ad436ddc7..da6dca0e2c8 100644 --- a/contrib/pg_upgrade/util.c +++ b/contrib/pg_upgrade/util.c @@ -12,7 +12,7 @@ #include <signal.h> -Log log; +LogOpts log_opts; /* * report_status() @@ -75,19 +75,19 @@ pg_log(eLogType type, char *fmt,...) vsnprintf(message, sizeof(message), fmt, args); va_end(args); - if (log.fd != NULL) + if (log_opts.fd != NULL) { - fwrite(message, strlen(message), 1, log.fd); + fwrite(message, strlen(message), 1, log_opts.fd); /* if we are using OVERWRITE_MESSAGE, add newline */ if (strchr(message, '\r') != NULL) - fwrite("\n", 1, 1, log.fd); - fflush(log.fd); + fwrite("\n", 1, 1, log_opts.fd); + fflush(log_opts.fd); } switch (type) { case PG_INFO: - if (log.verbose) + if (log_opts.verbose) printf("%s", _(message)); break; @@ -103,8 +103,8 @@ pg_log(eLogType type, char *fmt,...) break; case PG_DEBUG: - if (log.debug) - fprintf(log.debug_fd, "%s\n", _(message)); + if (log_opts.debug) + fprintf(log_opts.debug_fd, "%s\n", _(message)); break; default: @@ -189,13 +189,13 @@ exit_nicely(bool need_cleanup) { stop_postmaster(true, true); - pg_free(log.filename); + pg_free(log_opts.filename); - if (log.fd) - fclose(log.fd); + if (log_opts.fd) + fclose(log_opts.fd); - if (log.debug_fd) - fclose(log.debug_fd); + if (log_opts.debug_fd) + fclose(log_opts.debug_fd); /* terminate any running instance of postmaster */ if (os_info.postmasterPID != 0) |