diff options
Diffstat (limited to 'src/platforms/posix')
| -rw-r--r-- | src/platforms/posix/posixChildProcess.cpp | 19 | ||||
| -rw-r--r-- | src/platforms/posix/posixFile.cpp | 34 | ||||
| -rw-r--r-- | src/platforms/posix/posixHandler.cpp | 16 | ||||
| -rw-r--r-- | src/platforms/posix/posixSocket.cpp | 12 |
4 files changed, 39 insertions, 42 deletions
diff --git a/src/platforms/posix/posixChildProcess.cpp b/src/platforms/posix/posixChildProcess.cpp index 09119996..c4761624 100644 --- a/src/platforms/posix/posixChildProcess.cpp +++ b/src/platforms/posix/posixChildProcess.cpp @@ -32,8 +32,6 @@ #include "vmime/exception.hpp" -#include "vmime/utility/smartPtr.hpp" - #include <unistd.h> #include <string.h> #include <errno.h> @@ -49,9 +47,9 @@ namespace posix { // posixChildProcessFactory -ref <utility::childProcess> posixChildProcessFactory::create(const utility::file::path& path) const +shared_ptr <utility::childProcess> posixChildProcessFactory::create(const utility::file::path& path) const { - return vmime::create <posixChildProcess>(path); + return make_shared <posixChildProcess>(path); } @@ -215,7 +213,7 @@ private: posixChildProcess::posixChildProcess(const utility::file::path& path) : m_processPath(path), m_started(false), - m_stdIn(NULL), m_stdOut(NULL), m_pid(0), m_argArray(NULL) + m_stdIn(null), m_stdOut(null), m_pid(0), m_argArray(NULL) { m_pipe[0] = 0; m_pipe[1] = 0; @@ -319,7 +317,7 @@ void posixChildProcess::start(const std::vector <string> args, const int flags) if (flags & FLAG_REDIRECT_STDIN) { - m_stdIn = vmime::create <outputStreamPosixPipeAdapter>(m_pipe[1]); + m_stdIn = make_shared <outputStreamPosixPipeAdapter>(m_pipe[1]); } else { @@ -329,7 +327,7 @@ void posixChildProcess::start(const std::vector <string> args, const int flags) if (flags & FLAG_REDIRECT_STDOUT) { - m_stdOut = vmime::create <inputStreamPosixPipeAdapter>(m_pipe[0]); + m_stdOut = make_shared <inputStreamPosixPipeAdapter>(m_pipe[0]); } else { @@ -342,13 +340,13 @@ void posixChildProcess::start(const std::vector <string> args, const int flags) } -ref <utility::outputStream> posixChildProcess::getStdIn() +shared_ptr <utility::outputStream> posixChildProcess::getStdIn() { return (m_stdIn); } -ref <utility::inputStream> posixChildProcess::getStdOut() +shared_ptr <utility::inputStream> posixChildProcess::getStdOut() { return (m_stdOut); } @@ -377,8 +375,7 @@ void posixChildProcess::waitForFinish() { if (WEXITSTATUS(wstat) == 255) { - vmime::utility::auto_ptr <posixFileSystemFactory> pfsf - = new posixFileSystemFactory(); + std::auto_ptr <posixFileSystemFactory> pfsf(new posixFileSystemFactory()); throw exceptions::system_error("Could not execute '" + pfsf->pathToString(m_processPath) + "'"); diff --git a/src/platforms/posix/posixFile.cpp b/src/platforms/posix/posixFile.cpp index 744f01ff..1e4dd070 100644 --- a/src/platforms/posix/posixFile.cpp +++ b/src/platforms/posix/posixFile.cpp @@ -79,9 +79,9 @@ bool posixFileIterator::hasMoreElements() const } -ref <vmime::utility::file> posixFileIterator::nextElement() +shared_ptr <vmime::utility::file> posixFileIterator::nextElement() { - ref <posixFile> file = vmime::create <posixFile> + shared_ptr <posixFile> file = make_shared <posixFile> (m_path / vmime::utility::file::path::component(m_dirEntry->d_name)); getNextElement(); @@ -258,14 +258,14 @@ posixFileWriter::posixFileWriter(const vmime::utility::file::path& path, const v } -ref <vmime::utility::outputStream> posixFileWriter::getOutputStream() +shared_ptr <vmime::utility::outputStream> posixFileWriter::getOutputStream() { int fd = 0; if ((fd = ::open(m_nativePath.c_str(), O_WRONLY, 0660)) == -1) posixFileSystemFactory::reportError(m_path, errno); - return vmime::create <posixFileWriterOutputStream>(m_path, fd); + return make_shared <posixFileWriterOutputStream>(m_path, fd); } @@ -280,14 +280,14 @@ posixFileReader::posixFileReader(const vmime::utility::file::path& path, const v } -ref <vmime::utility::inputStream> posixFileReader::getInputStream() +shared_ptr <vmime::utility::inputStream> posixFileReader::getInputStream() { int fd = 0; if ((fd = ::open(m_nativePath.c_str(), O_RDONLY, 0640)) == -1) posixFileSystemFactory::reportError(m_path, errno); - return vmime::create <posixFileReaderInputStream>(m_path, fd); + return make_shared <posixFileReaderInputStream>(m_path, fd); } @@ -417,12 +417,12 @@ bool posixFile::exists() const } -ref <vmime::utility::file> posixFile::getParent() const +shared_ptr <vmime::utility::file> posixFile::getParent() const { if (m_path.isEmpty()) - return NULL; + return null; else - return vmime::create <posixFile>(m_path.getParent()); + return make_shared <posixFile>(m_path.getParent()); } @@ -465,24 +465,24 @@ void posixFile::remove() } -ref <vmime::utility::fileWriter> posixFile::getFileWriter() +shared_ptr <vmime::utility::fileWriter> posixFile::getFileWriter() { - return vmime::create <posixFileWriter>(m_path, m_nativePath); + return make_shared <posixFileWriter>(m_path, m_nativePath); } -ref <vmime::utility::fileReader> posixFile::getFileReader() +shared_ptr <vmime::utility::fileReader> posixFile::getFileReader() { - return vmime::create <posixFileReader>(m_path, m_nativePath); + return make_shared <posixFileReader>(m_path, m_nativePath); } -ref <vmime::utility::fileIterator> posixFile::getFiles() const +shared_ptr <vmime::utility::fileIterator> posixFile::getFiles() const { if (!isDirectory()) throw vmime::exceptions::not_a_directory(m_path); - return vmime::create <posixFileIterator>(m_path, m_nativePath); + return make_shared <posixFileIterator>(m_path, m_nativePath); } @@ -508,9 +508,9 @@ void posixFile::createDirectoryImpl(const vmime::utility::file::path& fullPath, // posixFileSystemFactory // -ref <vmime::utility::file> posixFileSystemFactory::create(const vmime::utility::file::path& path) const +shared_ptr <vmime::utility::file> posixFileSystemFactory::create(const vmime::utility::file::path& path) const { - return vmime::create <posixFile>(path); + return make_shared <posixFile>(path); } diff --git a/src/platforms/posix/posixHandler.cpp b/src/platforms/posix/posixHandler.cpp index 73005d7e..b5d08ce6 100644 --- a/src/platforms/posix/posixHandler.cpp +++ b/src/platforms/posix/posixHandler.cpp @@ -109,11 +109,11 @@ namespace posix { posixHandler::posixHandler() { #if VMIME_HAVE_MESSAGING_FEATURES - m_socketFactory = vmime::create <posixSocketFactory>(); + m_socketFactory = make_shared <posixSocketFactory>(); #endif #if VMIME_HAVE_FILESYSTEM_FEATURES - m_fileSysFactory = vmime::create <posixFileSystemFactory>(); - m_childProcFactory = vmime::create <posixChildProcessFactory>(); + m_fileSysFactory = make_shared <posixFileSystemFactory>(); + m_childProcFactory = make_shared <posixChildProcessFactory>(); #endif } @@ -249,7 +249,7 @@ unsigned int posixHandler::getThreadId() const #if VMIME_HAVE_MESSAGING_FEATURES -ref <vmime::net::socketFactory> posixHandler::getSocketFactory() +shared_ptr <vmime::net::socketFactory> posixHandler::getSocketFactory() { return m_socketFactory; } @@ -259,13 +259,13 @@ ref <vmime::net::socketFactory> posixHandler::getSocketFactory() #if VMIME_HAVE_FILESYSTEM_FEATURES -ref <vmime::utility::fileSystemFactory> posixHandler::getFileSystemFactory() +shared_ptr <vmime::utility::fileSystemFactory> posixHandler::getFileSystemFactory() { return m_fileSysFactory; } -ref <vmime::utility::childProcessFactory> posixHandler::getChildProcessFactory() +shared_ptr <vmime::utility::childProcessFactory> posixHandler::getChildProcessFactory() { return m_childProcFactory; } @@ -308,9 +308,9 @@ void posixHandler::generateRandomBytes(unsigned char* buffer, const unsigned int } -ref <utility::sync::criticalSection> posixHandler::createCriticalSection() +shared_ptr <utility::sync::criticalSection> posixHandler::createCriticalSection() { - return vmime::create <posixCriticalSection>(); + return make_shared <posixCriticalSection>(); } diff --git a/src/platforms/posix/posixSocket.cpp b/src/platforms/posix/posixSocket.cpp index bee9f89e..e0bcf03a 100644 --- a/src/platforms/posix/posixSocket.cpp +++ b/src/platforms/posix/posixSocket.cpp @@ -59,7 +59,7 @@ namespace posix { // posixSocket // -posixSocket::posixSocket(ref <vmime::net::timeoutHandler> th) +posixSocket::posixSocket(shared_ptr <vmime::net::timeoutHandler> th) : m_timeoutHandler(th), m_desc(-1), m_status(0) { } @@ -631,16 +631,16 @@ unsigned int posixSocket::getStatus() const // posixSocketFactory // -ref <vmime::net::socket> posixSocketFactory::create() +shared_ptr <vmime::net::socket> posixSocketFactory::create() { - ref <vmime::net::timeoutHandler> th = NULL; - return vmime::create <posixSocket>(th); + shared_ptr <vmime::net::timeoutHandler> th; + return make_shared <posixSocket>(th); } -ref <vmime::net::socket> posixSocketFactory::create(ref <vmime::net::timeoutHandler> th) +shared_ptr <vmime::net::socket> posixSocketFactory::create(shared_ptr <vmime::net::timeoutHandler> th) { - return vmime::create <posixSocket>(th); + return make_shared <posixSocket>(th); } |