summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir@cohens.org.il>2009-09-17 21:26:22 +0300
committerTzafrir Cohen <tzafrir@cohens.org.il>2009-10-04 10:48:39 +0200
commit30d52bc6e985b84be8543219dcef0cf1a9a5f426 (patch)
tree56ce8a0e0a9eea0ef4471f8227f2b8bb3afb3873
parent2beb76edfb910062faa47e0c30bb9ab9f9c1c4ec (diff)
fix most warnings in orkbasecxx
Fixed instances of: * Unused variables * signed/unsigned comparisons * Use some more 'const' * Disabled '#pragma warning'
-rw-r--r--orkbasecxx/AudioCapture.cpp1
-rw-r--r--orkbasecxx/AudioTape.cpp3
-rw-r--r--orkbasecxx/BatchProcessing.cpp4
-rw-r--r--orkbasecxx/CapturePort.h2
-rw-r--r--orkbasecxx/EventStreaming.cpp2
-rw-r--r--orkbasecxx/Filter.cpp4
-rw-r--r--orkbasecxx/ImmediateProcessing.cpp2
-rw-r--r--orkbasecxx/MemUtils.cpp2
-rw-r--r--orkbasecxx/MultiThreadedServer.cpp1
-rw-r--r--orkbasecxx/ObjectFactory.cpp2
-rw-r--r--orkbasecxx/PartyFilter.cpp2
-rw-r--r--orkbasecxx/Reporting.cpp2
-rw-r--r--orkbasecxx/StdString.h20
-rw-r--r--orkbasecxx/TapeFileNaming.cpp2
-rw-r--r--orkbasecxx/TapeProcessor.cpp2
-rw-r--r--orkbasecxx/Utils.cpp2
-rw-r--r--orkbasecxx/audiofile/AudioFile.h2
-rw-r--r--orkbasecxx/audiofile/MediaChunkFile.cpp8
-rw-r--r--orkbasecxx/audiofile/PcmFile.cpp2
-rw-r--r--orkbasecxx/filters/audiogain/AudioGain.cpp2
-rw-r--r--orkbasecxx/filters/g722codec/G722Codec.cpp2
-rw-r--r--orkbasecxx/filters/gsm/GsmFilters.cpp2
-rw-r--r--orkbasecxx/filters/ilbc/IlbcFilters.cpp2
-rw-r--r--orkbasecxx/messages/Message.cpp2
-rw-r--r--orkbasecxx/messages/Message.h4
-rw-r--r--orkbasecxx/messages/SyncMessage.h2
-rw-r--r--orkbasecxx/messages/TapeMsg.cpp2
-rw-r--r--orkbasecxx/serializers/Serializer.cpp10
-rw-r--r--orkbasecxx/serializers/Serializer.h2
-rw-r--r--orkbasecxx/serializers/SingleLineSerializer.cpp6
-rw-r--r--orkbasecxx/serializers/UrlSerializer.cpp6
31 files changed, 49 insertions, 58 deletions
diff --git a/orkbasecxx/AudioCapture.cpp b/orkbasecxx/AudioCapture.cpp
index 77b9e95..1cb5ca6 100644
--- a/orkbasecxx/AudioCapture.cpp
+++ b/orkbasecxx/AudioCapture.cpp
@@ -207,7 +207,6 @@ int AudioChunk::GetNumSamples()
double AudioChunk::GetDurationSec()
{
- int i = 0;
return ((double)GetNumSamples())/((double)m_details.m_sampleRate);
}
diff --git a/orkbasecxx/AudioTape.cpp b/orkbasecxx/AudioTape.cpp
index d4b5f81..862a35b 100644
--- a/orkbasecxx/AudioTape.cpp
+++ b/orkbasecxx/AudioTape.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
@@ -380,6 +380,7 @@ void AudioTape::AddCaptureEvent(CaptureEventRef eventRef, bool send)
m_onDemand = true;
}
break;
+ default: break; // FIXME: What happens with different possible values?
}
{
diff --git a/orkbasecxx/BatchProcessing.cpp b/orkbasecxx/BatchProcessing.cpp
index 560ac3e..6bc1464 100644
--- a/orkbasecxx/BatchProcessing.cpp
+++ b/orkbasecxx/BatchProcessing.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
@@ -320,7 +320,7 @@ void BatchProcessing::ThreadHandler(void *args)
if(CONFIG.m_transcodingSleepEveryNumFrames > 0 && CONFIG.m_transcodingSleepUs > 0)
{
- if(frameSleepCounter >= CONFIG.m_transcodingSleepEveryNumFrames)
+ if(frameSleepCounter >= (unsigned int)CONFIG.m_transcodingSleepEveryNumFrames)
{
frameSleepCounter = 0;
struct timespec ts;
diff --git a/orkbasecxx/CapturePort.h b/orkbasecxx/CapturePort.h
index 3b72f6f..3244c5d 100644
--- a/orkbasecxx/CapturePort.h
+++ b/orkbasecxx/CapturePort.h
@@ -11,7 +11,7 @@
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#ifndef __PORT_H__
#define __PORT_H__
diff --git a/orkbasecxx/EventStreaming.cpp b/orkbasecxx/EventStreaming.cpp
index 4074e14..58880ef 100644
--- a/orkbasecxx/EventStreaming.cpp
+++ b/orkbasecxx/EventStreaming.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/Filter.cpp b/orkbasecxx/Filter.cpp
index df25c1d..0f85570 100644
--- a/orkbasecxx/Filter.cpp
+++ b/orkbasecxx/Filter.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#include "Filter.h"
extern "C"
@@ -243,4 +243,4 @@ void UlawToPcmFilter::CaptureEventIn(CaptureEventRef& event)
void UlawToPcmFilter::CaptureEventOut(CaptureEventRef& event)
{
;
-} \ No newline at end of file
+}
diff --git a/orkbasecxx/ImmediateProcessing.cpp b/orkbasecxx/ImmediateProcessing.cpp
index 3f2c58a..dcd166d 100644
--- a/orkbasecxx/ImmediateProcessing.cpp
+++ b/orkbasecxx/ImmediateProcessing.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/MemUtils.cpp b/orkbasecxx/MemUtils.cpp
index 5fd8994..6b7740e 100644
--- a/orkbasecxx/MemUtils.cpp
+++ b/orkbasecxx/MemUtils.cpp
@@ -22,7 +22,7 @@
void MemToHex(unsigned char* input, size_t len, CStdString&output)
{
char byteAsHex[10];
- for(int i=0; i<len; i++)
+ for(unsigned int i=0; i<len; i++)
{
sprintf(byteAsHex, "%.2x", input[i]);
output += byteAsHex;
diff --git a/orkbasecxx/MultiThreadedServer.cpp b/orkbasecxx/MultiThreadedServer.cpp
index 7be1a1e..485b560 100644
--- a/orkbasecxx/MultiThreadedServer.cpp
+++ b/orkbasecxx/MultiThreadedServer.cpp
@@ -320,7 +320,6 @@ int EventStreamingServer::svc(void)
peer().send(header, header.GetLength());
time_t startTime = time(NULL);
- time_t lastSentTime = time(NULL);
sessionId = EventStreamingSingleton::instance()->GetNewSessionId() + " -";
logMsg.Format("%s Event streaming start", sessionId);
diff --git a/orkbasecxx/ObjectFactory.cpp b/orkbasecxx/ObjectFactory.cpp
index 724bbfd..d89fa34 100644
--- a/orkbasecxx/ObjectFactory.cpp
+++ b/orkbasecxx/ObjectFactory.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/PartyFilter.cpp b/orkbasecxx/PartyFilter.cpp
index 57fa0d5..30b211e 100644
--- a/orkbasecxx/PartyFilter.cpp
+++ b/orkbasecxx/PartyFilter.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/Reporting.cpp b/orkbasecxx/Reporting.cpp
index 30243e6..802b8ef 100644
--- a/orkbasecxx/Reporting.cpp
+++ b/orkbasecxx/Reporting.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/StdString.h b/orkbasecxx/StdString.h
index 0f3896c..6271022 100644
--- a/orkbasecxx/StdString.h
+++ b/orkbasecxx/StdString.h
@@ -647,7 +647,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2)
#endif // #ifdef SS_ANSI
#ifndef UNUSED
- #define UNUSED(x) x
+ #define UNUSED(x)
#endif
#endif // #ifndef W32BASE_H
@@ -1311,15 +1311,14 @@ inline void ssasn(std::string& sDst, const std::wstring& sSrc)
#endif
sDst.resize(nDst+1);
+#ifdef SS_MBCS
PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()), nDst,
sSrc.c_str(), static_cast<int>(sSrc.size()));
// In MBCS builds, we don't know how long the destination string will be.
-#ifdef SS_MBCS
sDst.resize(sslen(szCvt));
#else
- szCvt;
sDst.resize(sSrc.size());
#endif
}
@@ -1340,16 +1339,15 @@ inline void ssasn(std::string& sDst, PCWSTR pW)
#endif
sDst.resize(nDst + 1);
+#ifdef SS_MBCS
PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()), nDst,
pW, nSrc);
// In MBCS builds, we don't know how long the destination string will be.
-#ifdef SS_MBCS
sDst.resize(sslen(szCvt));
#else
sDst.resize(nDst);
- szCvt;
#endif
}
else
@@ -1462,14 +1460,13 @@ inline void ssadd(std::string& sDst, const std::wstring& sSrc)
#endif
sDst.resize(nDst+nAdd+1);
+#ifdef SS_MBCS
PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()+nDst),
nAdd, sSrc.c_str(), nSrc);
-#ifdef SS_MBCS
sDst.resize(nDst + sslen(szCvt));
#else
sDst.resize(nDst + nAdd);
- szCvt;
#endif
}
}
@@ -1490,14 +1487,13 @@ inline void ssadd(std::string& sDst, PCWSTR pW)
#endif
sDst.resize(nDst + nAdd + 1);
+#ifdef SS_MBCS
PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()+nDst),
nAdd, pW, nSrc);
-#ifdef SS_MBCS
sDst.resize(nDst + sslen(szCvt));
#else
sDst.resize(nDst + nSrc);
- szCvt;
#endif
}
}
@@ -1535,14 +1531,13 @@ inline void ssadd(std::wstring& sDst, const std::string& sSrc)
int nDst = static_cast<int>(sDst.size());
sDst.resize(nDst + nSrc + 1);
+#ifdef SS_MBCS
PCWSTR szCvt = StdCodeCvt(const_cast<SW_PTRTYPE>(sDst.data()+nDst),
nSrc, sSrc.c_str(), nSrc+1);
-#ifdef SS_MBCS
sDst.resize(nDst + sslen(szCvt));
#else
sDst.resize(nDst + nSrc);
- szCvt;
#endif
}
}
@@ -1555,14 +1550,13 @@ inline void ssadd(std::wstring& sDst, PCSTR pA)
int nDst = static_cast<int>(sDst.size());
sDst.resize(nDst + nSrc + 1);
+#ifdef SS_MBCS
PCWSTR szCvt = StdCodeCvt(const_cast<SW_PTRTYPE>(sDst.data()+nDst),
nSrc, pA, nSrc+1);
-#ifdef SS_MBCS
sDst.resize(nDst + sslen(szCvt));
#else
sDst.resize(nDst + nSrc);
- szCvt;
#endif
}
}
diff --git a/orkbasecxx/TapeFileNaming.cpp b/orkbasecxx/TapeFileNaming.cpp
index cb9e296..0d2841a 100644
--- a/orkbasecxx/TapeFileNaming.cpp
+++ b/orkbasecxx/TapeFileNaming.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/TapeProcessor.cpp b/orkbasecxx/TapeProcessor.cpp
index 76c94cf..1b59fed 100644
--- a/orkbasecxx/TapeProcessor.cpp
+++ b/orkbasecxx/TapeProcessor.cpp
@@ -11,7 +11,7 @@
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/Utils.cpp b/orkbasecxx/Utils.cpp
index f06d673..656a3ce 100644
--- a/orkbasecxx/Utils.cpp
+++ b/orkbasecxx/Utils.cpp
@@ -234,7 +234,7 @@ void FileEscapeName(CStdString& in, CStdString& out)
// Translates all the characters that are not in file_ok_chars string into %xx sequences
// %xx specifies the character ascii code in hexadecimal
out = "";
- for (int i = 0 ; i<in.size() ; i++)
+ for (unsigned int i = 0 ; i<in.size() ; i++)
{
if (strchr(file_ok_chars, in.GetAt(i)))
{
diff --git a/orkbasecxx/audiofile/AudioFile.h b/orkbasecxx/audiofile/AudioFile.h
index cc37e4c..ce54385 100644
--- a/orkbasecxx/audiofile/AudioFile.h
+++ b/orkbasecxx/audiofile/AudioFile.h
@@ -41,7 +41,7 @@ public:
/** Writes a chunk of audio to disk.
If stereo capture, this represents the local party */
virtual void WriteChunk(AudioChunkRef chunkRef) = 0;
- /** Writes a chunk of audio from the remote pary to disk (if stereo capture)
+ /** Writes a chunk of audio from the remote pary to disk (if stereo capture) */
//virtual bool WriteRemoteChunk(AudioChunkRef chunkRef) = 0;
/** Reads a chunk of audio stereo-wise
If underlying storage is mono, remoteChunk will be NULL
diff --git a/orkbasecxx/audiofile/MediaChunkFile.cpp b/orkbasecxx/audiofile/MediaChunkFile.cpp
index 3856be5..ebb1822 100644
--- a/orkbasecxx/audiofile/MediaChunkFile.cpp
+++ b/orkbasecxx/audiofile/MediaChunkFile.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#include "ConfigManager.h"
#include "MediaChunkFile.h"
@@ -61,8 +61,7 @@ bool MediaChunkFile::FlushToDisk()
continue;
}
- int tmp = sizeof(AudioChunkDetails);
- unsigned int numWritten = ACE_OS::fwrite(tmpChunk->GetDetails(), sizeof(AudioChunkDetails), 1, m_stream);
+ int numWritten = ACE_OS::fwrite(tmpChunk->GetDetails(), sizeof(AudioChunkDetails), 1, m_stream);
if(numWritten != 1)
{
writeError = true;
@@ -97,7 +96,7 @@ void MediaChunkFile::WriteChunk(AudioChunkRef chunkRef)
m_chunkQueueDataSize += pChunk->GetNumBytes();
m_chunkQueue.push(chunkRef);
- if(m_chunkQueueDataSize > (CONFIG.m_captureFileBatchSizeKByte*1024))
+ if(m_chunkQueueDataSize > (unsigned int)(CONFIG.m_captureFileBatchSizeKByte*1024))
{
if (m_stream)
{
@@ -117,7 +116,6 @@ void MediaChunkFile::WriteChunk(AudioChunkRef chunkRef)
int MediaChunkFile::ReadChunkMono(AudioChunkRef& chunkRef)
{
unsigned int numRead = 0;
- bool readError = false;
if (m_stream)
{
diff --git a/orkbasecxx/audiofile/PcmFile.cpp b/orkbasecxx/audiofile/PcmFile.cpp
index 85f49e3..c6ba65c 100644
--- a/orkbasecxx/audiofile/PcmFile.cpp
+++ b/orkbasecxx/audiofile/PcmFile.cpp
@@ -59,7 +59,7 @@ void PcmFile::WriteChunk(AudioChunkRef chunkRef)
throw(CStdString("Write attempt on unopened file:")+ m_filename);
}
- if (numWritten != chunkRef->GetNumSamples())
+ if (numWritten != (unsigned int)chunkRef->GetNumSamples())
{
throw(CStdString("Could not write to file:")+ m_filename);
}
diff --git a/orkbasecxx/filters/audiogain/AudioGain.cpp b/orkbasecxx/filters/audiogain/AudioGain.cpp
index 4477324..bc678e0 100644
--- a/orkbasecxx/filters/audiogain/AudioGain.cpp
+++ b/orkbasecxx/filters/audiogain/AudioGain.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/filters/g722codec/G722Codec.cpp b/orkbasecxx/filters/g722codec/G722Codec.cpp
index 5a59e1e..9a6bbc6 100644
--- a/orkbasecxx/filters/g722codec/G722Codec.cpp
+++ b/orkbasecxx/filters/g722codec/G722Codec.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/filters/gsm/GsmFilters.cpp b/orkbasecxx/filters/gsm/GsmFilters.cpp
index af32571..3cc8f36 100644
--- a/orkbasecxx/filters/gsm/GsmFilters.cpp
+++ b/orkbasecxx/filters/gsm/GsmFilters.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#include "GsmFilters.h"
diff --git a/orkbasecxx/filters/ilbc/IlbcFilters.cpp b/orkbasecxx/filters/ilbc/IlbcFilters.cpp
index c6fd9b5..4986141 100644
--- a/orkbasecxx/filters/ilbc/IlbcFilters.cpp
+++ b/orkbasecxx/filters/ilbc/IlbcFilters.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/messages/Message.cpp b/orkbasecxx/messages/Message.cpp
index 477bb42..d643964 100644
--- a/orkbasecxx/messages/Message.cpp
+++ b/orkbasecxx/messages/Message.cpp
@@ -13,7 +13,7 @@
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#include "serializers/XmlRpcSerializer.h"
#include "Message.h"
diff --git a/orkbasecxx/messages/Message.h b/orkbasecxx/messages/Message.h
index e15fda8..cae8f73 100644
--- a/orkbasecxx/messages/Message.h
+++ b/orkbasecxx/messages/Message.h
@@ -14,10 +14,10 @@
#ifndef __MESSAGE_H__
#define __MESSAGE_H__
-//#ifdef WIN32
+#ifdef WIN32
#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#pragma warning( disable: 4018 ) // signed/unsigned mismatch
-//#endif
+#endif
#include "dll.h"
#include "OrkBase.h"
diff --git a/orkbasecxx/messages/SyncMessage.h b/orkbasecxx/messages/SyncMessage.h
index 0683364..9af3c34 100644
--- a/orkbasecxx/messages/SyncMessage.h
+++ b/orkbasecxx/messages/SyncMessage.h
@@ -11,7 +11,7 @@
*
*/
-#pragma warning( disable: 4786 )
+//#pragma warning( disable: 4786 )
#ifndef __SYNCMESSAGE_H__
#define __SYNCMESSAGE_H__
diff --git a/orkbasecxx/messages/TapeMsg.cpp b/orkbasecxx/messages/TapeMsg.cpp
index 142e67b..0d3f07b 100644
--- a/orkbasecxx/messages/TapeMsg.cpp
+++ b/orkbasecxx/messages/TapeMsg.cpp
@@ -10,7 +10,7 @@
* Please refer to http://www.gnu.org/copyleft/gpl.html
*
*/
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#define _WINSOCKAPI_ // prevents the inclusion of winsock.h
diff --git a/orkbasecxx/serializers/Serializer.cpp b/orkbasecxx/serializers/Serializer.cpp
index 3318833..df066b0 100644
--- a/orkbasecxx/serializers/Serializer.cpp
+++ b/orkbasecxx/serializers/Serializer.cpp
@@ -318,7 +318,7 @@ void Serializer::GetCsv(const char* key, std::list<CStdString>& value, bool req
CStdString element;
bool first = true;
GetString(key, stringValue, required);
- for(int i=0; i<stringValue.length(); i++)
+ for(unsigned int i=0; i<stringValue.length(); i++)
{
TCHAR c = stringValue[i];
if(c == ',')
@@ -404,7 +404,7 @@ void Serializer::GetIpRanges(const char* key, IpRanges& value, bool required)
// Escape the comma and percent characters for adding string to csv list
void Serializer::EscapeCsv(CStdString& in, CStdString& out)
{
- for(int i=0; i<in.length();i++)
+ for(unsigned int i=0; i<in.length();i++)
{
TCHAR c = in[i];
if (c == ',')
@@ -425,7 +425,7 @@ void Serializer::EscapeCsv(CStdString& in, CStdString& out)
// Unescape the comma and percent characters when retrieving from csv list
void Serializer::UnEscapeCsv(CStdString& in, CStdString& out)
{
- int iin = 0;
+ unsigned int iin = 0;
while(iin<in.length())
{
@@ -455,7 +455,7 @@ void Serializer::UnEscapeCsv(CStdString& in, CStdString& out)
// Escape the colon and percent characters for adding string to a pair of the form "key:value"
void Serializer::EscapePair(CStdString& in, CStdString& out)
{
- for(int i=0; i<in.length();i++)
+ for(unsigned int i=0; i<in.length();i++)
{
TCHAR c = in[i];
if (c == ':')
@@ -476,7 +476,7 @@ void Serializer::EscapePair(CStdString& in, CStdString& out)
// UnEscape the colon and percent characters after retrieving a key or value from a pair of the form "key:value"
void Serializer::UnEscapePair(CStdString& in, CStdString& out)
{
- int iin = 0;
+ unsigned int iin = 0;
while(iin<in.length())
{
diff --git a/orkbasecxx/serializers/Serializer.h b/orkbasecxx/serializers/Serializer.h
index fc60b02..023e695 100644
--- a/orkbasecxx/serializers/Serializer.h
+++ b/orkbasecxx/serializers/Serializer.h
@@ -14,7 +14,7 @@
#ifndef __SERIALIZER_H__
#define __SERIALIZER_H__
-#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
+//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
#include "Utils.h"
#include "dll.h"
diff --git a/orkbasecxx/serializers/SingleLineSerializer.cpp b/orkbasecxx/serializers/SingleLineSerializer.cpp
index 807f572..f60156d 100644
--- a/orkbasecxx/serializers/SingleLineSerializer.cpp
+++ b/orkbasecxx/serializers/SingleLineSerializer.cpp
@@ -45,7 +45,7 @@ void SingleLineSerializer::DeSerialize(CStdString& input)
input.Trim();
- for(int i=0; i<input.length() && state!= SingleLineErrorState; i++)
+ for(unsigned int i=0; i<input.length() && state!= SingleLineErrorState; i++)
{
TCHAR character = input[i];
@@ -125,7 +125,7 @@ void SingleLineSerializer::DeSerialize(CStdString& input)
// Escape the space, equals and percent characters for serializing to Key-Value-Pair text
void SingleLineSerializer::EscapeSingleLine(CStdString& in, CStdString& out)
{
- for(int i=0; i<in.length();i++)
+ for(unsigned int i=0; i<in.length();i++)
{
TCHAR c = in[i];
if (c == ' ')
@@ -150,7 +150,7 @@ void SingleLineSerializer::EscapeSingleLine(CStdString& in, CStdString& out)
// Unescape the space, equals and percent characters for serializing to Key-Value-Pair text
void SingleLineSerializer::UnEscapeSingleLine(CStdString& in, CStdString& out)
{
- int iin = 0;
+ unsigned int iin = 0;
while(iin<in.length())
{
diff --git a/orkbasecxx/serializers/UrlSerializer.cpp b/orkbasecxx/serializers/UrlSerializer.cpp
index b80024a..6cabccd 100644
--- a/orkbasecxx/serializers/UrlSerializer.cpp
+++ b/orkbasecxx/serializers/UrlSerializer.cpp
@@ -48,7 +48,7 @@ void UrlSerializer::DeSerialize(CStdString& input)
input.Trim();
- for(int i=0; i<input.length() && state!= UrlErrorState; i++)
+ for(unsigned int i=0; i<input.length() && state!= UrlErrorState; i++)
{
TCHAR character = input[i];
@@ -130,7 +130,7 @@ void UrlSerializer::EscapeUrl(CStdString& in, CStdString& out)
// Translates all the characters that are not in url_ok_chars string into %xx sequences
// %xx specifies the character ascii code in hexadecimal
out = "";
- for (int i = 0 ; i<in.size() ; i++)
+ for (unsigned int i = 0 ; i<in.size() ; i++)
{
if (in.GetAt(i) == ' ')
out += '+';
@@ -150,7 +150,7 @@ void UrlSerializer::UnEscapeUrl(CStdString& in, CStdString& out)
// Translates all %xx escaped sequences to corresponding ascii characters
out = "";
char pchHex[3];
- for (int i = 0; i<in.size(); i++)
+ for (unsigned int i = 0; i<in.size(); i++)
{
switch (in.GetAt(i))
{