Skip to content

Commit 691a67b

Browse files
bmomjianbmomjian
committed
Rename pg_upgrade 'log' to 'log_opts', to avoid platform naming conflict.
1 parent 3325c9b commit 691a67b

File tree

8 files changed

+48
-48
lines changed

8 files changed

+48
-48
lines changed

‎contrib/pg_upgrade/check.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ issue_warnings(char *sequence_script_file_name)
160160
"--no-psqlrc --port %d --username \"%s\" "
161161
"-f \"%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
162162
new_cluster.bindir, new_cluster.port, os_info.user,
163-
sequence_script_file_name, log.filename);
163+
sequence_script_file_name, log_opts.filename);
164164
unlink(sequence_script_file_name);
165165
check_ok();
166166
}

‎contrib/pg_upgrade/controldata.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
126126
/* we have the result of cmd in "output". so parse it line by line now */
127127
while (fgets(bufin, sizeof(bufin), output))
128128
{
129-
if (log.debug)
130-
fputs(bufin, log.debug_fd);
129+
if (log_opts.debug)
130+
fputs(bufin, log_opts.debug_fd);
131131

132132
#ifdef WIN32
133133

‎contrib/pg_upgrade/info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ map_rel_by_id(Oid oldid, Oid newid,
192192
void
193193
print_maps(FileNameMap *maps, int n, const char *dbName)
194194
{
195-
if (log.debug)
195+
if (log_opts.debug)
196196
{
197197
int mapnum;
198198

@@ -277,7 +277,7 @@ get_db_and_rel_infos(DbInfoArr *db_arr, Cluster whichCluster)
277277
get_rel_infos(&db_arr->dbs[dbnum],
278278
&db_arr->dbs[dbnum].rel_arr, whichCluster);
279279

280-
if (log.debug)
280+
if (log_opts.debug)
281281
dbarr_print(db_arr, whichCluster);
282282
}
283283

‎contrib/pg_upgrade/option.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ parseCommandLine(int argc, char *argv[])
119119

120120
case 'g':
121121
pg_log(PG_REPORT, "Running in debug mode\n");
122-
log.debug = true;
122+
log_opts.debug = true;
123123
break;
124124

125125
case 'G':
126-
if ((log.debug_fd = fopen(optarg, "w")) == NULL)
126+
if ((log_opts.debug_fd = fopen(optarg, "w")) == NULL)
127127
{
128128
pg_log(PG_FATAL, "cannot open debug file\n");
129129
exit_nicely(false);
@@ -135,7 +135,7 @@ parseCommandLine(int argc, char *argv[])
135135
break;
136136

137137
case 'l':
138-
log.filename = pg_strdup(optarg);
138+
log_opts.filename = pg_strdup(optarg);
139139
break;
140140

141141
case 'p':
@@ -161,7 +161,7 @@ parseCommandLine(int argc, char *argv[])
161161

162162
case 'v':
163163
pg_log(PG_REPORT, "Running in verbose mode\n");
164-
log.verbose = true;
164+
log_opts.verbose = true;
165165
break;
166166

167167
default:
@@ -172,28 +172,28 @@ parseCommandLine(int argc, char *argv[])
172172
}
173173
}
174174

175-
if (log.filename != NULL)
175+
if (log_opts.filename != NULL)
176176
{
177177
/*
178178
* We must use append mode so output generated by child processes via
179179
* ">>" will not be overwritten, and we want the file truncated on
180180
* start.
181181
*/
182182
/* truncate */
183-
if ((log.fd = fopen(log.filename, "w")) == NULL)
184-
pg_log(PG_FATAL, "Cannot write to log file %s\n", log.filename);
185-
fclose(log.fd);
186-
if ((log.fd = fopen(log.filename, "a")) == NULL)
187-
pg_log(PG_FATAL, "Cannot write to log file %s\n", log.filename);
183+
if ((log_opts.fd = fopen(log_opts.filename, "w")) == NULL)
184+
pg_log(PG_FATAL, "Cannot write to log file %s\n", log_opts.filename);
185+
fclose(log_opts.fd);
186+
if ((log_opts.fd = fopen(log_opts.filename, "a")) == NULL)
187+
pg_log(PG_FATAL, "Cannot write to log file %s\n", log_opts.filename);
188188
}
189189
else
190-
log.filename = strdup(DEVNULL);
190+
log_opts.filename = strdup(DEVNULL);
191191

192192
/* if no debug file name, output to the terminal */
193-
if (log.debug && !log.debug_fd)
193+
if (log_opts.debug && !log_opts.debug_fd)
194194
{
195-
log.debug_fd = fopen(DEVTTY, "w");
196-
if (!log.debug_fd)
195+
log_opts.debug_fd = fopen(DEVTTY, "w");
196+
if (!log_opts.debug_fd)
197197
pg_log(PG_FATAL, "Cannot write to terminal\n");
198198
}
199199

‎contrib/pg_upgrade/pg_upgrade.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ prepare_new_cluster(void)
162162
exec_prog(true,
163163
SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
164164
"--all --analyze >> %s 2>&1" SYSTEMQUOTE,
165-
new_cluster.bindir, new_cluster.port, os_info.user, log.filename);
165+
new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename);
166166
check_ok();
167167

168168
/*
@@ -175,7 +175,7 @@ prepare_new_cluster(void)
175175
exec_prog(true,
176176
SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
177177
"--all --freeze >> %s 2>&1" SYSTEMQUOTE,
178-
new_cluster.bindir, new_cluster.port, os_info.user, log.filename);
178+
new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename);
179179
check_ok();
180180

181181
get_pg_database_relfilenode(CLUSTER_NEW);
@@ -207,7 +207,7 @@ prepare_new_databases(void)
207207
"--no-psqlrc --port %d --username \"%s\" "
208208
"-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
209209
new_cluster.bindir, new_cluster.port, os_info.user, os_info.cwd,
210-
GLOBALS_DUMP_FILE, log.filename);
210+
GLOBALS_DUMP_FILE, log_opts.filename);
211211
check_ok();
212212

213213
get_db_and_rel_infos(&new_cluster.dbarr, CLUSTER_NEW);
@@ -230,7 +230,7 @@ create_new_objects(void)
230230
"--no-psqlrc --port %d --username \"%s\" "
231231
"-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
232232
new_cluster.bindir, new_cluster.port, os_info.user, os_info.cwd,
233-
DB_DUMP_FILE, log.filename);
233+
DB_DUMP_FILE, log_opts.filename);
234234
check_ok();
235235

236236
/* regenerate now that we have db schemas */
@@ -282,7 +282,7 @@ copy_clog_xlog_xid(void)
282282
exec_prog(true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l %u,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE,
283283
new_cluster.bindir, old_cluster.controldata.chkpnt_tli,
284284
old_cluster.controldata.logid, old_cluster.controldata.nxtlogseg,
285-
new_cluster.pgdata, log.filename);
285+
new_cluster.pgdata, log_opts.filename);
286286
check_ok();
287287
}
288288

@@ -384,7 +384,7 @@ cleanup(void)
384384

385385
dbarr_free(&old_cluster.dbarr);
386386
dbarr_free(&new_cluster.dbarr);
387-
pg_free(log.filename);
387+
pg_free(log_opts.filename);
388388
pg_free(os_info.user);
389389
pg_free(old_cluster.major_version_str);
390390
pg_free(new_cluster.major_version_str);
@@ -397,14 +397,14 @@ cleanup(void)
397397
pg_free(old_cluster.tablespace_suffix);
398398
pg_free(new_cluster.tablespace_suffix);
399399

400-
if (log.fd != NULL)
400+
if (log_opts.fd != NULL)
401401
{
402-
fclose(log.fd);
403-
log.fd = NULL;
402+
fclose(log_opts.fd);
403+
log_opts.fd = NULL;
404404
}
405405

406-
if (log.debug_fd)
407-
fclose(log.debug_fd);
406+
if (log_opts.debug_fd)
407+
fclose(log_opts.debug_fd);
408408

409409
snprintf(filename, sizeof(filename), "%s/%s", os_info.cwd, ALL_DUMP_FILE);
410410
unlink(filename);

‎contrib/pg_upgrade/pg_upgrade.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ typedef struct
197197

198198

199199
/*
200-
* Log
200+
* LogOpts
201201
*/
202202
typedef struct
203203
{
@@ -206,7 +206,7 @@ typedef struct
206206
bool debug; /* TRUE -> log more information */
207207
FILE *debug_fd; /* debug-level log FILE */
208208
bool verbose; /* TRUE -> be verbose in messages */
209-
} Log;
209+
} LogOpts;
210210

211211

212212
/*
@@ -241,7 +241,7 @@ typedef struct
241241
/*
242242
* Global variables
243243
*/
244-
extern Log log;
244+
extern LogOpts log_opts;
245245
extern UserOpts user_opts;
246246
extern ClusterInfo old_cluster,
247247
new_cluster;

‎contrib/pg_upgrade/server.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ start_postmaster(Cluster whichCluster, bool quiet)
185185
"start >> \"%s\" 2>&1" SYSTEMQUOTE,
186186
bindir,
187187
#ifndef WIN32
188-
log.filename, datadir, port, log.filename);
188+
log_opts.filename, datadir, port, log_opts.filename);
189189
#else
190190
DEVNULL, datadir, port, DEVNULL);
191191
#endif
@@ -229,7 +229,7 @@ stop_postmaster(bool fast, bool quiet)
229229
"\"%s\" 2>&1" SYSTEMQUOTE,
230230
bindir,
231231
#ifndef WIN32
232-
log.filename, datadir, fast ? "-m fast" : "", log.filename);
232+
log_opts.filename, datadir, fast ? "-m fast" : "", log_opts.filename);
233233
#else
234234
DEVNULL, datadir, fast ? "-m fast" : "", DEVNULL);
235235
#endif

‎contrib/pg_upgrade/util.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <signal.h>
1313

1414

15-
Log log;
15+
LogOpts log_opts;
1616

1717
/*
1818
* report_status()
@@ -75,19 +75,19 @@ pg_log(eLogType type, char *fmt,...)
7575
vsnprintf(message, sizeof(message), fmt, args);
7676
va_end(args);
7777

78-
if (log.fd != NULL)
78+
if (log_opts.fd != NULL)
7979
{
80-
fwrite(message, strlen(message), 1, log.fd);
80+
fwrite(message, strlen(message), 1, log_opts.fd);
8181
/* if we are using OVERWRITE_MESSAGE, add newline */
8282
if (strchr(message, '\r') != NULL)
83-
fwrite("\n", 1, 1, log.fd);
84-
fflush(log.fd);
83+
fwrite("\n", 1, 1, log_opts.fd);
84+
fflush(log_opts.fd);
8585
}
8686

8787
switch (type)
8888
{
8989
case PG_INFO:
90-
if (log.verbose)
90+
if (log_opts.verbose)
9191
printf("%s", _(message));
9292
break;
9393

@@ -103,8 +103,8 @@ pg_log(eLogType type, char *fmt,...)
103103
break;
104104

105105
case PG_DEBUG:
106-
if (log.debug)
107-
fprintf(log.debug_fd, "%s\n", _(message));
106+
if (log_opts.debug)
107+
fprintf(log_opts.debug_fd, "%s\n", _(message));
108108
break;
109109

110110
default:
@@ -189,13 +189,13 @@ exit_nicely(bool need_cleanup)
189189
{
190190
stop_postmaster(true, true);
191191

192-
pg_free(log.filename);
192+
pg_free(log_opts.filename);
193193

194-
if (log.fd)
195-
fclose(log.fd);
194+
if (log_opts.fd)
195+
fclose(log_opts.fd);
196196

197-
if (log.debug_fd)
198-
fclose(log.debug_fd);
197+
if (log_opts.debug_fd)
198+
fclose(log_opts.debug_fd);
199199

200200
/* terminate any running instance of postmaster */
201201
if (os_info.postmasterPID != 0)

0 commit comments

Comments
 (0)