diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-07-13 21:27:14 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-07-13 21:27:14 +0000 |
| commit | 815d45a2129244b0061bc8d59793c49f26df9f22 (patch) | |
| tree | 522ec0afc081180fb45c5d6f1860d7b1c77921d1 /cpp/src/qpid/broker/Broker.cpp | |
| parent | 5254145321df2be18fce790365d203b7342f48f5 (diff) | |
| download | qpid-python-815d45a2129244b0061bc8d59793c49f26df9f22.tar.gz | |
Replace getenv usage with more secure Windows calls - silences compile diagnostics. This involved adding a new method Broker::Options::getHome() implemented separately for Windows and posix BrokerDefaults.cpp
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793716 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Broker.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 749489fbfd..4fcb8b6451 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -57,7 +57,6 @@ #include <iostream> #include <memory> -#include <stdlib.h> using qpid::sys::ProtocolFactory; using qpid::sys::Poller; @@ -96,9 +95,9 @@ Broker::Options::Options(const std::string& name) : { int c = sys::SystemInfo::concurrency(); workerThreads=c+1; - char *home = ::getenv("HOME"); + std::string home = getHome(); - if (home == 0) + if (home.length() == 0) dataDir += DEFAULT_DATA_DIR_LOCATION; else dataDir += home; |