Remove unused "caller" argument from stringToQualifiedNameList.

diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index bfe9f2e68a21d519eb59229c5cacbba1e74c5f88..0b23e54741b57f444bdda8659aff6d0a5f64981f 100644 (file)
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -35,8 +35,7 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
-static void parseNameAndArgTypes(const char *string, const char *caller,
-                                        bool allowNone,
+static void parseNameAndArgTypes(const char *string, bool allowNone,
                                         List **names, int *nargs, Oid *argtypes);
 
 
@@ -127,7 +126,7 @@ regprocin(PG_FUNCTION_ARGS)
         * Normal case: parse the name into components and see if it matches any
         * pg_proc entries in the current search path.
         */
-       names = stringToQualifiedNameList(pro_name_or_oid, "regprocin");
+       names = stringToQualifiedNameList(pro_name_or_oid);
        clist = FuncnameGetCandidates(names, -1);
 
        if (clist == NULL)
@@ -271,8 +270,7 @@ regprocedurein(PG_FUNCTION_ARGS)
         * datatype cannot be used for any system column that needs to receive
         * data during bootstrap.
         */
-       parseNameAndArgTypes(pro_name_or_oid, "regprocedurein", false,
-                                                &names, &nargs, argtypes);
+       parseNameAndArgTypes(pro_name_or_oid, false, &names, &nargs, argtypes);
 
        clist = FuncnameGetCandidates(names, nargs);
 
@@ -476,7 +474,7 @@ regoperin(PG_FUNCTION_ARGS)
         * Normal case: parse the name into components and see if it matches any
         * pg_operator entries in the current search path.
         */
-       names = stringToQualifiedNameList(opr_name_or_oid, "regoperin");
+       names = stringToQualifiedNameList(opr_name_or_oid);
        clist = OpernameGetCandidates(names, '\0');
 
        if (clist == NULL)
@@ -626,8 +624,7 @@ regoperatorin(PG_FUNCTION_ARGS)
         * datatype cannot be used for any system column that needs to receive
         * data during bootstrap.
         */
-       parseNameAndArgTypes(opr_name_or_oid, "regoperatorin", true,
-                                                &names, &nargs, argtypes);
+       parseNameAndArgTypes(opr_name_or_oid, true, &names, &nargs, argtypes);
        if (nargs == 1)
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_PARAMETER),
@@ -827,7 +824,7 @@ regclassin(PG_FUNCTION_ARGS)
         * Normal case: parse the name into components and see if it matches any
         * pg_class entries in the current search path.
         */
-       names = stringToQualifiedNameList(class_name_or_oid, "regclassin");
+       names = stringToQualifiedNameList(class_name_or_oid);
 
        result = RangeVarGetRelid(makeRangeVarFromNameList(names), false);
 
@@ -1093,7 +1090,7 @@ text_regclass(PG_FUNCTION_ARGS)
  * Given a C string, parse it into a qualified-name list.
  */
 List *
-stringToQualifiedNameList(const char *string, const char *caller)
+stringToQualifiedNameList(const char *string)
 {
        char       *rawname;
        List       *result = NIL;
@@ -1141,9 +1138,8 @@ stringToQualifiedNameList(const char *string, const char *caller)
  * for unary operators).
  */
 static void
-parseNameAndArgTypes(const char *string, const char *caller,
-                                        bool allowNone,
-                                        List **names, int *nargs, Oid *argtypes)
+parseNameAndArgTypes(const char *string, bool allowNone, List **names,
+                                        int *nargs, Oid *argtypes)
 {
        char       *rawname;
        char       *ptr;
@@ -1174,7 +1170,7 @@ parseNameAndArgTypes(const char *string, const char *caller,
 
        /* Separate the name and parse it into a list */
        *ptr++ = '\0';
-       *names = stringToQualifiedNameList(rawname, caller);
+       *names = stringToQualifiedNameList(rawname);
 
        /* Check for the trailing right parenthesis and remove it */
        ptr2 = ptr + strlen(ptr);

diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index 53eda384c7cc6f815b948d92e069c9ae6be474d6..4ad92cdd6fe8245f1a9d3c4030ffd4ec4e109e23 100644 (file)
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -1045,7 +1045,7 @@ RelationNameGetTupleDesc(const char *relname)
        List       *relname_list;
 
        /* Open relation and copy the tuple description */
-       relname_list = stringToQualifiedNameList(relname, "RelationNameGetTupleDesc");
+       relname_list = stringToQualifiedNameList(relname);
        relvar = makeRangeVarFromNameList(relname_list);
        rel = relation_openrv(relvar, AccessShareLock);
        tupdesc = CreateTupleDescCopy(RelationGetDescr(rel));

diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 7356eab38ed18260b8f827adcfcd99e614992f2e..8fc33040963a3735a1e4384b3cbee97345a36a8a 100644 (file)
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -524,7 +524,7 @@ extern Datum regtypeout(PG_FUNCTION_ARGS);
 extern Datum regtyperecv(PG_FUNCTION_ARGS);
 extern Datum regtypesend(PG_FUNCTION_ARGS);
 extern Datum text_regclass(PG_FUNCTION_ARGS);
-extern List *stringToQualifiedNameList(const char *string, const char *caller);
+extern List *stringToQualifiedNameList(const char *string);
 extern char *format_procedure(Oid procedure_oid);
 extern char *format_operator(Oid operator_oid);
 

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index d70b921cf654f3a04bcbaa75954db0ab606a50e2..f02c5fb11043511a8d01f2e3af4d685d830b12a9 100644 (file)
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -1340,8 +1340,7 @@ plpgsql_parse_tripwordtype(char *word)
        memcpy(cp[1], &word[i + 1], (qualified_att_len - i - 1) * sizeof(char));
        cp[1][qualified_att_len - i - 1] = '\0';
 
-       relvar = makeRangeVarFromNameList(stringToQualifiedNameList(cp[0],
-                                                                                         "plpgsql_parse_tripwordtype"));
+       relvar = makeRangeVarFromNameList(stringToQualifiedNameList(cp[0]));
        classOid = RangeVarGetRelid(relvar, true);
        if (!OidIsValid(classOid))
                goto done;
@@ -1465,7 +1464,7 @@ plpgsql_parse_dblwordrowtype(char *word)
        word[i] = '%';
 
        /* Lookup the relation */
-       relvar = makeRangeVarFromNameList(stringToQualifiedNameList(cp, "plpgsql_parse_dblwordrowtype"));
+       relvar = makeRangeVarFromNameList(stringToQualifiedNameList(cp));
        classOid = RangeVarGetRelid(relvar, true);
        if (!OidIsValid(classOid))
                ereport(ERROR,