Rename some parameters

The generic parameter names for Posix_Symlink/Posix_Link are
rather confusing.  Rename them.

diff --git a/open-vm-tools/lib/include/posix.h b/open-vm-tools/lib/include/posix.h
index 14fb2eecea2c384705bd30d4cfe7fa0266bfb4b9..664f858365756cfa9ba3d06fbcbc0fe02bd95a93 100644 (file)
--- a/open-vm-tools/lib/include/posix.h
+++ b/open-vm-tools/lib/include/posix.h
@@ -154,8 +154,8 @@ int Posix_Utime(const char *pathName, const struct utimbuf *times);
 int Posix_Mknod(const char *pathName, mode_t mode, dev_t dev);
 int Posix_Chown(const char *pathName, uid_t owner, gid_t group);
 int Posix_Lchown(const char *pathName, uid_t owner, gid_t group);
-int Posix_Link(const char *pathName1, const char *pathName2);
-int Posix_Symlink(const char *pathName1, const char *pathName2);
+int Posix_Link(const char *oldPath, const char *newPath);
+int Posix_Symlink(const char *oldPath, const char *newPath);
 int Posix_Mkfifo(const char *pathName, mode_t mode);
 int Posix_Truncate(const char *pathName, off_t length);
 int Posix_Utimes(const char *pathName, const struct timeval *time);

diff --git a/open-vm-tools/lib/misc/posixPosix.c b/open-vm-tools/lib/misc/posixPosix.c
index bf9ac65b9b285bf002b1bad29da396ec352a892e..562ffa4ee594bca0270f1ff2e0332ea30dcd82db 100644 (file)
--- a/open-vm-tools/lib/misc/posixPosix.c
+++ b/open-vm-tools/lib/misc/posixPosix.c
@@ -784,26 +784,25 @@ Posix_Lchown(const char *pathName,  // IN:
  */
 
 int
-Posix_Link(const char *pathName1,  // IN:
-           const char *pathName2)  // IN:
+Posix_Link(const char *uOldPath,  // IN:
+           const char *uNewPath)  // IN:
 {
-   char *path1;
-   char *path2;
+   char *oldPath;
+   char *newPath;
    int ret;
 
-   if (!PosixConvertToCurrent(pathName1, &path1)) {
+   if (!PosixConvertToCurrent(uOldPath, &oldPath)) {
       return -1;
    }
-   if (!PosixConvertToCurrent(pathName2, &path2)) {
-      Posix_Free(path1);
-
+   if (!PosixConvertToCurrent(uNewPath, &newPath)) {
+      Posix_Free(oldPath);
       return -1;
    }
 
-   ret = link(path1, path2);
+   ret = link(oldPath, newPath);
 
-   Posix_Free(path1);
-   Posix_Free(path2);
+   Posix_Free(oldPath);
+   Posix_Free(newPath);
 
    return ret;
 }
@@ -827,26 +826,25 @@ Posix_Link(const char *pathName1,  // IN:
  */
 
 int
-Posix_Symlink(const char *pathName1,  // IN:
-              const char *pathName2)  // IN:
+Posix_Symlink(const char *uOldPath,  // IN:
+              const char *uNewPath)  // IN:
 {
-   char *path1;
-   char *path2;
+   char *oldPath;
+   char *newPath;
    int ret;
 
-   if (!PosixConvertToCurrent(pathName1, &path1)) {
+   if (!PosixConvertToCurrent(uOldPath, &oldPath)) {
       return -1;
    }
-   if (!PosixConvertToCurrent(pathName2, &path2)) {
-      Posix_Free(path1);
-
+   if (!PosixConvertToCurrent(uNewPath, &newPath)) {
+      Posix_Free(oldPath);
       return -1;
    }
 
-   ret = symlink(path1, path2);
+   ret = symlink(oldPath, newPath);
 
-   Posix_Free(path1);
-   Posix_Free(path2);
+   Posix_Free(oldPath);
+   Posix_Free(newPath);
 
    return ret;
 }