Switch to Err_Errno2String for thread safety

Start cleaning up strerror usage.

diff --git a/open-vm-tools/lib/file/fileIO.c b/open-vm-tools/lib/file/fileIO.c
index 9ed11a077cf23d1cbaacb55817dcb3e90f90c9eb..710fb7c8830fcc78d8223d03091546571ecbb48a 100644 (file)
--- a/open-vm-tools/lib/file/fileIO.c
+++ b/open-vm-tools/lib/file/fileIO.c
@@ -342,7 +342,7 @@ FileIO_Lock(FileIODescriptor *file,  // IN/OUT:
          /* Describe the lock not acquired situation in detail */
          Warning(LGPFX" %s on '%s' failed: %s\n",
                  __FUNCTION__, file->fileName,
-                 (err == 0) ? "Lock timed out" : strerror(err));
+                 (err == 0) ? "Lock timed out" : Err_Errno2String(err));
 
          /* Return a serious failure status if the locking code did */
          switch (err) {
@@ -400,7 +400,7 @@ FileIO_Unlock(FileIODescriptor *file)  // IN/OUT:
 
       if (!FileLock_Unlock(file->lockToken, &err, NULL)) {
          Warning(LGPFX" %s on '%s' failed: %s\n",
-                 __FUNCTION__, file->fileName, strerror(err));
+                 __FUNCTION__, file->fileName, Err_Errno2String(err));
 
          ret = FILEIO_ERROR;
       }

diff --git a/open-vm-tools/lib/file/fileLockPrimitive.c b/open-vm-tools/lib/file/fileLockPrimitive.c
index a7f73ae8d61a3741a0961eb57ea60d4faab07e19..73045a3d5d982b51bb4d161dfc5ed9d713244829 100644 (file)
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -194,7 +194,7 @@ FileLockRemoveLockingFile(const char *lockDir,   // IN:
          err = 0;
       } else {
          Warning(LGPFX" %s of '%s' failed: %s\n", __FUNCTION__,
-                 path, strerror(err));
+                 path, Err_Errno2String(err));
       }
    }
 
@@ -343,7 +343,7 @@ FileLockMemberValues(const char *lockDir,       // IN:
 
       if (err != ENOENT) {
          Warning(LGPFX" %s open failure on '%s': %s\n", __FUNCTION__,
-                 path, strerror(err));
+                 path, Err_Errno2String(err));
       }
 
       goto bail;
@@ -362,7 +362,7 @@ FileLockMemberValues(const char *lockDir,       // IN:
 
       if (err != ENOENT) {
          Warning(LGPFX" %s file size failure on '%s': %s\n", __FUNCTION__,
-                 path, strerror(err));
+                 path, Err_Errno2String(err));
       }
 
       FileIO_Close(&desc);
@@ -389,7 +389,7 @@ FileLockMemberValues(const char *lockDir,       // IN:
       err = FileMapErrorToErrno(__FUNCTION__, Err_Errno());
 
       Warning(LGPFX" %s read failure on '%s': %s\n",
-              __FUNCTION__, path, strerror(err));
+              __FUNCTION__, path, Err_Errno2String(err));
 
       goto bail;
    }
@@ -1018,7 +1018,7 @@ FileUnlockIntrinsic(FileLockToken *tokenPtr)  // IN:
 
          if (err && vmx86_debug) {
             Log(LGPFX" %s failed for '%s': %s\n", __FUNCTION__,
-                tokenPtr->u.portable.lockFilePath, strerror(err));
+                tokenPtr->u.portable.lockFilePath, Err_Errno2String(err));
          }
          free(lockDir);
          free(tokenPtr->u.portable.lockFilePath);
@@ -1047,7 +1047,7 @@ FileUnlockIntrinsic(FileLockToken *tokenPtr)  // IN:
             err = Err_Errno();
             if (vmx86_debug) {
                Log(LGPFX" %s failed for advisory lock '%s': %s\n", __FUNCTION__,
-                   tokenPtr->pathName, strerror(err));
+                   tokenPtr->pathName, Err_Errno2String(err));
             }
          }
       }
@@ -1315,13 +1315,13 @@ FileLockCreateEntryDirectory(const char *lockDir,    // IN:
 
             if ((err != 0) && (err != EEXIST)) {
                Warning(LGPFX" %s creation failure on '%s': %s\n",
-                       __FUNCTION__, lockDir, strerror(err));
+                       __FUNCTION__, lockDir, Err_Errno2String(err));
 
                break;
             }
          } else {
             Warning(LGPFX" %s stat failure on '%s': %s\n",
-                    __FUNCTION__, lockDir, strerror(err));
+                    __FUNCTION__, lockDir, Err_Errno2String(err));
 
             break;
          }
@@ -1365,7 +1365,7 @@ FileLockCreateEntryDirectory(const char *lockDir,    // IN:
 
             if (vmx86_debug) {
                Log(LGPFX" %s stat failure on '%s': %s\n",
-                   __FUNCTION__, *memberFilePath, strerror(err));
+                   __FUNCTION__, *memberFilePath, Err_Errno2String(err));
              }
          }
 
@@ -1374,7 +1374,7 @@ FileLockCreateEntryDirectory(const char *lockDir,    // IN:
           if ((err != EEXIST) &&  // Another process/thread created it...
               (err != ENOENT)) {  // lockDir is gone...
              Warning(LGPFX" %s creation failure on '%s': %s\n",
-                     __FUNCTION__, *entryDirectory, strerror(err));
+                     __FUNCTION__, *entryDirectory, Err_Errno2String(err));
 
              break;
           }
@@ -1480,7 +1480,7 @@ FileLockCreateMemberFile(FileIODescriptor *desc,       // IN:
       err = FileMapErrorToErrno(__FUNCTION__, Err_Errno());
 
       Warning(LGPFX" %s write of '%s' failed: %s\n", __FUNCTION__,
-              entryFilePath, strerror(err));
+              entryFilePath, Err_Errno2String(err));
 
       FileIO_Close(desc);
 
@@ -1491,7 +1491,7 @@ FileLockCreateMemberFile(FileIODescriptor *desc,       // IN:
       err = FileMapErrorToErrno(__FUNCTION__, Err_Errno());
 
       Warning(LGPFX" %s close of '%s' failed: %s\n", __FUNCTION__,
-              entryFilePath, strerror(err));
+              entryFilePath, Err_Errno2String(err));
 
       return err;
    }
@@ -1508,16 +1508,16 @@ FileLockCreateMemberFile(FileIODescriptor *desc,       // IN:
    if (err != 0) {
       Warning(LGPFX" %s FileRename of '%s' to '%s' failed: %s\n",
               __FUNCTION__, entryFilePath, memberFilePath,
-              strerror(err));
+              Err_Errno2String(err));
 
       if (vmx86_debug) {
          Log(LGPFX" %s FileLockFileType() of '%s': %s\n",
              __FUNCTION__, entryFilePath,
-            strerror(FileAttributesRobust(entryFilePath, NULL)));
+            Err_Errno2String(FileAttributesRobust(entryFilePath, NULL)));
 
          Log(LGPFX" %s FileLockFileType() of '%s': %s\n",
              __FUNCTION__, memberFilePath,
-            strerror(FileAttributesRobust(memberFilePath, NULL)));
+            Err_Errno2String(FileAttributesRobust(memberFilePath, NULL)));
       }
 
       return err;

diff --git a/open-vm-tools/lib/file/fileTemp.c b/open-vm-tools/lib/file/fileTemp.c
index 1366752fb07d0e12770adc2f2f6581208e97edbb..6186eb9fe2c686cec3fc9e25f9c91f18af158b02 100644 (file)
--- a/open-vm-tools/lib/file/fileTemp.c
+++ b/open-vm-tools/lib/file/fileTemp.c
@@ -177,7 +177,7 @@ File_MakeTempEx2(const char *dir,                              // IN:
       if (errno != EEXIST) {
          Log(LGPFX" Failed to create temporary %s \"%s\": %s.\n",
              createTempFile ? "file" : "directory",
-             path, strerror(errno));
+             path, Err_Errno2String(errno));
          goto exit;
       }
    }