summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/include/IceUtil/FileUtil.h6
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp2
-rw-r--r--cpp/src/Ice/LoggerI.cpp4
-rw-r--r--cpp/src/Ice/PropertiesI.cpp2
-rw-r--r--cpp/src/IceGrid/FileCache.cpp4
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.cpp2
-rw-r--r--cpp/src/IceGrid/ServerI.cpp8
-rwxr-xr-xcpp/src/IceSSL/Util.cpp4
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp4
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp4
-rw-r--r--cpp/src/IceXML/Parser.cpp2
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp4
-rw-r--r--php/src/php7/Communicator.cpp2
13 files changed, 24 insertions, 24 deletions
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index aa70fd28b32..d943aa3f9df 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -136,11 +136,11 @@ typedef IceUtil::Handle<FileLock> FileLockPtr;
// like ifstream and ofstream.
//
#if defined(_WIN32) && !defined(__MINGW32__)
-ICE_API const wchar_t* streamFilename(const std::string&);
+ICE_API std::wstring streamFilename(const std::string&);
#else
-inline const char* streamFilename(const std::string& filename)
+inline std::string streamFilename(const std::string& filename)
{
- return filename.c_str();
+ return filename;
}
#endif
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
index df705e99022..e52fc4e029a 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -98,7 +98,7 @@ private:
map<string, string>
retrievePasswordMap(const string& file)
{
- ifstream passwordFile(IceUtilInternal::streamFilename(file));
+ ifstream passwordFile(IceUtilInternal::streamFilename(file).c_str());
if(!passwordFile)
{
string err = IceUtilInternal::lastErrorToString();
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index 09e58b762d7..2a7a1586f24 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -70,7 +70,7 @@ Ice::LoggerI::LoggerI(const string& prefix, const string& file,
if(!file.empty())
{
_file = file;
- _out.open(IceUtilInternal::streamFilename(file), fstream::out | fstream::app);
+ _out.open(IceUtilInternal::streamFilename(file).c_str(), fstream::out | fstream::app);
if(!_out.is_open())
{
throw InitializationException(__FILE__, __LINE__, "FileLogger: cannot open " + _file);
@@ -199,7 +199,7 @@ Ice::LoggerI::write(const string& message, bool indent)
int err = IceUtilInternal::rename(_file, archive);
- _out.open(IceUtilInternal::streamFilename(_file), fstream::out | fstream::app);
+ _out.open(IceUtilInternal::streamFilename(_file).c_str(), fstream::out | fstream::app);
if(err)
{
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 6570d16e9da..51a5ae151e7 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -399,7 +399,7 @@ Ice::PropertiesI::load(const std::string& file)
else
#endif
{
- ifstream in(IceUtilInternal::streamFilename(file));
+ ifstream in(IceUtilInternal::streamFilename(file).c_str());
if(!in)
{
FileException ex(__FILE__, __LINE__);
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 79848729aa0..ca98ef55c0a 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -29,7 +29,7 @@ FileCache::FileCache(const Ice::CommunicatorPtr& com) :
Ice::Long
FileCache::getOffsetFromEnd(const string& file, int originalCount)
{
- ifstream is(IceUtilInternal::streamFilename(file)); // file is a UTF-8 string
+ ifstream is(IceUtilInternal::streamFilename(file).c_str()); // file is a UTF-8 string
if(is.fail())
{
throw FileNotAvailableException("failed to open file `" + file + "'");
@@ -141,7 +141,7 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf
throw FileNotAvailableException("maximum bytes per read request is too low");
}
- ifstream is(IceUtilInternal::streamFilename(file)); // file is a UTF-8 string
+ ifstream is(IceUtilInternal::streamFilename(file).c_str()); // file is a UTF-8 string
if(is.fail())
{
throw FileNotAvailableException("failed to open file `" + file + "'");
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.cpp b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
index 545dbaeb6af..a52037562ba 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.cpp
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
@@ -17,7 +17,7 @@ using namespace IceGrid;
FileUserAccountMapperI::FileUserAccountMapperI(const string& filename)
{
- ifstream file(IceUtilInternal::streamFilename(filename)); // filename is a UTF-8 string
+ ifstream file(IceUtilInternal::streamFilename(filename).c_str()); // filename is a UTF-8 string
if(!file)
{
throw "cannot open `" + filename + "' for reading: " + strerror(errno);
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index ef33e07a8be..d8ba54d1095 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2312,7 +2312,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
knownFiles.push_back(p->first);
const string configFilePath = _serverDir + "/config/" + p->first;
- ofstream configfile(IceUtilInternal::streamFilename(configFilePath)); // configFilePath is a UTF-8 string
+ ofstream configfile(IceUtilInternal::streamFilename(configFilePath).c_str()); // configFilePath is a UTF-8 string
if(!configfile.good())
{
throw "couldn't create configuration file: " + configFilePath;
@@ -2414,7 +2414,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
{
string file = dbEnvHome + "/DB_CONFIG";
- ofstream configfile(IceUtilInternal::streamFilename(file)); // file is a UTF-8 string
+ ofstream configfile(IceUtilInternal::streamFilename(file).c_str()); // file is a UTF-8 string
if(!configfile.good())
{
throw "couldn't create configuration file `" + file + "'";
@@ -2486,7 +2486,7 @@ ServerI::checkRevision(const string& replicaName, const string& uuid, int revisi
else
{
string idFilePath = _serverDir + "/revision";
- ifstream is(IceUtilInternal::streamFilename(idFilePath)); // idFilePath is a UTF-8 string
+ ifstream is(IceUtilInternal::streamFilename(idFilePath).c_str()); // idFilePath is a UTF-8 string
if(!is.good())
{
return;
@@ -2675,7 +2675,7 @@ ServerI::updateRevision(const string& uuid, int revision)
}
string idFilePath = _serverDir + "/revision";
- ofstream os(IceUtilInternal::streamFilename(idFilePath)); // idFilePath is a UTF-8 string
+ ofstream os(IceUtilInternal::streamFilename(idFilePath).c_str()); // idFilePath is a UTF-8 string
if(os.good())
{
os << "#" << endl;
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index 2bd931be770..6cb87ec31ec 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -612,7 +612,7 @@ namespace
CFDataRef
readCertFile(const string& file)
{
- ifstream is(IceUtilInternal::streamFilename(file), ios::in | ios::binary);
+ ifstream is(IceUtilInternal::streamFilename(file).c_str(), ios::in | ios::binary);
if(!is.good())
{
throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
@@ -1655,7 +1655,7 @@ IceSSL::findCertificates(const string& location, const string& name, const strin
void
IceSSL::readFile(const string& file, vector<char>& buffer)
{
- ifstream is(IceUtilInternal::streamFilename(file), ios::in | ios::binary);
+ ifstream is(IceUtilInternal::streamFilename(file).c_str(), ios::in | ios::binary);
if(!is.good())
{
throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index dc8357893ce..b3a927c719e 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -159,7 +159,7 @@ Client::run(int argc, char* argv[])
return EXIT_FAILURE;
}
- ifstream fs(IceUtilInternal::streamFilename(dbFile), ios::binary);
+ ifstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
if(fs.fail())
{
cerr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
@@ -302,7 +302,7 @@ Client::run(int argc, char* argv[])
stream.write(ICE_INT_VERSION);
stream.write(data);
- ofstream fs(IceUtilInternal::streamFilename(dbFile), ios::binary);
+ ofstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
if(fs.fail())
{
cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index 13cedac2d2a..0bb94620137 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -345,10 +345,10 @@ IceUtilInternal::FileLock::~FileLock()
}
#ifndef __MINGW32__
-const wchar_t*
+wstring
IceUtilInternal::streamFilename(const string& filename)
{
- return IceUtil::stringToWstring(filename, IceUtil::getProcessStringConverter()).c_str();
+ return IceUtil::stringToWstring(filename, IceUtil::getProcessStringConverter());
}
#endif
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 4f753ef933e..c10b6061557 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -402,7 +402,7 @@ IceXML::Parser::parse(istream& in)
void
IceXML::Parser::parse(const string& file, Handler& handler) // The given filename must be UTF-8 encoded
{
- ifstream in(IceUtilInternal::streamFilename(file));
+ ifstream in(IceUtilInternal::streamFilename(file).c_str());
if(!in.good())
{
ostringstream out;
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index 71e9e7b6028..8426d773d63 100644
--- a/cpp/src/icegriddb/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -267,7 +267,7 @@ Client::run(int argc, char* argv[])
return EXIT_FAILURE;
}
- ifstream fs(IceUtilInternal::streamFilename(dbFile), ios::binary);
+ ifstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
if(fs.fail())
{
cerr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
@@ -539,7 +539,7 @@ Client::run(int argc, char* argv[])
stream.write(ICE_INT_VERSION);
stream.write(data);
- ofstream fs(IceUtilInternal::streamFilename(dbFile), ios::binary);
+ ofstream fs(IceUtilInternal::streamFilename(dbFile).c_str(), ios::binary);
if(fs.fail())
{
cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
diff --git a/php/src/php7/Communicator.cpp b/php/src/php7/Communicator.cpp
index e6c34e4b5ac..b7943d07907 100644
--- a/php/src/php7/Communicator.cpp
+++ b/php/src/php7/Communicator.cpp
@@ -1532,7 +1532,7 @@ parseProfiles(const string& file)
// ice.config = config-file
// ice.options = args
//
- ifstream in(IceUtilInternal::streamFilename(file));
+ ifstream in(IceUtilInternal::streamFilename(file).c_str());
if(!in)
{
php_error_docref(0, E_WARNING, "unable to open Ice profiles in %s", file.c_str());
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 09:39:50 +0000