Skip to content

Commit 35baa60

Browse files
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 <[email protected]> Reviewed-by: Tom Lane <[email protected]> Reviewed-by: Ashutosh Bapat <[email protected]> Discussion: https://postgr.es/m/aJJxpfsDfiQ1VbJ5%40nathan
1 parent 99139c4 commit 35baa60

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/backend/access/common/reloptions.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ add_local_string_reloption(local_relopts *relopts, const char *name,
11641164
* but we declare them as Datums to avoid including array.h in reloptions.h.
11651165
*/
11661166
Datum
1167-
transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
1167+
transformRelOptions(Datum oldOptions, List *defList, const char *nameSpace,
11681168
const char *const validnsps[], bool acceptOidsOff, bool isReset)
11691169
{
11701170
Datum result;
@@ -1200,14 +1200,14 @@ transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
12001200
int kw_len;
12011201

12021202
/* ignore if not in the same namespace */
1203-
if (namspace == NULL)
1203+
if (nameSpace == NULL)
12041204
{
12051205
if (def->defnamespace != NULL)
12061206
continue;
12071207
}
12081208
else if (def->defnamespace == NULL)
12091209
continue;
1210-
else if (strcmp(def->defnamespace, namspace) != 0)
1210+
else if (strcmp(def->defnamespace, nameSpace) != 0)
12111211
continue;
12121212

12131213
kw_len = strlen(def->defname);
@@ -1277,14 +1277,14 @@ transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
12771277
}
12781278

12791279
/* ignore if not in the same namespace */
1280-
if (namspace == NULL)
1280+
if (nameSpace == NULL)
12811281
{
12821282
if (def->defnamespace != NULL)
12831283
continue;
12841284
}
12851285
else if (def->defnamespace == NULL)
12861286
continue;
1287-
else if (strcmp(def->defnamespace, namspace) != 0)
1287+
else if (strcmp(def->defnamespace, nameSpace) != 0)
12881288
continue;
12891289

12901290
/*

src/include/access/reloptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ extern void add_local_string_reloption(local_relopts *relopts, const char *name,
233233
fill_string_relopt filler, int offset);
234234

235235
extern Datum transformRelOptions(Datum oldOptions, List *defList,
236-
const char *namspace, const char *const validnsps[],
236+
const char *nameSpace, const char *const validnsps[],
237237
bool acceptOidsOff, bool isReset);
238238
extern List *untransformRelOptions(Datum options);
239239
extern bytea *extractRelOptions(HeapTuple tuple, TupleDesc tupdesc,

0 commit comments

Comments
 (0)