Skip to content

Commit c3c75fc

Browse files
bmomjianbmomjian
committed
pg_upgrade: adjust C comments
1 parent aae7af3 commit c3c75fc

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎contrib/pg_upgrade/controldata.c

+25-25
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
145145
if (p == NULL || strlen(p) <= 1)
146146
pg_fatal("%d: pg_resetxlog problem\n", __LINE__);
147147

148-
p++; /* removing ':' char */
148+
p++; /* remove ':' char */
149149
cluster->controldata.ctrl_ver = str2uint(p);
150150
}
151151
else if ((p = strstr(bufin, "Catalog version number:")) != NULL)
@@ -155,7 +155,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
155155
if (p == NULL || strlen(p) <= 1)
156156
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
157157

158-
p++; /* removing ':' char */
158+
p++; /* remove ':' char */
159159
cluster->controldata.cat_ver = str2uint(p);
160160
}
161161
else if ((p = strstr(bufin, "First log segment after reset:")) != NULL)
@@ -182,7 +182,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
182182
if (p == NULL || strlen(p) <= 1)
183183
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
184184

185-
p++; /* removing ':' char */
185+
p++; /* remove ':' char */
186186
logid = str2uint(p);
187187
got_log_id = true;
188188
}
@@ -193,7 +193,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
193193
if (p == NULL || strlen(p) <= 1)
194194
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
195195

196-
p++; /* removing ':' char */
196+
p++; /* remove ':' char */
197197
segno = str2uint(p);
198198
got_log_seg = true;
199199
}
@@ -204,7 +204,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
204204
if (p == NULL || strlen(p) <= 1)
205205
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
206206

207-
p++; /* removing ':' char */
207+
p++; /* remove ':' char */
208208
cluster->controldata.chkpnt_tli = str2uint(p);
209209
got_tli = true;
210210
}
@@ -215,14 +215,14 @@ get_control_data(ClusterInfo *cluster, bool live_check)
215215
if (p == NULL || strlen(p) <= 1)
216216
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
217217

218-
p++; /* removing ':' char */
218+
p++; /* remove ':' char */
219219
cluster->controldata.chkpnt_nxtepoch = str2uint(p);
220220

221221
p = strchr(p, '/');
222222
if (p == NULL || strlen(p) <= 1)
223223
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
224224

225-
p++; /* removing '/' char */
225+
p++; /* remove '/' char */
226226
cluster->controldata.chkpnt_nxtxid = str2uint(p);
227227
got_xid = true;
228228
}
@@ -233,7 +233,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
233233
if (p == NULL || strlen(p) <= 1)
234234
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
235235

236-
p++; /* removing ':' char */
236+
p++; /* remove ':' char */
237237
cluster->controldata.chkpnt_nxtoid = str2uint(p);
238238
got_oid = true;
239239
}
@@ -244,7 +244,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
244244
if (p == NULL || strlen(p) <= 1)
245245
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
246246

247-
p++; /* removing ':' char */
247+
p++; /* remove ':' char */
248248
cluster->controldata.chkpnt_nxtmulti = str2uint(p);
249249
got_multi = true;
250250
}
@@ -255,7 +255,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
255255
if (p == NULL || strlen(p) <= 1)
256256
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
257257

258-
p++; /* removing ':' char */
258+
p++; /* remove ':' char */
259259
cluster->controldata.chkpnt_oldstMulti = str2uint(p);
260260
got_oldestmulti = true;
261261
}
@@ -266,7 +266,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
266266
if (p == NULL || strlen(p) <= 1)
267267
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
268268

269-
p++; /* removing ':' char */
269+
p++; /* remove ':' char */
270270
cluster->controldata.chkpnt_nxtmxoff = str2uint(p);
271271
got_mxoff = true;
272272
}
@@ -277,7 +277,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
277277
if (p == NULL || strlen(p) <= 1)
278278
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
279279

280-
p++; /* removing ':' char */
280+
p++; /* remove ':' char */
281281
cluster->controldata.align = str2uint(p);
282282
got_align = true;
283283
}
@@ -288,7 +288,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
288288
if (p == NULL || strlen(p) <= 1)
289289
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
290290

291-
p++; /* removing ':' char */
291+
p++; /* remove ':' char */
292292
cluster->controldata.blocksz = str2uint(p);
293293
got_blocksz = true;
294294
}
@@ -299,7 +299,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
299299
if (p == NULL || strlen(p) <= 1)
300300
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
301301

302-
p++; /* removing ':' char */
302+
p++; /* remove ':' char */
303303
cluster->controldata.largesz = str2uint(p);
304304
got_largesz = true;
305305
}
@@ -310,7 +310,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
310310
if (p == NULL || strlen(p) <= 1)
311311
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
312312

313-
p++; /* removing ':' char */
313+
p++; /* remove ':' char */
314314
cluster->controldata.walsz = str2uint(p);
315315
got_walsz = true;
316316
}
@@ -321,7 +321,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
321321
if (p == NULL || strlen(p) <= 1)
322322
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
323323

324-
p++; /* removing ':' char */
324+
p++; /* remove ':' char */
325325
cluster->controldata.walseg = str2uint(p);
326326
got_walseg = true;
327327
}
@@ -332,7 +332,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
332332
if (p == NULL || strlen(p) <= 1)
333333
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
334334

335-
p++; /* removing ':' char */
335+
p++; /* remove ':' char */
336336
cluster->controldata.ident = str2uint(p);
337337
got_ident = true;
338338
}
@@ -343,7 +343,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
343343
if (p == NULL || strlen(p) <= 1)
344344
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
345345

346-
p++; /* removing ':' char */
346+
p++; /* remove ':' char */
347347
cluster->controldata.index = str2uint(p);
348348
got_index = true;
349349
}
@@ -354,7 +354,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
354354
if (p == NULL || strlen(p) <= 1)
355355
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
356356

357-
p++; /* removing ':' char */
357+
p++; /* remove ':' char */
358358
cluster->controldata.toast = str2uint(p);
359359
got_toast = true;
360360
}
@@ -365,7 +365,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
365365
if (p == NULL || strlen(p) <= 1)
366366
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
367367

368-
p++; /* removing ':' char */
368+
p++; /* remove ':' char */
369369
cluster->controldata.large_object = str2uint(p);
370370
got_large_object = true;
371371
}
@@ -376,7 +376,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
376376
if (p == NULL || strlen(p) <= 1)
377377
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
378378

379-
p++; /* removing ':' char */
379+
p++; /* remove ':' char */
380380
cluster->controldata.date_is_int = strstr(p, "64-bit integers") != NULL;
381381
got_date_is_int = true;
382382
}
@@ -387,7 +387,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
387387
if (p == NULL || strlen(p) <= 1)
388388
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
389389

390-
p++; /* removing ':' char */
390+
p++; /* remove ':' char */
391391
/* used later for contrib check */
392392
cluster->controldata.float8_pass_by_value = strstr(p, "by value") != NULL;
393393
got_float8_pass_by_value = true;
@@ -399,7 +399,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
399399
if (p == NULL || strlen(p) <= 1)
400400
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
401401

402-
p++; /* removing ':' char */
402+
p++; /* remove ':' char */
403403
/* used later for contrib check */
404404
cluster->controldata.data_checksum_version = str2uint(p);
405405
got_data_checksum_version = true;
@@ -412,7 +412,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
412412
if (p == NULL || strlen(p) <= 1)
413413
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
414414

415-
p++; /* removing ':' char */
415+
p++; /* remove ':' char */
416416
/* skip leading spaces and remove trailing newline */
417417
p += strspn(p, " ");
418418
if (strlen(p) > 0 && *(p + strlen(p) - 1) == '\n')
@@ -427,7 +427,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
427427
if (p == NULL || strlen(p) <= 1)
428428
pg_fatal("%d: controldata retrieval problem\n", __LINE__);
429429

430-
p++; /* removing ':' char */
430+
p++; /* remove ':' char */
431431
/* skip leading spaces and remove trailing newline */
432432
p += strspn(p, " ");
433433
if (strlen(p) > 0 && *(p + strlen(p) - 1) == '\n')

0 commit comments

Comments
 (0)