aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/pop3
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/pop3')
-rw-r--r--src/net/pop3/POP3Connection.cpp6
-rw-r--r--src/net/pop3/POP3Folder.cpp18
-rw-r--r--src/net/pop3/POP3Message.cpp19
-rw-r--r--src/net/pop3/POP3Response.cpp22
4 files changed, 35 insertions, 30 deletions
diff --git a/src/net/pop3/POP3Connection.cpp b/src/net/pop3/POP3Connection.cpp
index 547ef5ef..5fa923f4 100644
--- a/src/net/pop3/POP3Connection.cpp
+++ b/src/net/pop3/POP3Connection.cpp
@@ -463,10 +463,10 @@ void POP3Connection::authenticateSASL()
case POP3Response::CODE_READY:
{
byte_t* challenge = 0;
- long challengeLen = 0;
+ size_t challengeLen = 0;
byte_t* resp = 0;
- long respLen = 0;
+ size_t respLen = 0;
try
{
@@ -495,7 +495,7 @@ void POP3Connection::authenticateSASL()
}
// Cancel SASL exchange
- m_socket->sendRaw("*\r\n", 3);
+ m_socket->send("*\r\n");
}
catch (...)
{
diff --git a/src/net/pop3/POP3Folder.cpp b/src/net/pop3/POP3Folder.cpp
index 66ace31c..096de8af 100644
--- a/src/net/pop3/POP3Folder.cpp
+++ b/src/net/pop3/POP3Folder.cpp
@@ -318,8 +318,8 @@ void POP3Folder::fetchMessages(std::vector <shared_ptr <message> >& msg, const f
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);
@@ -362,7 +362,7 @@ void POP3Folder::fetchMessages(std::vector <shared_ptr <message> >& msg, const f
if (x != result.end())
{
- int size = 0;
+ size_t size = 0;
std::istringstream iss((*x).second);
iss >> size;
@@ -446,7 +446,7 @@ void POP3Folder::fetchMessage(shared_ptr <message> msg, const fetchAttributes& o
if (it != responseText.end())
{
- int size = 0;
+ size_t size = 0;
std::istringstream iss(string(it, responseText.end()));
iss >> size;
@@ -601,15 +601,17 @@ void POP3Folder::rename(const folder::path& /* newPath */)
}
-void POP3Folder::addMessage(shared_ptr <vmime::message> /* msg */, const int /* flags */,
- vmime::datetime* /* date */, utility::progressListener* /* progress */)
+void POP3Folder::addMessage
+ (shared_ptr <vmime::message> /* msg */, const int /* flags */,
+ vmime::datetime* /* date */, utility::progressListener* /* progress */)
{
throw exceptions::operation_not_supported();
}
-void POP3Folder::addMessage(utility::inputStream& /* is */, const int /* size */, const int /* flags */,
- vmime::datetime* /* date */, utility::progressListener* /* progress */)
+void POP3Folder::addMessage
+ (utility::inputStream& /* is */, const size_t /* size */, const int /* flags */,
+ vmime::datetime* /* date */, utility::progressListener* /* progress */)
{
throw exceptions::operation_not_supported();
}
diff --git a/src/net/pop3/POP3Message.cpp b/src/net/pop3/POP3Message.cpp
index 5f0fb725..08523611 100644
--- a/src/net/pop3/POP3Message.cpp
+++ b/src/net/pop3/POP3Message.cpp
@@ -78,9 +78,9 @@ const message::uid POP3Message::getUID() const
}
-int POP3Message::getSize() const
+size_t POP3Message::getSize() const
{
- if (m_size == -1)
+ if (m_size == static_cast <size_t>(-1))
throw exceptions::unfetched_object();
return (m_size);
@@ -125,9 +125,11 @@ shared_ptr <const header> POP3Message::getHeader() const
}
-void POP3Message::extract(utility::outputStream& os,
- utility::progressListener* progress, const int start,
- const int length, const bool /* peek */) const
+void POP3Message::extract
+ (utility::outputStream& os,
+ utility::progressListener* progress,
+ const size_t start, const size_t length,
+ const bool /* peek */) const
{
shared_ptr <const POP3Folder> folder = m_folder.lock();
@@ -136,7 +138,7 @@ void POP3Message::extract(utility::outputStream& os,
else if (!folder->getStore())
throw exceptions::illegal_state("Store disconnected");
- if (start != 0 && length != -1)
+ if (start != 0 && length != static_cast <size_t>(-1))
throw exceptions::partial_fetch_not_supported();
// Emit the "RETR" command
@@ -157,9 +159,10 @@ void POP3Message::extract(utility::outputStream& os,
void POP3Message::extractPart
- (shared_ptr <const messagePart> /* p */, utility::outputStream& /* os */,
+ (shared_ptr <const messagePart> /* p */,
+ utility::outputStream& /* os */,
utility::progressListener* /* progress */,
- const int /* start */, const int /* length */,
+ const size_t /* start */, const size_t /* length */,
const bool /* peek */) const
{
throw exceptions::operation_not_supported();
diff --git a/src/net/pop3/POP3Response.cpp b/src/net/pop3/POP3Response.cpp
index e24634c6..1dc5ee76 100644
--- a/src/net/pop3/POP3Response.cpp
+++ b/src/net/pop3/POP3Response.cpp
@@ -98,7 +98,7 @@ shared_ptr <POP3Response> POP3Response::readMultilineResponse(shared_ptr <POP3Co
// static
shared_ptr <POP3Response> POP3Response::readLargeResponse
(shared_ptr <POP3Connection> conn, utility::outputStream& os,
- utility::progressListener* progress, const long predictedSize)
+ utility::progressListener* progress, const size_t predictedSize)
{
shared_ptr <POP3Response> resp = shared_ptr <POP3Response>
(new POP3Response(conn->getSocket(), conn->getTimeoutHandler()));
@@ -159,7 +159,7 @@ void POP3Response::readResponseImpl(string& buffer, const bool multiLine)
buffer.clear();
- string::value_type last1 = '\0', last2 = '\0';
+ char last1 = '\0', last2 = '\0';
for ( ; !foundTerminator ; )
{
@@ -187,7 +187,7 @@ void POP3Response::readResponseImpl(string& buffer, const bool multiLine)
m_timeoutHandler->resetTimeOut();
// Check for transparent characters: '\n..' becomes '\n.'
- const string::value_type first = receiveBuffer[0];
+ const char first = receiveBuffer[0];
if (first == '.' && last2 == '\n' && last1 == '.')
{
@@ -199,7 +199,7 @@ void POP3Response::readResponseImpl(string& buffer, const bool multiLine)
receiveBuffer.erase(receiveBuffer.begin());
}
- for (string::size_type trans ;
+ for (size_t trans ;
string::npos != (trans = receiveBuffer.find("\n..")) ; )
{
receiveBuffer.replace(trans, 3, "\n.");
@@ -228,9 +228,9 @@ void POP3Response::readResponseImpl(string& buffer, const bool multiLine)
void POP3Response::readResponseImpl
(string& firstLine, utility::outputStream& os,
- utility::progressListener* progress, const long predictedSize)
+ utility::progressListener* progress, const size_t predictedSize)
{
- long current = 0, total = predictedSize;
+ size_t current = 0, total = predictedSize;
string temp;
bool codeDone = false;
@@ -264,8 +264,8 @@ void POP3Response::readResponseImpl
}
// Receive data from the socket
- utility::stream::value_type buffer[65536];
- const utility::stream::size_type read = is.read(buffer, sizeof(buffer));
+ byte_t buffer[65536];
+ const size_t read = is.read(buffer, sizeof(buffer));
if (read == 0) // buffer is empty
{
@@ -289,7 +289,7 @@ void POP3Response::readResponseImpl
// If we don't have extracted the response code yet
if (!codeDone)
{
- temp.append(buffer, read);
+ vmime::utility::stringUtils::appendBytesToString(temp, buffer, read);
string responseData;
@@ -322,7 +322,7 @@ void POP3Response::readResponseImpl
bool POP3Response::stripFirstLine
(const string& buffer, string& result, string* firstLine)
{
- const string::size_type end = buffer.find('\n');
+ const size_t end = buffer.find('\n');
if (end != string::npos)
{
@@ -371,7 +371,7 @@ POP3Response::ResponseCode POP3Response::getResponseCode(const string& buffer)
// static
void POP3Response::stripResponseCode(const string& buffer, string& result)
{
- const string::size_type pos = buffer.find_first_of(" \t");
+ const size_t pos = buffer.find_first_of(" \t");
if (pos != string::npos)
result = buffer.substr(pos + 1);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 04:44:08 +0000