aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/maildir
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/maildir')
-rw-r--r--src/net/maildir/format/courierMaildirFormat.cpp2
-rw-r--r--src/net/maildir/format/kmailMaildirFormat.cpp7
-rw-r--r--src/net/maildir/maildirFolder.cpp14
-rw-r--r--src/net/maildir/maildirMessage.cpp53
-rw-r--r--src/net/maildir/maildirMessagePart.cpp10
-rw-r--r--src/net/maildir/maildirStore.cpp2
-rw-r--r--src/net/maildir/maildirUtils.cpp8
7 files changed, 48 insertions, 48 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]);
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index f476d98a..660178ff 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -719,7 +719,7 @@ void maildirFolder::addMessage(shared_ptr <vmime::message> msg, const int flags,
}
-void maildirFolder::addMessage(utility::inputStream& is, const int size,
+void maildirFolder::addMessage(utility::inputStream& is, const size_t size,
const int flags, vmime::datetime* /* date */, utility::progressListener* progress)
{
shared_ptr <maildirStore> store = m_store.lock();
@@ -816,7 +816,7 @@ void maildirFolder::addMessage(utility::inputStream& is, const int size,
void maildirFolder::copyMessageImpl(const utility::file::path& tmpDirPath,
const utility::file::path& dstDirPath,
const utility::file::path::component& filename,
- utility::inputStream& is, const utility::stream::size_type size,
+ utility::inputStream& is, const size_t size,
utility::progressListener* progress)
{
shared_ptr <utility::fileSystemFactory> fsf = platform::getHandler()->getFileSystemFactory();
@@ -834,12 +834,12 @@ void maildirFolder::copyMessageImpl(const utility::file::path& tmpDirPath,
shared_ptr <utility::fileWriter> fw = file->getFileWriter();
shared_ptr <utility::outputStream> os = fw->getOutputStream();
- utility::stream::value_type buffer[65536];
- utility::stream::size_type total = 0;
+ byte_t buffer[65536];
+ size_t total = 0;
while (!is.eof())
{
- const utility::stream::size_type read = is.read(buffer, sizeof(buffer));
+ const size_t read = is.read(buffer, sizeof(buffer));
if (read != 0)
{
@@ -1185,8 +1185,8 @@ void maildirFolder::fetchMessages(std::vector <shared_ptr <message> >& msg,
else if (!isOpen())
throw exceptions::illegal_state("Folder not open");
- const int total = msg.size();
- int current = 0;
+ const size_t total = msg.size();
+ size_t current = 0;
if (progress)
progress->start(total);
diff --git a/src/net/maildir/maildirMessage.cpp b/src/net/maildir/maildirMessage.cpp
index 88d743b2..a14f067e 100644
--- a/src/net/maildir/maildirMessage.cpp
+++ b/src/net/maildir/maildirMessage.cpp
@@ -40,6 +40,7 @@
#include "vmime/platform.hpp"
#include "vmime/utility/outputStreamAdapter.hpp"
+#include "vmime/utility/stringUtils.hpp"
namespace vmime {
@@ -82,9 +83,9 @@ const message::uid maildirMessage::getUID() const
}
-int maildirMessage::getSize() const
+size_t maildirMessage::getSize() const
{
- if (m_size == -1)
+ if (m_size == static_cast <size_t>(-1))
throw exceptions::unfetched_object();
return (m_size);
@@ -145,16 +146,16 @@ void maildirMessage::setFlags(const int flags, const int mode)
void maildirMessage::extract(utility::outputStream& os,
- utility::progressListener* progress, const int start,
- const int length, const bool peek) const
+ utility::progressListener* progress, const size_t start,
+ const size_t length, const bool peek) const
{
extractImpl(os, progress, 0, m_size, start, length, peek);
}
void maildirMessage::extractPart(shared_ptr <const messagePart> p, utility::outputStream& os,
- utility::progressListener* progress, const int start,
- const int length, const bool peek) const
+ utility::progressListener* progress, const size_t start,
+ const size_t length, const bool peek) const
{
shared_ptr <const maildirMessagePart> mp = dynamicCast <const maildirMessagePart>(p);
@@ -164,7 +165,7 @@ void maildirMessage::extractPart(shared_ptr <const messagePart> p, utility::outp
void maildirMessage::extractImpl(utility::outputStream& os, utility::progressListener* progress,
- const int start, const int length, const int partialStart, const int partialLength,
+ const size_t start, const size_t length, const size_t partialStart, const size_t partialLength,
const bool /* peek */) const
{
shared_ptr <const maildirFolder> folder = m_folder.lock();
@@ -179,20 +180,19 @@ void maildirMessage::extractImpl(utility::outputStream& os, utility::progressLis
is->skip(start + partialStart);
- utility::stream::value_type buffer[8192];
- utility::stream::size_type remaining = (partialLength == -1 ? length
- : std::min(partialLength, length));
+ byte_t buffer[8192];
+ size_t remaining = (partialLength == static_cast <size_t>(-1)
+ ? length : std::min(partialLength, length));
- const int total = remaining;
- int current = 0;
+ const size_t total = remaining;
+ size_t current = 0;
if (progress)
progress->start(total);
while (!is->eof() && remaining > 0)
{
- const utility::stream::size_type read =
- is->read(buffer, std::min(remaining, sizeof(buffer)));
+ const size_t read = is->read(buffer, std::min(remaining, sizeof(buffer)));
remaining -= read;
current += read;
@@ -226,20 +226,19 @@ void maildirMessage::fetchPartHeader(shared_ptr <messagePart> p)
is->skip(mp->getHeaderParsedOffset());
- utility::stream::value_type buffer[1024];
- utility::stream::size_type remaining = mp->getHeaderParsedLength();
+ byte_t buffer[1024];
+ size_t remaining = mp->getHeaderParsedLength();
string contents;
contents.reserve(remaining);
while (!is->eof() && remaining > 0)
{
- const utility::stream::size_type read =
- is->read(buffer, std::min(remaining, sizeof(buffer)));
+ const size_t read = is->read(buffer, std::min(remaining, sizeof(buffer)));
remaining -= read;
- contents.append(buffer, read);
+ vmime::utility::stringUtils::appendBytesToString(contents, buffer, read);
}
mp->getOrCreateHeader().parse(contents);
@@ -279,30 +278,30 @@ void maildirMessage::fetch(shared_ptr <maildirFolder> msgFolder, const fetchAttr
// Need whole message contents for structure
if (options.has(fetchAttributes::STRUCTURE))
{
- utility::stream::value_type buffer[16384];
+ byte_t buffer[16384];
contents.reserve(file->getLength());
while (!is->eof())
{
- const utility::stream::size_type read = is->read(buffer, sizeof(buffer));
- contents.append(buffer, read);
+ const size_t read = is->read(buffer, sizeof(buffer));
+ vmime::utility::stringUtils::appendBytesToString(contents, buffer, read);
}
}
// Need only header
else
{
- utility::stream::value_type buffer[1024];
+ byte_t buffer[1024];
contents.reserve(4096);
while (!is->eof())
{
- const utility::stream::size_type read = is->read(buffer, sizeof(buffer));
- contents.append(buffer, read);
+ const size_t read = is->read(buffer, sizeof(buffer));
+ vmime::utility::stringUtils::appendBytesToString(contents, buffer, read);
- const string::size_type sep1 = contents.rfind("\r\n\r\n");
- const string::size_type sep2 = contents.rfind("\n\n");
+ const size_t sep1 = contents.rfind("\r\n\r\n");
+ const size_t sep2 = contents.rfind("\n\n");
if (sep1 != string::npos)
{
diff --git a/src/net/maildir/maildirMessagePart.cpp b/src/net/maildir/maildirMessagePart.cpp
index 683e259e..6ae085c9 100644
--- a/src/net/maildir/maildirMessagePart.cpp
+++ b/src/net/maildir/maildirMessagePart.cpp
@@ -93,7 +93,7 @@ const mediaType& maildirMessagePart::getType() const
}
-int maildirMessagePart::getSize() const
+size_t maildirMessagePart::getSize() const
{
return m_size;
}
@@ -123,25 +123,25 @@ header& maildirMessagePart::getOrCreateHeader()
}
-int maildirMessagePart::getHeaderParsedOffset() const
+size_t maildirMessagePart::getHeaderParsedOffset() const
{
return m_headerParsedOffset;
}
-int maildirMessagePart::getHeaderParsedLength() const
+size_t maildirMessagePart::getHeaderParsedLength() const
{
return m_headerParsedLength;
}
-int maildirMessagePart::getBodyParsedOffset() const
+size_t maildirMessagePart::getBodyParsedOffset() const
{
return m_bodyParsedOffset;
}
-int maildirMessagePart::getBodyParsedLength() const
+size_t maildirMessagePart::getBodyParsedLength() const
{
return m_bodyParsedLength;
}
diff --git a/src/net/maildir/maildirStore.cpp b/src/net/maildir/maildirStore.cpp
index c7ceb6fa..87e733e2 100644
--- a/src/net/maildir/maildirStore.cpp
+++ b/src/net/maildir/maildirStore.cpp
@@ -122,7 +122,7 @@ bool maildirStore::isValidFolderName(const folder::path::component& name) const
return false;
// Name cannot start with '.'
- const int length = buf.length();
+ const size_t length = buf.length();
int pos = 0;
while ((pos < length) && (buf[pos] == '.'))
diff --git a/src/net/maildir/maildirUtils.cpp b/src/net/maildir/maildirUtils.cpp
index 5a5ac90f..77aac715 100644
--- a/src/net/maildir/maildirUtils.cpp
+++ b/src/net/maildir/maildirUtils.cpp
@@ -71,7 +71,7 @@ bool maildirUtils::isMessageFile(const utility::file& file)
const utility::file::path::component maildirUtils::extractId
(const utility::file::path::component& filename)
{
- string::size_type sep = filename.getBuffer().rfind(':'); // try colon
+ size_t sep = filename.getBuffer().rfind(':'); // try colon
if (sep == string::npos)
{
@@ -86,7 +86,7 @@ const utility::file::path::component maildirUtils::extractId
int maildirUtils::extractFlags(const utility::file::path::component& comp)
{
- string::size_type sep = comp.getBuffer().rfind(':'); // try colon
+ size_t sep = comp.getBuffer().rfind(':'); // try colon
if (sep == string::npos)
{
@@ -95,11 +95,11 @@ int maildirUtils::extractFlags(const utility::file::path::component& comp)
}
const string flagsString(comp.getBuffer().begin() + sep + 1, comp.getBuffer().end());
- const string::size_type count = flagsString.length();
+ const size_t count = flagsString.length();
int flags = 0;
- for (string::size_type i = 0 ; i < count ; ++i)
+ for (size_t i = 0 ; i < count ; ++i)
{
switch (flagsString[i])
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 06:25:01 +0000