HPCC-14421 Fix various warnings reported by -Wconversion

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

common/deftype/defvalue.cpp

@@ -537,7 +537,7 @@ bool StringValue::getBoolValue()
 
 __int64 StringValue::getIntValue()
 {
-    return rtlStrToInt8(val.length(), (const char *)val.get());
+    return rtlStrToInt8((size32_t)val.length(), (const char *)val.get());
 }
 
 const char *StringValue::getStringValue(StringBuffer &out)
@@ -722,7 +722,7 @@ const char *UnicodeValue::getStringValue(StringBuffer &out)
 
 void * UnicodeValue::getUCharStringValue(unsigned len, void * out)
 {
-    unsigned vallen = val.length()/2;
+    size_t vallen = val.length()/2;
     if(vallen > len)
         vallen = len;
     memcpy(out, val.get(), vallen*2);
@@ -740,7 +740,7 @@ const char *UnicodeValue::getCodepageValue(StringBuffer &out, char const * codep
 {
     char * buff;
     unsigned bufflen;
-    rtlUnicodeToCodepageX(bufflen, buff, val.length()/2, (UChar const *)val.get(), codepage);
+    rtlUnicodeToCodepageX(bufflen, buff, (size32_t)(val.length()/2), (UChar const *)val.get(), codepage);
     out.append(bufflen, buff);
     rtlFree(buff);
     return out.str();
@@ -1062,7 +1062,7 @@ size32_t Utf8Value::getSize()
     unsigned size = rtlUtf8Size(type->getStringLen(), val.get());
     assertex(size == val.length());
 #endif
-    return val.length();
+    return (size32_t)val.length();
 }
 
 const void *Utf8Value::queryValue() const
@@ -1232,7 +1232,7 @@ DataValue::DataValue(const void *v, ITypeInfo *_type) : MemoryValue(v, _type)
 const char *DataValue::generateECL(StringBuffer &out)
 {
     out.append("X'");
-    appendDataAsHex(out, val.length(), val.get());
+    appendDataAsHex(out, (size32_t)val.length(), val.get());
     out.append('\'');
     return out.str();
 }
@@ -1322,7 +1322,7 @@ bool DataValue::getBoolValue()
 
 const char *DataValue::getStringValue(StringBuffer &out)
 {
-    appendDataAsHex(out, val.length(), val.get());
+    appendDataAsHex(out, (size32_t)val.length(), val.get());
     return out.str();
 }
 

common/fileview2/fvresultset.cpp

@@ -713,7 +713,7 @@ IResultSetCursor * CResultSetBase::createCursor()
 IResultSetCursor * CResultSetBase::createCursor(IDataVal & savedCursor)
 {
     MemoryBuffer buffer;
-    buffer.append(savedCursor.length(), savedCursor.data());
+    buffer.append((size32_t)savedCursor.length(), savedCursor.data());
 
     byte version;
     unsigned column;
@@ -2584,14 +2584,14 @@ bool CColumnFilter::optimizeFilter(IFvDataSource * dataSource)
     ForEachItemIn(i, values)
     {
         MemoryAttr & cur = values.item(i);
-        if (!dataSource->addFilter(whichColumn, subLen, cur.length(), cur.get()))
+        if (!dataSource->addFilter(whichColumn, subLen, (size32_t)cur.length(), cur.get()))
             optimized = false;
     }
     return optimized;
 }
 
 
-bool CColumnFilter::matches(const byte * rowValue, unsigned valueSize, const byte * value)
+bool CColumnFilter::matches(const byte * rowValue, size32_t valueSize, const byte * value)
 {
     unsigned size = type->getSize();
     unsigned len;
@@ -2656,7 +2656,7 @@ bool CColumnFilter::isValid(const byte * rowValue, const unsigned * offsets)
     ForEachItemIn(i, values)
     {
         MemoryAttr & cur = values.item(i);
-        if (matches(columnValue, cur.length(), (const byte *)cur.get()))
+        if (matches(columnValue, (size32_t)cur.length(), (const byte *)cur.get()))
             return true;
     }
 
@@ -2807,7 +2807,7 @@ CFetchFilteredResultSet::CFetchFilteredResultSet(IExtendedNewResultSet * _parent
     ForEachItemIn(i, _filter.values)
     {
         const MemoryAttrItem & value = _filter.values.item(i);
-        unsigned __int64 offset = rtlStrToUInt8(value.length(), static_cast<const char *>(value.get()));
+        unsigned __int64 offset = rtlStrToUInt8((size32_t)value.length(), static_cast<const char *>(value.get()));
         validOffsets.append(offset);
     }
 }
@@ -2882,7 +2882,7 @@ INewResultSet * CFilteredResultSetBuilder::create()
             ForEachItemIn(j, cur.values)
             {
                 MemoryAttrItem & curValue = cur.values.item(j);
-                next->addValue(curValue.length(), reinterpret_cast<const char *>(curValue.get()));
+                next->addValue((size32_t)curValue.length(), reinterpret_cast<const char *>(curValue.get()));
             }
 
             if (!cloned || !next->optimizeFilter(dataSource))
@@ -2928,7 +2928,7 @@ void CFilteredResultSetBuilder::addNaturalFilter(unsigned columnIndex, unsigned
         MemoryAttr source(len, value);
         MemoryAttr translated;
         translateValue(translated, source, column.setTransforms);
-        addFilter(columnIndex, translated.length(), static_cast<const char *>(translated.get()));
+        addFilter(columnIndex, (size32_t)translated.length(), static_cast<const char *>(translated.get()));
     }
     else
         addFilter(columnIndex, len, value);

common/fileview2/fvresultset.ipp

@@ -199,7 +199,7 @@ public:
     void serialize(MemoryBuffer & buffer);
 
 protected:
-    bool matches(const byte * rowValue, unsigned valueLen, const byte * value);
+    bool matches(const byte * rowValue, size32_t valueLen, const byte * value);
 
 protected:
     MemoryAttrArray values;

common/fileview2/fvtransform.cpp

@@ -137,7 +137,7 @@ void ViewFieldTransformer::transform(MemoryAttr & utfTarget, const MemoryAttr &
     unsigned lenTarget;
     char * target;
     const char * source = static_cast<const char *>(utfSrc.get());
-    unsigned lenSource = rtlUtf8Length(utfSrc.length(), source);
+    unsigned lenSource = rtlUtf8Length((size32_t)utfSrc.length(), source);
 
     transform(lenTarget, target, lenSource, source);
 
@@ -520,7 +520,7 @@ void ViewJoinColumn::addFilter(IFilteredResultSet * resultSet, const MemoryAttr
         translateValue(tempValue, value, setTransforms);
         source = &tempValue;
     }
-    resultSet->addFilter(whichColumn, source->length(), (const char *)source->get());
+    resultSet->addFilter(whichColumn, (size32_t)source->length(), (const char *)source->get());
 }
 
 void ViewJoinColumn::clearFilter(IFilteredResultSet * resultSet)

common/thorhelper/layouttrans.cpp

@@ -728,7 +728,7 @@ CacheKey::CacheKey(size32_t _s1, void const * _d1, size32_t _s2, void const * _d
 }
 
 CacheValue::CacheValue(size32_t s1, void const * d1, size32_t s2, void const * d2, IRecordLayoutTranslator * _trans)
-    : b1(s1, d1), b2(s2, d2), key(b1.length(), b1.get(), b2.length(), b2.get()), trans(_trans)
+    : b1(s1, d1), b2(s2, d2), key((size32_t)b1.length(), b1.get(), (size32_t)b2.length(), b2.get()), trans(_trans)
 {
 }
 

common/thorhelper/thorrparse.cpp

@@ -884,7 +884,7 @@ void RegexUnicodePattern::toXMLattr(StringBuffer & out, RegexXmlState & state)
     RegexPattern::toXMLattr(out, state);
 
     out.appendf(" text=\"");
-    encodeUnicode(out, text.length()/2, (const UChar *)text.get());
+    encodeUnicode(out, (size32_t)(text.length()/2), (const UChar *)text.get());
     out.append("\"");
 }
 
@@ -894,7 +894,7 @@ inline bool RegexUnicodePattern::doMatch(RegexState & state)
 {
     const byte * cur = state.cur;
     const byte * end = state.end;
-    unsigned len = text.length();
+    size32_t len = (size32_t)text.length();
     if (cur + len <= end)
     {
         if (memcmp(cur, text.get(), len) == 0)
@@ -954,7 +954,7 @@ void RegexUnicodeIPattern::toXMLattr(StringBuffer & out, RegexXmlState & state)
     RegexPattern::toXMLattr(out, state);
 
     out.appendf(" text=\"");
-    encodeUnicode(out, lower.length()/2, (const UChar *)lower.get());
+    encodeUnicode(out, (size32_t)(lower.length()/2), (const UChar *)lower.get());
     out.append("\"");
 }
 
@@ -965,7 +965,7 @@ inline bool RegexUnicodeIPattern::doMatch(RegexState & state)
     const byte * start = state.cur;
     const byte * end = state.end;
 
-    unsigned size = lower.length();
+    size32_t size = (size32_t)lower.length();
     if (start + size <= end)
     {
         unsigned i;
@@ -1082,7 +1082,7 @@ void RegexUtf8Pattern::toXMLattr(StringBuffer & out, RegexXmlState & state)
     RegexPattern::toXMLattr(out, state);
 
     out.appendf(" text=\"");
-    encodeXML((const char *)text.get(), out, ENCODE_WHITESPACE, text.length(), true);
+    encodeXML((const char *)text.get(), out, ENCODE_WHITESPACE, (size32_t)text.length(), true);
     out.append("\"");
 }
 
@@ -1092,7 +1092,7 @@ inline bool RegexUtf8Pattern::doMatch(RegexState & state)
 {
     const byte * cur = state.cur;
     const byte * end = state.end;
-    unsigned size = text.length();
+    size32_t size = (size32_t)text.length();
     if (cur + size <= end)
     {
         if (memcmp(cur, text.get(), size) == 0)
@@ -1156,7 +1156,7 @@ void RegexUtf8IPattern::toXMLattr(StringBuffer & out, RegexXmlState & state)
     RegexPattern::toXMLattr(out, state);
 
     out.appendf(" text=\"");
-    encodeUnicode(out, lower.length()/2, (const UChar *)lower.get());
+    encodeUnicode(out, (size32_t)(lower.length()/2), (const UChar *)lower.get());
     out.append("\"");
 }
 
@@ -1166,8 +1166,8 @@ inline bool RegexUtf8IPattern::doMatch(RegexState & state)
 {
     const byte * end = state.end;
 
-    unsigned size = lower.length();
-    unsigned len = size/sizeof(UChar);
+    size32_t size = (size32_t)lower.length();
+    size32_t len = size/(size32_t)sizeof(UChar);
     const byte * cur = state.cur;
     const UChar * curLower = (const UChar *)lower.get();
     const UChar * curUpper = (const UChar *)upper.get();

common/thorhelper/thortparse.cpp

@@ -55,7 +55,7 @@ bool GrammarSymbol::canMerge(const GrammarSymbol * other)
     }
 
     assertex(features.info == other->features.info);
-    unsigned len = features.values.length();
+    size_t len = features.values.length();
     return memcmp(features.values.get(), other->features.values.get(), len) == 0;
 }
 
@@ -119,7 +119,7 @@ NonTerminal::NonTerminal(symbol_id _id, IAtom * _name, FeatureValue & _features,
     }
 
     name = _name;
-    unsigned len = _features.values.length();
+    size_t len = _features.values.length();
     features.info = _features.info;
     if (len)
         features.values.setOwn(len, _features.values.detach());

dali/base/dasubs.cpp

@@ -463,7 +463,7 @@ public:
         mb.append(fn).append(tag).append(id);
         queryMyNode()->serialize(mb);
         const MemoryAttr &data = subs->queryData();
-        size32_t dlen = data.length();
+        size32_t dlen = (size32_t)data.length();
         mb.append(dlen);
         mb.append(dlen,data.get());
         try

dali/ft/fttransform.cpp

@@ -674,7 +674,7 @@ void TransferServer::transferChunk(unsigned chunkIndex)
     if (startOutOffset != curPartition.outputOffset+curProgress.outputLength)
         throwError4(DFTERR_OutputOffsetMismatch, out->tell(), curPartition.outputOffset+curProgress.outputLength, "start", chunkIndex);
     
-    unsigned fixedTextLength = curPartition.fixedText.length();
+    size32_t fixedTextLength = (size32_t)curPartition.fixedText.length();
     if (fixedTextLength || curPartition.inputName.isNull())
     {
         out->write(fixedTextLength, curPartition.fixedText.get());

ecl/hql/hqlexpr.ipp

@@ -478,7 +478,7 @@ public:
     virtual size32_t length() 
     { 
         ensureLoaded();
-        return fileContents.length()-1;
+        return (size32_t)(fileContents.length()-1);
     }
 
 private:

ecl/hqlcpp/hqlres.cpp

@@ -492,7 +492,7 @@ bool ResourceManager::flush(StringBuffer &filename, const char *basename, bool f
         ForEachItemIn(idx, resources)
         {
             ResourceItem&s = (ResourceItem&)resources.item(idx);
-            unsigned len = s.data.length();
+            unsigned len = (unsigned)s.data.length();
             unsigned id = s.id;
             StringBuffer baseName;
             baseName.append(s.type).append("_").append(id);

ecl/hthor/hthor.cpp

@@ -8113,7 +8113,7 @@ bool CHThorDiskReadBaseActivity::openNext()
                     {
                         Owned<IExpander> eexp;
                         if (encryptionkey.length()!=0) 
-                            eexp.setown(createAESExpander256(encryptionkey.length(),encryptionkey.bufferBase()));
+                            eexp.setown(createAESExpander256((size32_t)encryptionkey.length(),encryptionkey.bufferBase()));
                         inputfileio.setown(createCompressedFileReader(inputfile,eexp));
                         if(!inputfileio && !blockcompressed) //fall back to old decompression, unless dfs marked as new
                         {
@@ -8160,7 +8160,7 @@ bool CHThorDiskReadBaseActivity::openNext()
             {
                 Owned<IExpander> eexp;
                 if (encryptionkey.length()) 
-                    eexp.setown(createAESExpander256(encryptionkey.length(),encryptionkey.bufferBase()));
+                    eexp.setown(createAESExpander256((size32_t) encryptionkey.length(),encryptionkey.bufferBase()));
                 inputfileio.setown(createCompressedFileReader(inputfile,eexp));
                 if(!inputfileio && !blockcompressed) //fall back to old decompression, unless dfs marked as new
                 {

ecl/hthor/hthorkey.cpp

@@ -1829,7 +1829,7 @@ public:
                     unsigned __int64 expectedSize;
                     Owned<IExpander> eexp;
                     if (encryptionkey.length()!=0) {
-                        eexp.setown(createAESExpander256(encryptionkey.length(),encryptionkey.get()));
+                        eexp.setown(createAESExpander256((size32_t)encryptionkey.length(),encryptionkey.get()));
                         blockcompressed = true;
                     }
                     if(blockcompressed)

rtl/eclrtl/eclrtl.cpp

@@ -440,10 +440,10 @@ void normalizeUnicodeString(UnicodeString const & in, UnicodeString & out)
 
 // padding
 
-void multimemset(char * out, unsigned outlen, char const * in, unsigned inlen)
+static void multimemset(char * out, size_t outlen, char const * in, size_t inlen)
 {
-    unsigned outpos = 0;
-    unsigned inpos = 0;
+    size_t outpos = 0;
+    size_t inpos = 0;
     while(outpos < outlen)
     {
         out[outpos++] = in[inpos++];
@@ -468,14 +468,14 @@ MODULE_EXIT()
 
 UChar unicodeSpace = 0x0020;
 
-void codepageBlankFill(char const * codepage, char * out, unsigned len)
+void codepageBlankFill(char const * codepage, char * out, size_t len)
 {
     CriticalBlock b(ubcCrit);
     MemoryAttr * cached = unicodeBlankCache->getValue(codepage);
     if(cached)
     {
         char const * blank = (char const *)cached->get();
-        size32_t blanklen = cached->length();
+        size_t blanklen = cached->length();
         if(blanklen==1)
             memset(out, *blank, len);
         else

system/jlib/jbuff.cpp

@@ -365,12 +365,13 @@ MemoryBuffer & MemoryBuffer::_reverse()
     return *this;
 }
 
-void MemoryBuffer::setBuffer(size32_t len, void * _buffer, bool takeOwnership)
+void MemoryBuffer::setBuffer(size_t len, void * _buffer, bool takeOwnership)
 {
+    assertex((size32_t)len == len);
     kill();
     buffer = (char *) _buffer;
     if (len) assertex(buffer);
-    curLen = maxLen = len;
+    curLen = maxLen = (size32_t)len;
     ownBuffer = takeOwnership;
     readPos = 0;
 }
@@ -436,10 +437,11 @@ void MemoryBuffer::swapWith(MemoryBuffer & other)
 //-----------------------------------------------------------------------
 
 
-MemoryBuffer::MemoryBuffer(size32_t initial)
+MemoryBuffer::MemoryBuffer(size_t initial)
 {
+    assertex((size32_t)initial == initial);
     init();
-    _realloc(initial);
+    _realloc((size32_t)initial);
 }
 
 MemoryBuffer::MemoryBuffer(MemoryBuffer & value)
@@ -447,10 +449,11 @@ MemoryBuffer::MemoryBuffer(MemoryBuffer & value)
     assertex(!"This should never be used");
 }
 
-MemoryBuffer::MemoryBuffer(size32_t len, const void * newBuffer)
+MemoryBuffer::MemoryBuffer(size_t len, const void * newBuffer)
 {
     init();
-    append(len, newBuffer);
+    assertex((size32_t)len == len);
+    append((size32_t)len, newBuffer);
 }
 
 MemoryBuffer & MemoryBuffer::append(char value)
@@ -855,7 +858,7 @@ bool MemoryBuffer::setSwapEndian(bool swap)
 
 MemoryBuffer & serialize(MemoryBuffer & buffer, const MemoryAttr & value)
 {
-    unsigned length = value.length();
+    size32_t length = (size32_t)value.length();
     buffer.append(length).append(length, value.get());
     return buffer;
 }

system/jlib/jbuff.hpp

@@ -135,8 +135,8 @@ class jlib_decl MemoryBuffer
 {
 public:
     inline MemoryBuffer()  { init(); }
-    MemoryBuffer(size32_t initial);
-    MemoryBuffer(size32_t len, const void * buffer);
+    MemoryBuffer(size_t initial);
+    MemoryBuffer(size_t len, const void * buffer);
     inline ~MemoryBuffer() { kill(); }
     
     MemoryBuffer &  rewrite(size32_t pos = 0);
@@ -202,7 +202,7 @@ public:
     inline size32_t remaining() const { return curLen - readPos; }
 
     void            resetBuffer();
-    void            setBuffer(size32_t len, void * buffer, bool takeOwnership=false);
+    void            setBuffer(size_t len, void * buffer, bool takeOwnership=false);
     void            setLength(unsigned len);
     void            setWritePos(unsigned len);      // only use for back patching data
     void *          detach();
@@ -248,7 +248,7 @@ private:
 class jlib_decl DelayedSizeMarker
 {
     MemoryBuffer &mb;
-    unsigned pos;
+    size32_t pos;
 public:
     DelayedSizeMarker(MemoryBuffer &_mb) : mb(_mb)
     {
@@ -261,7 +261,7 @@ public:
     }
     inline size32_t size() const
     {
-        return mb.length() - (pos + sizeof(size32_t));
+        return (size32_t)(mb.length() - (pos + sizeof(size32_t)));
     }
     // resets position marker and writes another size to be filled subsequently by write()
     inline void restart()
@@ -287,9 +287,9 @@ public:
 
     virtual const void * data() const { return buffer.toByteArray(); }
     virtual void clear() { } // clearing when appending does nothing
-    virtual void setLen(const void * val, unsigned length) { buffer.append(length, val); }
-    virtual unsigned length() const { return buffer.length(); }
-    virtual void * reserve(unsigned length) { return buffer.reserveTruncate(length); }
+    virtual void setLen(const void * val, size_t length) { buffer.append((size32_t)length, val); }
+    virtual size_t length() const { return buffer.length(); }
+    virtual void * reserve(size_t length) { return buffer.reserveTruncate((size32_t)length); }
 
 private:
     MemoryBuffer & buffer;
@@ -305,7 +305,7 @@ public:
      virtual void set(const char *val) { attr.set(strlen(val), val); }
      virtual void clear() { attr.clear(); } // clearing when appending does nothing
      virtual void setLen(const char *val, unsigned length) { attr.set(length, val); }
-     virtual unsigned length() const { return attr.length(); };
+     virtual unsigned length() const { return (size32_t)attr.length(); };
 
 protected:
      MemoryAttr & attr;
@@ -319,12 +319,12 @@ public:
 
     virtual const void * data() const { return *pData; };
     virtual void clear() { free(*pData); *pData = NULL; *pLen = 0; };
-    virtual void setLen(const void * val, unsigned length) { free(*pData); *pData = malloc(length); memcpy(*pData, val, length); *pLen = length; }
-    virtual unsigned length() const { return *pLen; };
-    virtual void * reserve(unsigned length) { free(*pData); *pData = malloc(length); *pLen = length; return *pData; }
+    virtual void setLen(const void * val, size_t length) { free(*pData); *pData = malloc(length); memcpy(*pData, val, length); *pLen = (size32_t)length; }
+    virtual size_t length() const { return *pLen; };
+    virtual void * reserve(size_t length) { free(*pData); *pData = malloc(length); *pLen = (size32_t)length; return *pData; }
 
 private:
-    unsigned * pLen;
+    unsigned * pLen; // Should really be a size_t
     void * * pData;
 };
 
@@ -332,17 +332,17 @@ private:
 class jlib_decl Fixed2IDataVal : public CInterface, implements IDataVal
 {
 public:
-    Fixed2IDataVal(unsigned _len, void * _ptr) { len = _len; ptr = _ptr; }
+    Fixed2IDataVal(size_t _len, void * _ptr) { len = _len; ptr = _ptr; }
     IMPLEMENT_IINTERFACE;
 
     virtual const void * data() const { return ptr; };
     virtual void clear() { memset(ptr, 0, len); };
-    virtual void setLen(const void * val, unsigned length) { assertex(length <= len); memcpy(ptr, val, length); }
-    virtual unsigned length() const { return len; };
-    virtual void * reserve(unsigned length) { assertex(length <= len); return ptr; }
+    virtual void setLen(const void * val, size_t length) { assertex(length <= len); memcpy(ptr, val, length); }
+    virtual size_t length() const { return len; };
+    virtual void * reserve(size_t length) { assertex(length <= len); return ptr; }
 
 private:
-    unsigned len;
+    size_t len;
     void * ptr;
 };
 

system/jlib/jencrypt.cpp

@@ -1754,26 +1754,27 @@ inline const char *getAesErrorText(int err)
     return (err<0 && abs(err)<8) ? aesErrorText[abs(err)] : "unknown";
 }
 
-inline Rijndael::KeyLength getAesKeyType(unsigned char keylen)
+inline Rijndael::KeyLength getAesKeyType(size_t keylen)
 {
     if (keylen==16)
         return Rijndael::Key16Bytes;
     if (keylen==24)
         return Rijndael::Key24Bytes;
     if (keylen < 32)
-        throw MakeStringException(-1,"AES Encryption error: %d is not a valid key length", keylen);
+        throw MakeStringException(-1,"AES Encryption error: %d is not a valid key length", (unsigned)keylen);
 
     return Rijndael::Key32Bytes;
 }
 
 
-MemoryBuffer &aesEncrypt(const void *key, unsigned keylen, const void *input, unsigned inlen, MemoryBuffer &output)
+MemoryBuffer &aesEncrypt(const void *key, size_t keylen, const void *input, size_t inlen, MemoryBuffer &output)
 {
     Rijndael rin;
     Rijndael::KeyLength keyType = getAesKeyType(keylen);
     
     rin.init(Rijndael::CBC, Rijndael::Encrypt, (const UINT8 *)key, keyType);
-    int len = rin.padEncrypt((const UINT8 *)input, inlen, (UINT8 *) output.clear().reserveTruncate(inlen + 16));
+    size32_t truncInLen = (size32_t)inlen; //MORE: Modify the padEncrypt function
+    int len = rin.padEncrypt((const UINT8 *)input, truncInLen, (UINT8 *) output.clear().reserveTruncate(truncInLen + 16));
 
     if(len >= 0)
         output.setLength(len);
@@ -1784,13 +1785,14 @@ MemoryBuffer &aesEncrypt(const void *key, unsigned keylen, const void *input, un
 }
 
 
-MemoryBuffer &aesDecrypt(const void *key, unsigned keylen, const void *input, unsigned inlen, MemoryBuffer &output)
+MemoryBuffer &aesDecrypt(const void *key, size_t keylen, const void *input, size_t inlen, MemoryBuffer &output)
 {
     Rijndael rin;
     Rijndael::KeyLength keyType = getAesKeyType(keylen);
     
     rin.init(Rijndael::CBC, Rijndael::Decrypt, (const UINT8 *)key, keyType);
-    int len = rin.padDecrypt((const UINT8 *)input, inlen, (UINT8 *) output.clear().reserveTruncate(inlen));
+    size32_t truncInLen = (size32_t)inlen;
+    int len = rin.padDecrypt((const UINT8 *)input, truncInLen, (UINT8 *) output.clear().reserveTruncate(truncInLen));
 
     if(len >= 0)
         output.setLength(len);

system/jlib/jencrypt.hpp

@@ -26,8 +26,8 @@
 
 //for AES, keylen must be 16, 24, or 32 Bytes
 
-extern jlib_decl MemoryBuffer &aesEncrypt(const void *key, unsigned keylen, const void *input, unsigned inlen, MemoryBuffer &output);
-extern jlib_decl MemoryBuffer &aesDecrypt(const void *key, unsigned keylen, const void *input, unsigned inlen, MemoryBuffer &output);
+extern jlib_decl MemoryBuffer &aesEncrypt(const void *key, size_t keylen, const void *input, size_t inlen, MemoryBuffer &output);
+extern jlib_decl MemoryBuffer &aesDecrypt(const void *key, size_t keylen, const void *input, size_t inlen, MemoryBuffer &output);
 
 #define encrypt _LogProcessError12
 #define decrypt _LogProcessError15
@@ -43,15 +43,15 @@ class Csimplecrypt
     unsigned n;
     size32_t blksize;
 public:
-    Csimplecrypt(const byte *key, size32_t keysize, size32_t blksize)
+    Csimplecrypt(const byte *key, size32_t keysize, size32_t _blksize)
     {
-        n = blksize/sizeof(unsigned);
-        blksize = n*sizeof(unsigned);
+        n = (unsigned)(_blksize/sizeof(unsigned));
+        blksize = (size32_t)(n*sizeof(unsigned));
         r = (unsigned *)malloc(blksize);
         byte * z = (byte *)r;
         size32_t ks = keysize;
         const byte *k = key;
-        for (unsigned i=0;i<blksize;i++) {
+        for (size32_t i=0;i<blksize;i++) {
             z[i] = (byte)(*k+i);
             if (--ks==0) {
                 k = key;

system/jlib/jhash.ipp

@@ -112,7 +112,7 @@ class jlib_decl LowerCaseAtom : public Atom
     LowerCaseAtom(const void * k) : Atom(k)
     { 
         for (byte * cur = (byte *)key; *cur; cur++)
-            *cur = tolower(*cur);
+            *cur = (byte)tolower(*cur);
     }
 };
 

system/jlib/jlog.hpp

@@ -390,7 +390,7 @@ public:
     inline unsigned           queryUSecs() const { return 0; }
 #else
     inline time_t             queryTime() const { return timeStarted.tv_sec; }
-    inline unsigned           queryUSecs() const { return timeStarted.tv_usec; }
+    inline unsigned           queryUSecs() const { return (unsigned)timeStarted.tv_usec; }
 #endif
     inline unsigned           queryProcessID() const { return processID; }
     inline unsigned           queryThreadID() const { return threadID; }

system/jlib/jptree.cpp

@@ -496,7 +496,7 @@ IPTreeException *MakeIPTException(int code, const char *format, ...)
     return e;
 }
 
-IPTreeException *MakeXPathException(const char *xpath, int code, unsigned pos, const char *format, ...)
+IPTreeException *MakeXPathException(const char *xpath, int code, size_t pos, const char *format, ...)
 {
     va_list args;
     va_start(args, format);
@@ -508,7 +508,7 @@ IPTreeException *MakeXPathException(const char *xpath, int code, unsigned pos, c
 #endif
     const char *msg = "in xpath = ";
     s.append("\n").append(msg).append(xpath);
-    s.append("\n").appendN((size32_t)strlen(msg)+pos, ' ').append("^");
+    s.append("\n").appendN((size32_t)(strlen(msg)+pos), ' ').append("^");
     return MakeIPTException(code, s.str());
 }
 
@@ -878,9 +878,9 @@ MemoryBuffer &CPTValue::getValue(MemoryBuffer &tgt, bool binary) const
     else
     {
         if (binary)
-            tgt.append(length(), get());
+            tgt.append((size32_t)length(), get());
         else
-            tgt.append(length()-1, get());
+            tgt.append((size32_t)length()-1, get());
     }
 
     return tgt;
@@ -908,9 +908,9 @@ StringBuffer &CPTValue::getValue(StringBuffer &tgt, bool binary) const
     else
     {
         if (binary) // this should probably be an assert?
-            tgt.append(length(), (const char *)get());
+            tgt.append((size32_t)length(), (const char *)get());
         else if (length())
-            tgt.append(length()-1, (const char *)get());
+            tgt.append((size32_t)length()-1, (const char *)get());
     }
 
     return tgt;
@@ -925,7 +925,7 @@ size32_t CPTValue::queryValueSize() const
         return sz;
     }
     else
-        return length();
+        return (size32_t)length();
 }
 
 ///////////////////

system/jlib/jptree.ipp

@@ -154,7 +154,7 @@ interface IPTArrayValue
     virtual void removeElement(unsigned idx) = 0;
     virtual unsigned elements() const = 0;
     virtual const void *queryValueRaw() const = 0;
-    virtual unsigned queryValueRawSize() const = 0;
+    virtual size32_t queryValueRawSize() const = 0;
 
     virtual void serialize(MemoryBuffer &tgt) = 0;
     virtual void deserialize(MemoryBuffer &src) = 0;
@@ -175,7 +175,7 @@ public:
     virtual void removeElement(unsigned idx) { remove(idx); }
     virtual unsigned elements() const { return ordinality(); }
     virtual const void *queryValueRaw() const { UNIMPLEMENTED; return NULL; }
-    virtual unsigned queryValueRawSize() const { UNIMPLEMENTED; return 0; }
+    virtual size32_t queryValueRawSize() const { UNIMPLEMENTED; return 0; }
 
 // serializable
     virtual void serialize(MemoryBuffer &tgt) { UNIMPLEMENTED; }
@@ -204,7 +204,7 @@ public:
     virtual void removeElement(unsigned idx) { UNIMPLEMENTED; }
     virtual unsigned elements() const {  UNIMPLEMENTED; return (unsigned)-1; }
     virtual const void *queryValueRaw() const { return get(); }
-    virtual unsigned queryValueRawSize() const { return length(); }
+    virtual size32_t queryValueRawSize() const { return (size32_t)length(); }
 
 // serilizable
     virtual void serialize(MemoryBuffer &tgt);

system/jlib/jscm.hpp

@@ -177,9 +177,9 @@ interface IDataVal
 {
     virtual const void * data() const = 0;
     virtual void clear() = 0;
-    virtual void setLen(const void * val, unsigned length) = 0;
-    virtual unsigned length() const = 0;
-    virtual void * reserve(unsigned length) = 0;
+    virtual void setLen(const void * val, size_t length) = 0;
+    virtual size_t length() const = 0;
+    virtual void * reserve(size_t length) = 0;
 };
 
 

system/jlib/jsocket.cpp

@@ -5250,7 +5250,7 @@ class CSocketBufferReader: public CInterface, implements ISocketBufferReader
         {
             CriticalBlock block(sect);
             assertex(pending);
-            size32_t sz = blk.length();
+            size32_t sz = (size32_t)blk.length();
             if (sz)
                 mb.setBuffer(sz,blk.detach(),true);
             pending = false;
@@ -5262,7 +5262,7 @@ class CSocketBufferReader: public CInterface, implements ISocketBufferReader
         }
         size32_t size()
         {
-            return blk.length();
+            return (size32_t)blk.length();
         }
         ISocket *getSocket() { return sock; }
     } *elems;

system/jlib/jstring.hpp

@@ -490,7 +490,7 @@ inline StringBuffer &appendJSONStringValue(StringBuffer& s, const char *name, un
 
 inline StringBuffer &appendJSONStringValue(StringBuffer& s, const char *name, const char *value, bool encode, bool quoted=true)
 {
-    return appendJSONStringValue(s, name, value ? strlen(value) : 0, value, encode, quoted);
+    return appendJSONStringValue(s, name, (size32_t)(value ? strlen(value) : 0), value, encode, quoted);
 }
 
 template <typename type>

system/jlib/jthread.hpp

@@ -121,7 +121,7 @@ public:
 #elif defined __FreeBSD__ || defined __APPLE__
         thandle = (int)(memsize_t)threadid;
 #else
-        thandle = threadid; 
+        thandle = (int)threadid;
 #endif
         tid = tidlog;
         return getName();