Rename function to first_path_var_separator() to clarify it works with

path variables, not directory paths.

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 9526f2eb2cee96bac5aed371b96d98498b2ebb8d..97a3bd51e5d8dfd9fe30b19be5b0ae2710bf0057 100644 (file)
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -610,7 +610,7 @@ find_in_dynamic_libpath(const char *basename)
                char       *mangled;
                char       *full;
 
-               piece = first_path_separator(p);
+               piece = first_path_var_separator(p);
                if (piece == p)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_NAME),

diff --git a/src/include/port.h b/src/include/port.h
index 2c58b554926ddab8b3a94d51cf50eb779824e3c2..4f0c0c1b08caa5d8ec249be3739c2d56899a2efe 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -36,7 +36,7 @@ extern bool pg_set_block(pgsocket sock);
 
 extern char *first_dir_separator(const char *filename);
 extern char *last_dir_separator(const char *filename);
-extern char *first_path_separator(const char *pathlist);
+extern char *first_path_var_separator(const char *pathlist);
 extern void join_path_components(char *ret_path,
                                         const char *head, const char *tail);
 extern void canonicalize_path(char *path);

diff --git a/src/port/exec.c b/src/port/exec.c
index 240514012897e47ae34b2513c4be4698f19a821d..6027917b5763f8e67b44df4cd6a2b13e68b8ac5c 100644 (file)
--- a/src/port/exec.c
+++ b/src/port/exec.c
@@ -168,7 +168,7 @@ find_my_exec(const char *argv0, char *retpath)
                        else
                                startp = endp + 1;
 
-                       endp = first_path_separator(startp);
+                       endp = first_path_var_separator(startp);
                        if (!endp)
                                endp = startp + strlen(startp); /* point to end */
 

diff --git a/src/port/path.c b/src/port/path.c
index 08397d5b99c67c1605f3245c52431360f0beedd0..ccf801ead6413a5796ab6c8fe346bd495d9f94af 100644 (file)
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -98,13 +98,13 @@ first_dir_separator(const char *filename)
 }
 
 /*
- *     first_path_separator
+ *     first_path_var_separator
  *
  * Find the location of the first path separator (i.e. ':' on
  * Unix, ';' on Windows), return NULL if not found.
  */
 char *
-first_path_separator(const char *pathlist)
+first_path_var_separator(const char *pathlist)
 {
        const char *p;