Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename openFromFileDescriptor() to open()

This commit is contained in:
Marius Kittler 2018-10-04 17:58:38 +02:00 committed by Martchus
parent 4449198711
commit 07a74d5fa8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
io/nativefilestream.cpp
View File

@ -188,9 +188,8 @@ void NativeFileStream::open(const string &path, ios_base::openmode openMode)
* \todo * \todo
* - Maybe use setstate() instead of throwing exceptions directly for consistent error handling * - Maybe use setstate() instead of throwing exceptions directly for consistent error handling
* with std::fstream::open(). However, that makes passing specific error messages difficult. * with std::fstream::open(). However, that makes passing specific error messages difficult.
* - Rename to open() in v5.
*/ */
void NativeFileStream::openFromFileDescriptor(int fileDescriptor, ios_base::openmode openMode) void NativeFileStream::open(int fileDescriptor, ios_base::openmode openMode)
{ {
setFileBuffer(makeFileBuffer(fileDescriptor, openMode)); setFileBuffer(makeFileBuffer(fileDescriptor, openMode));
} }
@ -261,7 +260,7 @@ std::unique_ptr<std::basic_streambuf<char>> NativeFileStream::makeFileBuffer(con
} }
/*! /*!
* \brief Internally called by openFromFileDescriptor(). * \brief Internally called by open().
*/ */
std::unique_ptr<std::basic_streambuf<char>> NativeFileStream::makeFileBuffer(int fileDescriptor, ios_base::openmode openMode) std::unique_ptr<std::basic_streambuf<char>> NativeFileStream::makeFileBuffer(int fileDescriptor, ios_base::openmode openMode)
{ {

4
io/nativefilestream.h
View File

@ -26,7 +26,7 @@ public:
bool is_open() const; bool is_open() const;
void open(const std::string &path, std::ios_base::openmode openMode); void open(const std::string &path, std::ios_base::openmode openMode);
void openFromFileDescriptor(int fileDescriptor, std::ios_base::openmode openMode); void open(int fileDescriptor, std::ios_base::openmode openMode);
void close(); void close();
static std::unique_ptr<std::basic_streambuf<char>> makeFileBuffer(const std::string &path, ios_base::openmode openMode); static std::unique_ptr<std::basic_streambuf<char>> makeFileBuffer(const std::string &path, ios_base::openmode openMode);
@ -50,7 +50,7 @@ inline NativeFileStream::NativeFileStream(const std::string &path, ios_base::ope
inline NativeFileStream::NativeFileStream(int fileDescriptor, ios_base::openmode openMode) inline NativeFileStream::NativeFileStream(int fileDescriptor, ios_base::openmode openMode)
: NativeFileStream() : NativeFileStream()
{ {
openFromFileDescriptor(fileDescriptor, openMode); open(fileDescriptor, openMode);
} }
#else // CPP_UTILITIES_USE_NATIVE_FILE_BUFFER #else // CPP_UTILITIES_USE_NATIVE_FILE_BUFFER

6
tests/iotests.cpp
View File

@ -516,7 +516,7 @@ void IoTests::testNativeFileStream()
#ifndef PLATFORM_WINDOWS #ifndef PLATFORM_WINDOWS
auto readWriteFileDescriptor = open(txtFilePath.data(), O_RDWR); auto readWriteFileDescriptor = open(txtFilePath.data(), O_RDWR);
CPPUNIT_ASSERT(readWriteFileDescriptor); CPPUNIT_ASSERT(readWriteFileDescriptor);
fileStream.openFromFileDescriptor(readWriteFileDescriptor, ios_base::in | ios_base::out | ios_base::binary); fileStream.open(readWriteFileDescriptor, ios_base::in | ios_base::out | ios_base::binary);
CPPUNIT_ASSERT(fileStream.is_open()); CPPUNIT_ASSERT(fileStream.is_open());
CPPUNIT_ASSERT_EQUAL(static_cast<char>(fileStream.get()), 'f'); CPPUNIT_ASSERT_EQUAL(static_cast<char>(fileStream.get()), 'f');
fileStream.seekg(0, ios_base::end); fileStream.seekg(0, ios_base::end);
@ -526,7 +526,7 @@ void IoTests::testNativeFileStream()
CPPUNIT_ASSERT(!fileStream.is_open()); CPPUNIT_ASSERT(!fileStream.is_open());
#endif #endif
try { try {
fileStream.openFromFileDescriptor(-1, ios_base::in | ios_base::out | ios_base::binary); fileStream.open(-1, ios_base::in | ios_base::out | ios_base::binary);
fileStream.get(); fileStream.get();
CPPUNIT_FAIL("expected exception"); CPPUNIT_FAIL("expected exception");
} catch (...) { } catch (...) {
@ -564,7 +564,7 @@ void IoTests::testNativeFileStream()
const auto appendFileHandle = fopen(txtFilePath.data(), "a"); const auto appendFileHandle = fopen(txtFilePath.data(), "a");
#endif #endif
CPPUNIT_ASSERT(appendFileHandle); CPPUNIT_ASSERT(appendFileHandle);
fileStream2.openFromFileDescriptor(fileno(appendFileHandle), ios_base::out | ios_base::app); fileStream2.open(fileno(appendFileHandle), ios_base::out | ios_base::app);
CPPUNIT_ASSERT(fileStream2.is_open()); CPPUNIT_ASSERT(fileStream2.is_open());
fileStream2 << "foo"; fileStream2 << "foo";
fileStream2.close(); fileStream2.close();