From 7e265b05f440ed81b80f2de496c9d13221a69fe0 Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Tue, 10 Dec 2013 08:52:51 +0100
Subject: Simplified types for better readability. Use appropriate types
 (size_t, byte_t...). Minor warning fixes.

---
 src/net/pop3/POP3Message.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/net/pop3/POP3Message.cpp')

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();
-- 
cgit v1.2.3