From 651a5a6decf34dfd4e0a75a3102b1bb55572bc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Tue, 2 Aug 2011 13:37:02 -0400
Subject: [PATCH] * #6548: remove call to non thread-safe strerror()
replace with glibc %m in format strings
---
sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp | 2 +-
sflphone-common/src/config/config.cpp | 4 ++--
sflphone-common/src/history/historymanager.cpp | 2 +-
sflphone-common/src/managerimpl.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
index 710a3c2388..ae97150caa 100644
--- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
@@ -118,7 +118,7 @@ void AudioZrtpSession::initializeZid (void)
_debug ("Initialization from ZID file failed. Trying to remove...");
if (remove (zidCompleteFilename.c_str()) !=0) {
- _debug ("Failed to remove zid file because of: %s", strerror (errno));
+ _debug ("Failed to remove zid file: %m");
throw ZrtpZidException("zid file deletion failed");
}
diff --git a/sflphone-common/src/config/config.cpp b/sflphone-common/src/config/config.cpp
index 5a70ef60c3..eed2b10b7f 100644
--- a/sflphone-common/src/config/config.cpp
+++ b/sflphone-common/src/config/config.cpp
@@ -308,7 +308,7 @@ ConfigTree::saveConfigTree (const std::string& fileName)
file.close();
if (chmod (fileName.c_str(), S_IRUSR | S_IWUSR)) {
- _error ("ConfigTree: Error: Failed to set permission on configuration: %s",strerror (errno));
+ _error ("ConfigTree: Error: Failed to set permission on configuration: %m");
}
return true;
@@ -398,7 +398,7 @@ ConfigTree::populateFromFile (const std::string& fileName)
file.close();
if (chmod (fileName.c_str(), S_IRUSR | S_IWUSR)) {
- _debug ("Failed to set permission on configuration file because: %s",strerror (errno));
+ _debug ("Failed to set permission on configuration file because: %m");
}
return 1;
diff --git a/sflphone-common/src/history/historymanager.cpp b/sflphone-common/src/history/historymanager.cpp
index cb0498ec2e..afb87b5559 100644
--- a/sflphone-common/src/history/historymanager.cpp
+++ b/sflphone-common/src/history/historymanager.cpp
@@ -200,7 +200,7 @@ int HistoryManager::create_history_path (std::string path)
if (mkdir (userdata.data(), 0755) != 0) {
// If directory creation failed
if (errno != EEXIST) {
- _debug ("HistoryManager: Cannot create directory: %s", strerror (errno));
+ _debug ("HistoryManager: Cannot create directory: %m");
return -1;
}
}
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 8b1d98ce70..63d8e48586 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -2534,7 +2534,7 @@ int ManagerImpl::createSettingsPath (void)
if (mkdir (_path.data(), 0700) != 0) {
// If directory creation failed
if (errno != EEXIST) {
- _debug ("Cannot create directory: %s", strerror (errno));
+ _debug ("Cannot create directory: %m");
return -1;
}
}
--
GitLab