projects / users / heikki / postgres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aae7af3)
pg_upgrade: adjust C comments
authorBruce Momjian <[email protected]>
Thu, 11 Sep 2014 22:44:00 +0000 (18:44 -0400)
committerBruce Momjian <[email protected]>
Thu, 11 Sep 2014 22:44:00 +0000 (18:44 -0400)
contrib/pg_upgrade/controldata.c patch | blob | blame | history

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 676c77ea85ea8a89856f83b2d35e2edbe53e8938..8379ebd71be153b0af1216979390257bb6c13ce4 100644 (file)
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -145,7 +145,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: pg_resetxlog problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.ctrl_ver = str2uint(p);
                }
                else if ((p = strstr(bufin, "Catalog version number:")) != NULL)
@@ -155,7 +155,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.cat_ver = str2uint(p);
                }
                else if ((p = strstr(bufin, "First log segment after reset:")) != NULL)
@@ -182,7 +182,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        logid = str2uint(p);
                        got_log_id = true;
                }
@@ -193,7 +193,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        segno = str2uint(p);
                        got_log_seg = true;
                }
@@ -204,7 +204,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.chkpnt_tli = str2uint(p);
                        got_tli = true;
                }
@@ -215,14 +215,14 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.chkpnt_nxtepoch = str2uint(p);
 
                        p = strchr(p, '/');
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing '/' char */
+                       p++;                            /* remove '/' char */
                        cluster->controldata.chkpnt_nxtxid = str2uint(p);
                        got_xid = true;
                }
@@ -233,7 +233,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.chkpnt_nxtoid = str2uint(p);
                        got_oid = true;
                }
@@ -244,7 +244,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.chkpnt_nxtmulti = str2uint(p);
                        got_multi = true;
                }
@@ -255,7 +255,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.chkpnt_oldstMulti = str2uint(p);
                        got_oldestmulti = true;
                }
@@ -266,7 +266,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.chkpnt_nxtmxoff = str2uint(p);
                        got_mxoff = true;
                }
@@ -277,7 +277,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.align = str2uint(p);
                        got_align = true;
                }
@@ -288,7 +288,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.blocksz = str2uint(p);
                        got_blocksz = true;
                }
@@ -299,7 +299,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.largesz = str2uint(p);
                        got_largesz = true;
                }
@@ -310,7 +310,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.walsz = str2uint(p);
                        got_walsz = true;
                }
@@ -321,7 +321,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.walseg = str2uint(p);
                        got_walseg = true;
                }
@@ -332,7 +332,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.ident = str2uint(p);
                        got_ident = true;
                }
@@ -343,7 +343,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.index = str2uint(p);
                        got_index = true;
                }
@@ -354,7 +354,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.toast = str2uint(p);
                        got_toast = true;
                }
@@ -365,7 +365,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.large_object = str2uint(p);
                        got_large_object = true;
                }
@@ -376,7 +376,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        cluster->controldata.date_is_int = strstr(p, "64-bit integers") != NULL;
                        got_date_is_int = true;
                }
@@ -387,7 +387,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        /* used later for contrib check */
                        cluster->controldata.float8_pass_by_value = strstr(p, "by value") != NULL;
                        got_float8_pass_by_value = true;
@@ -399,7 +399,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        /* used later for contrib check */
                        cluster->controldata.data_checksum_version = str2uint(p);
                        got_data_checksum_version = true;
@@ -412,7 +412,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        /* skip leading spaces and remove trailing newline */
                        p += strspn(p, " ");
                        if (strlen(p) > 0 && *(p + strlen(p) - 1) == '\n')
@@ -427,7 +427,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                        if (p == NULL || strlen(p) <= 1)
                                pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
-                       p++;                            /* removing ':' char */
+                       p++;                            /* remove ':' char */
                        /* skip leading spaces and remove trailing newline */
                        p += strspn(p, " ");
                        if (strlen(p) > 0 && *(p + strlen(p) - 1) == '\n')
Heikki's random PostgreSQL patches