aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/imap
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/imap')
-rw-r--r--src/net/imap/IMAPConnection.cpp10
-rw-r--r--src/net/imap/IMAPFolder.cpp18
-rw-r--r--src/net/imap/IMAPFolderStatus.cpp36
-rw-r--r--src/net/imap/IMAPMessage.cpp39
-rw-r--r--src/net/imap/IMAPMessagePart.cpp2
-rw-r--r--src/net/imap/IMAPMessagePartContentHandler.cpp4
-rw-r--r--src/net/imap/IMAPUtils.cpp10
7 files changed, 71 insertions, 48 deletions
diff --git a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp
index 0dba1ecc..234c2b6a 100644
--- a/src/net/imap/IMAPConnection.cpp
+++ b/src/net/imap/IMAPConnection.cpp
@@ -394,10 +394,10 @@ void IMAPConnection::authenticateSASL()
}
byte_t* challenge = 0;
- long challengeLen = 0;
+ size_t challengeLen = 0;
byte_t* resp = 0;
- long respLen = 0;
+ size_t respLen = 0;
try
{
@@ -530,7 +530,7 @@ bool IMAPConnection::hasCapability(const string& capa)
const string normCapa = utility::stringUtils::toUpper(capa);
- for (unsigned int i = 0, n = m_capabilities.size() ; i < n ; ++i)
+ for (size_t i = 0, n = m_capabilities.size() ; i < n ; ++i)
{
if (m_capabilities[i] == normCapa)
return true;
@@ -566,7 +566,7 @@ bool IMAPConnection::processCapabilityResponseData(const IMAPParser::response* r
const std::vector <IMAPParser::continue_req_or_response_data*>& respDataList =
resp->continue_req_or_response_data();
- for (unsigned int i = 0 ; i < respDataList.size() ; ++i)
+ for (size_t i = 0 ; i < respDataList.size() ; ++i)
{
if (respDataList[i]->response_data() == NULL)
continue;
@@ -739,7 +739,7 @@ void IMAPConnection::send(bool tag, const string& what, bool end)
}
-void IMAPConnection::sendRaw(const char* buffer, const int count)
+void IMAPConnection::sendRaw(const byte_t* buffer, const size_t count)
{
m_socket->sendRaw(buffer, count);
}
diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp
index 06d331df..fb98887c 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/net/imap/IMAPFolder.cpp
@@ -791,8 +791,8 @@ void IMAPFolder::fetchMessages(std::vector <shared_ptr <message> >& msg, const f
const std::vector <IMAPParser::continue_req_or_response_data*>& respDataList =
resp->continue_req_or_response_data();
- const int total = msg.size();
- int current = 0;
+ const size_t total = msg.size();
+ size_t current = 0;
if (progress)
progress->start(total);
@@ -1005,7 +1005,7 @@ void IMAPFolder::addMessage(shared_ptr <vmime::message> msg, const int flags,
}
-void IMAPFolder::addMessage(utility::inputStream& is, const int size, const int flags,
+void IMAPFolder::addMessage(utility::inputStream& is, const size_t size, const int flags,
vmime::datetime* date, utility::progressListener* progress)
{
shared_ptr <IMAPStore> store = m_store.lock();
@@ -1064,22 +1064,22 @@ void IMAPFolder::addMessage(utility::inputStream& is, const int size, const int
}
// Send message data
- const int total = size;
- int current = 0;
+ const size_t total = size;
+ size_t current = 0;
if (progress)
progress->start(total);
- const socket::size_type blockSize = std::min(is.getBlockSize(),
+ const size_t blockSize = std::min(is.getBlockSize(),
static_cast <size_t>(m_connection->getSocket()->getBlockSize()));
- std::vector <char> vbuffer(blockSize);
- char* buffer = &vbuffer.front();
+ std::vector <byte_t> vbuffer(blockSize);
+ byte_t* buffer = &vbuffer.front();
while (!is.eof())
{
// Read some data from the input stream
- const int read = is.read(buffer, sizeof(buffer));
+ const size_t read = is.read(buffer, sizeof(buffer));
current += read;
// Put read data into socket output stream
diff --git a/src/net/imap/IMAPFolderStatus.cpp b/src/net/imap/IMAPFolderStatus.cpp
index 25c88b02..c78a40f3 100644
--- a/src/net/imap/IMAPFolderStatus.cpp
+++ b/src/net/imap/IMAPFolderStatus.cpp
@@ -115,7 +115,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
{
case IMAPParser::status_att_val::MESSAGES:
{
- const unsigned int count = (*jt)->value_as_number()->value();
+ const unsigned int count =
+ static_cast <unsigned int>((*jt)->value_as_number()->value());
if (m_count != count)
{
@@ -127,7 +128,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
case IMAPParser::status_att_val::UNSEEN:
{
- const unsigned int unseen = (*jt)->value_as_number()->value();
+ const unsigned int unseen =
+ static_cast <unsigned int>((*jt)->value_as_number()->value());
if (m_unseen != unseen)
{
@@ -139,7 +141,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
case IMAPParser::status_att_val::RECENT:
{
- const unsigned int recent = (*jt)->value_as_number()->value();
+ const unsigned int recent =
+ static_cast <unsigned int>((*jt)->value_as_number()->value());
if (m_recent != recent)
{
@@ -151,7 +154,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
case IMAPParser::status_att_val::UIDNEXT:
{
- const vmime_uint32 uidNext = (*jt)->value_as_number()->value();
+ const vmime_uint32 uidNext =
+ static_cast <vmime_uint32>((*jt)->value_as_number()->value());
if (m_uidNext != uidNext)
{
@@ -163,7 +167,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
case IMAPParser::status_att_val::UIDVALIDITY:
{
- const vmime_uint32 uidValidity = (*jt)->value_as_number()->value();
+ const vmime_uint32 uidValidity =
+ static_cast <vmime_uint32>((*jt)->value_as_number()->value());
if (m_uidValidity != uidValidity)
{
@@ -175,7 +180,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
case IMAPParser::status_att_val::HIGHESTMODSEQ:
{
- const vmime_uint64 highestModSeq = (*jt)->value_as_mod_sequence_value()->value();
+ const vmime_uint64 highestModSeq =
+ static_cast <vmime_uint64>((*jt)->value_as_mod_sequence_value()->value());
if (m_highestModSeq != highestModSeq)
{
@@ -191,7 +197,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
else if (resp->type() == IMAPParser::mailbox_data::EXISTS)
{
- const unsigned int count = resp->number()->value();
+ const unsigned int count =
+ static_cast <unsigned int>(resp->number()->value());
if (m_count != count)
{
@@ -201,7 +208,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::mailbox_data* resp)
}
else if (resp->type() == IMAPParser::mailbox_data::RECENT)
{
- const unsigned int recent = resp->number()->value();
+ const unsigned int recent =
+ static_cast <unsigned int>(resp->number()->value());
if (m_recent != recent)
{
@@ -222,7 +230,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::resp_text_code* resp
{
case IMAPParser::resp_text_code::UIDVALIDITY:
{
- const vmime_uint32 uidValidity = resp->nz_number()->value();
+ const vmime_uint32 uidValidity =
+ static_cast <vmime_uint32>(resp->nz_number()->value());
if (m_uidValidity != uidValidity)
{
@@ -234,7 +243,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::resp_text_code* resp
}
case IMAPParser::resp_text_code::UIDNEXT:
{
- const vmime_uint32 uidNext = resp->nz_number()->value();
+ const vmime_uint32 uidNext =
+ static_cast <vmime_uint32>(resp->nz_number()->value());
if (m_uidNext != uidNext)
{
@@ -246,7 +256,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::resp_text_code* resp
}
case IMAPParser::resp_text_code::UNSEEN:
{
- const unsigned int unseen = resp->nz_number()->value();
+ const unsigned int unseen =
+ static_cast <unsigned int>(resp->nz_number()->value());
if (m_unseen != unseen)
{
@@ -258,7 +269,8 @@ bool IMAPFolderStatus::updateFromResponse(const IMAPParser::resp_text_code* resp
}
case IMAPParser::resp_text_code::HIGHESTMODSEQ:
{
- const vmime_uint64 highestModSeq = resp->mod_sequence_value()->value();
+ const vmime_uint64 highestModSeq =
+ static_cast <vmime_uint64>(resp->mod_sequence_value()->value());
if (m_highestModSeq != highestModSeq)
{
diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp
index ae51bfe8..c11aafc2 100644
--- a/src/net/imap/IMAPMessage.cpp
+++ b/src/net/imap/IMAPMessage.cpp
@@ -98,7 +98,7 @@ private:
IMAPMessage::IMAPMessage(shared_ptr <IMAPFolder> folder, const int num)
- : m_folder(folder), m_num(num), m_size(-1), m_flags(FLAG_UNDEFINED),
+ : m_folder(folder), m_num(num), m_size(-1U), m_flags(FLAG_UNDEFINED),
m_expunged(false), m_modseq(0), m_structure(null)
{
folder->registerMessage(this);
@@ -146,9 +146,9 @@ vmime_uint64 IMAPMessage::getModSequence() const
}
-int IMAPMessage::getSize() const
+size_t IMAPMessage::getSize() const
{
- if (m_size == -1)
+ if (m_size == -1U)
throw exceptions::unfetched_object();
return (m_size);
@@ -197,28 +197,36 @@ shared_ptr <const header> IMAPMessage::getHeader() const
}
-void IMAPMessage::extract(utility::outputStream& os, utility::progressListener* progress,
- const int start, const int length, const bool peek) const
+void IMAPMessage::extract
+ (utility::outputStream& os,
+ utility::progressListener* progress,
+ const size_t start, const size_t length,
+ const bool peek) const
{
shared_ptr <const IMAPFolder> folder = m_folder.lock();
if (!folder)
throw exceptions::folder_not_found();
- extractImpl(null, os, progress, start, length, EXTRACT_HEADER | EXTRACT_BODY | (peek ? EXTRACT_PEEK : 0));
+ extractImpl(null, os, progress, start, length,
+ EXTRACT_HEADER | EXTRACT_BODY | (peek ? EXTRACT_PEEK : 0));
}
void IMAPMessage::extractPart
- (shared_ptr <const messagePart> p, utility::outputStream& os, utility::progressListener* progress,
- const int start, const int length, const bool peek) const
+ (shared_ptr <const messagePart> p,
+ utility::outputStream& os,
+ utility::progressListener* progress,
+ const size_t start, const size_t length,
+ const bool peek) const
{
shared_ptr <const IMAPFolder> folder = m_folder.lock();
if (!folder)
throw exceptions::folder_not_found();
- extractImpl(p, os, progress, start, length, EXTRACT_HEADER | EXTRACT_BODY | (peek ? EXTRACT_PEEK : 0));
+ extractImpl(p, os, progress, start, length,
+ EXTRACT_HEADER | EXTRACT_BODY | (peek ? EXTRACT_PEEK : 0));
}
@@ -253,9 +261,12 @@ void IMAPMessage::fetchPartHeaderForStructure(shared_ptr <messageStructure> str)
}
-void IMAPMessage::extractImpl(shared_ptr <const messagePart> p, utility::outputStream& os,
- utility::progressListener* progress, const int start,
- const int length, const int extractFlags) const
+void IMAPMessage::extractImpl
+ (shared_ptr <const messagePart> p,
+ utility::outputStream& os,
+ utility::progressListener* progress,
+ const size_t start, const size_t length,
+ const int extractFlags) const
{
shared_ptr <const IMAPFolder> folder = m_folder.lock();
@@ -340,7 +351,7 @@ void IMAPMessage::extractImpl(shared_ptr <const messagePart> p, utility::outputS
command << "]";
- if (start != 0 || length != -1)
+ if (start != 0 || length != static_cast <size_t>(-1))
command << "<" << start << "." << length << ">";
// Send the request
@@ -473,7 +484,7 @@ int IMAPMessage::processFetchResponse
}
case IMAPParser::msg_att_item::RFC822_SIZE:
{
- m_size = (*it)->number()->value();
+ m_size = static_cast <size_t>((*it)->number()->value());
break;
}
case IMAPParser::msg_att_item::BODY_SECTION:
diff --git a/src/net/imap/IMAPMessagePart.cpp b/src/net/imap/IMAPMessagePart.cpp
index 153470cf..eed885dc 100644
--- a/src/net/imap/IMAPMessagePart.cpp
+++ b/src/net/imap/IMAPMessagePart.cpp
@@ -104,7 +104,7 @@ const mediaType& IMAPMessagePart::getType() const
}
-int IMAPMessagePart::getSize() const
+size_t IMAPMessagePart::getSize() const
{
return m_size;
}
diff --git a/src/net/imap/IMAPMessagePartContentHandler.cpp b/src/net/imap/IMAPMessagePartContentHandler.cpp
index 7112e3d2..1f53f082 100644
--- a/src/net/imap/IMAPMessagePartContentHandler.cpp
+++ b/src/net/imap/IMAPMessagePartContentHandler.cpp
@@ -59,7 +59,7 @@ shared_ptr <contentHandler> IMAPMessagePartContentHandler::clone() const
void IMAPMessagePartContentHandler::generate
- (utility::outputStream& os, const vmime::encoding& enc, const string::size_type maxLineLength) const
+ (utility::outputStream& os, const vmime::encoding& enc, const size_t maxLineLength) const
{
shared_ptr <IMAPMessage> msg = constCast <IMAPMessage>(m_message.lock());
shared_ptr <messagePart> part = constCast <messagePart>(m_part.lock());
@@ -165,7 +165,7 @@ void IMAPMessagePartContentHandler::extractRaw
}
-string::size_type IMAPMessagePartContentHandler::getLength() const
+size_t IMAPMessagePartContentHandler::getLength() const
{
return m_part.lock()->getSize();
}
diff --git a/src/net/imap/IMAPUtils.cpp b/src/net/imap/IMAPUtils.cpp
index bf310414..ff81ce71 100644
--- a/src/net/imap/IMAPUtils.cpp
+++ b/src/net/imap/IMAPUtils.cpp
@@ -190,9 +190,9 @@ const string IMAPUtils::toModifiedUTF7
int b = 0, k = 0;
bool base64 = false;
- string::size_type remaining = cvt.length();
+ size_t remaining = cvt.length();
- for (string::size_type i = 0, len = cvt.length() ; i < len ; )
+ for (size_t i = 0, len = cvt.length() ; i < len ; )
{
const unsigned char c = cvt[i];
@@ -206,7 +206,7 @@ const string IMAPUtils::toModifiedUTF7
continue;
}
- string::size_type n = 0;
+ size_t n = 0;
int ch = 0;
if (c < 0x80)
@@ -232,7 +232,7 @@ const string IMAPUtils::toModifiedUTF7
++i;
--remaining;
- for (string::size_type j = 0 ; j < n ; j++)
+ for (size_t j = 0 ; j < n ; j++)
{
if ((cvt[i + j] & 0xc0) != 0x80)
return ""; // error
@@ -280,7 +280,7 @@ const string IMAPUtils::toModifiedUTF7
base64 = false;
}
- out += static_cast <string::value_type>(ch);
+ out += static_cast <char>(ch);
if (ch == '&')
out += '-';
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 22:51:48 +0000