diff options
Diffstat (limited to 'src/net/maildir/format')
| -rw-r--r-- | src/net/maildir/format/courierMaildirFormat.cpp | 2 | ||||
| -rw-r--r-- | src/net/maildir/format/kmailMaildirFormat.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/net/maildir/format/courierMaildirFormat.cpp b/src/net/maildir/format/courierMaildirFormat.cpp index a948de3e..6d460d5e 100644 --- a/src/net/maildir/format/courierMaildirFormat.cpp +++ b/src/net/maildir/format/courierMaildirFormat.cpp @@ -242,7 +242,7 @@ const std::vector <folder::path> courierMaildirFormat::listFolders const string dir = dirs[i].substr(1) + "."; folder::path path; - for (string::size_type pos = dir.find("."), prev = 0 ; + for (size_t pos = dir.find("."), prev = 0 ; pos != string::npos ; prev = pos + 1, pos = dir.find(".", pos + 1)) { const string comp = dir.substr(prev, pos - prev); diff --git a/src/net/maildir/format/kmailMaildirFormat.cpp b/src/net/maildir/format/kmailMaildirFormat.cpp index 70c9b909..975752a5 100644 --- a/src/net/maildir/format/kmailMaildirFormat.cpp +++ b/src/net/maildir/format/kmailMaildirFormat.cpp @@ -118,11 +118,12 @@ const utility::file::path kmailMaildirFormat::folderPathToFileSystemPath // Root path utility::file::path fsPath = getContext()->getStore()->getFileSystemPath(); - const int count = (type == CONTAINER_DIRECTORY - ? path.getSize() : path.getSize() - 1); + const size_t pathSize = path.getSize(); + const size_t count = (type == CONTAINER_DIRECTORY + ? pathSize : (pathSize >= 1 ? pathSize - 1 : 0)); // Parent folders - for (int i = 0 ; i < count ; ++i) + for (size_t i = 0 ; i < count ; ++i) { utility::file::path::component comp(path[i]); |