Rename transformRelOptions()'s "namspace" parameter to "nameSpace".

The name "namspace" looks like a typo, but it was presumably meant
to avoid using the "namespace" C++ keyword.  This commit renames
the parameter to "nameSpace" to prevent future confusion while
still avoiding the keyword.

Reviewed-by: Álvaro Herrera <alvherre@kurilemu.de>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>
Discussion: https://postgr.es/m/aJJxpfsDfiQ1VbJ5%40nathan

diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 594a657ea1a78aa5a849fdee58ab07fda400bc0a..0af3fea68fa48bf7f63f5a050b7eaf57ec81403e 100644 (file)
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -1164,7 +1164,7 @@ add_local_string_reloption(local_relopts *relopts, const char *name,
  * but we declare them as Datums to avoid including array.h in reloptions.h.
  */
 Datum
-transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
+transformRelOptions(Datum oldOptions, List *defList, const char *nameSpace,
                                        const char *const validnsps[], bool acceptOidsOff, bool isReset)
 {
        Datum           result;
@@ -1200,14 +1200,14 @@ transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
                                int                     kw_len;
 
                                /* ignore if not in the same namespace */
-                               if (namspace == NULL)
+                               if (nameSpace == NULL)
                                {
                                        if (def->defnamespace != NULL)
                                                continue;
                                }
                                else if (def->defnamespace == NULL)
                                        continue;
-                               else if (strcmp(def->defnamespace, namspace) != 0)
+                               else if (strcmp(def->defnamespace, nameSpace) != 0)
                                        continue;
 
                                kw_len = strlen(def->defname);
@@ -1277,14 +1277,14 @@ transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
                        }
 
                        /* ignore if not in the same namespace */
-                       if (namspace == NULL)
+                       if (nameSpace == NULL)
                        {
                                if (def->defnamespace != NULL)
                                        continue;
                        }
                        else if (def->defnamespace == NULL)
                                continue;
-                       else if (strcmp(def->defnamespace, namspace) != 0)
+                       else if (strcmp(def->defnamespace, nameSpace) != 0)
                                continue;
 
                        /*

diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h
index dfbb4c854606c4226bfcf9cd7845a421b49b650f..a604a4702c37c9d78cdf5d3a30bdee25975b0989 100644 (file)
--- a/src/include/access/reloptions.h
+++ b/src/include/access/reloptions.h
@@ -233,7 +233,7 @@ extern void add_local_string_reloption(local_relopts *relopts, const char *name,
                                                                           fill_string_relopt filler, int offset);
 
 extern Datum transformRelOptions(Datum oldOptions, List *defList,
-                                                                const char *namspace, const char *const validnsps[],
+                                                                const char *nameSpace, const char *const validnsps[],
                                                                 bool acceptOidsOff, bool isReset);
 extern List *untransformRelOptions(Datum options);
 extern bytea *extractRelOptions(HeapTuple tuple, TupleDesc tupdesc,