diff options
| author | jhurst <jhurst@cinecert.com> | 2021-05-11 14:58:22 -0700 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2021-05-11 14:58:22 -0700 |
| commit | e5b0a7dbeaaa2b16ea63d7265ed7413f8de2df10 (patch) | |
| tree | 96cfac1cf70ae0c06bf7e6becc8d0ca9d0214f25 /src/KM_fileio.cpp | |
| parent | b14d706a72c706c9c59dbdf64a9e41f32465e060 (diff) | |
| parent | 3ca74908e673c88ca0ef4350fb74df184aab3332 (diff) | |
merge origin/master
Diffstat (limited to 'src/KM_fileio.cpp')
| -rw-r--r-- | src/KM_fileio.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp index 4ee73c2..b24c7db 100644 --- a/src/KM_fileio.cpp +++ b/src/KM_fileio.cpp @@ -1294,7 +1294,7 @@ Kumu::WriteStringIntoFile(const std::string& filename, const std::string& inStri // Kumu::Result_t -Kumu::ReadFileIntoObject(const std::string& Filename, Kumu::IArchive& Object, ui32_t max_size) +Kumu::ReadFileIntoObject(const std::string& Filename, Kumu::IArchive& Object, ui32_t) { ByteString Buffer; ui32_t file_size = static_cast<ui32_t>(FileSize(Filename)); @@ -1355,7 +1355,7 @@ Kumu::WriteObjectIntoFile(const Kumu::IArchive& Object, const std::string& Filen // Result_t -Kumu::ReadFileIntoBuffer(const std::string& Filename, Kumu::ByteString& Buffer, ui32_t max_size) +Kumu::ReadFileIntoBuffer(const std::string& Filename, Kumu::ByteString& Buffer, ui32_t) { ui32_t file_size = FileSize(Filename); Result_t result = Buffer.Capacity(file_size); @@ -1420,17 +1420,22 @@ Kumu::DirScanner::Open(const std::string& dirname) case ENOENT: case ENOTDIR: result = RESULT_NOTAFILE; + break; case EACCES: result = RESULT_NO_PERM; + break; case ELOOP: case ENAMETOOLONG: result = RESULT_PARAM; + break; case EMFILE: case ENFILE: result = RESULT_STATE; + break; default: DefaultLogSink().Error("DirScanner::Open(%s): %s\n", dirname.c_str(), strerror(errno)); result = RESULT_FAIL; + break; } } @@ -1503,17 +1508,22 @@ Kumu::DirScannerEx::Open(const std::string& dirname) case ENOENT: case ENOTDIR: result = RESULT_NOTAFILE; + break; case EACCES: result = RESULT_NO_PERM; + break; case ELOOP: case ENAMETOOLONG: result = RESULT_PARAM; + break; case EMFILE: case ENFILE: result = RESULT_STATE; + break; default: DefaultLogSink().Error("DirScanner::Open(%s): %s\n", dirname.c_str(), strerror(errno)); result = RESULT_FAIL; + break; } } |