mirror/oatpp
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp.git synced 2025-01-18 16:43:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix comparison of signed and unsigned integers.

Browse Source
This commit is contained in:
Herman Zvonimir Došilović 2020-03-29 01:09:36 +01:00
parent 4a8e571e67
commit a40ea0b5c9
4 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/oatpp/core/base/StrBuffer.cpp
View File

@ -27,13 +27,13 @@
#include <fstream>
namespace oatpp { namespace base {
void StrBuffer::set(const void* data, v_buff_size size, bool hasOwnData) {
m_data = (p_char8) data;
m_size = size;
m_hasOwnData = hasOwnData;
}
void StrBuffer::setAndCopy(const void* data, const void* originData, v_buff_size size){
m_data = (p_char8) data;
m_size = size;
@ -58,7 +58,7 @@ std::shared_ptr<StrBuffer> StrBuffer::allocShared(const void* data, v_buff_size
}
return std::make_shared<StrBuffer>(data, size, copyAsOwnData);
}
p_char8 StrBuffer::allocStrBuffer(const void* originData, v_buff_size size, bool copyAsOwnData) {
if(copyAsOwnData) {
p_char8 data = new v_char8[size + 1];
@ -89,11 +89,11 @@ StrBuffer::~StrBuffer() {
}
m_data = nullptr;
}
std::shared_ptr<StrBuffer> StrBuffer::createShared(const void* data, v_buff_size size, bool copyAsOwnData) {
return allocShared(data, size, copyAsOwnData);
}
std::shared_ptr<StrBuffer> StrBuffer::createShared(const char* data, bool copyAsOwnData) {
return allocShared(data, std::strlen(data), copyAsOwnData);
}
@ -112,7 +112,7 @@ std::shared_ptr<StrBuffer> StrBuffer::createSharedConcatenated(const void* data1
std::memcpy(ptr->m_data + size1, data2, size2);
return ptr;
}
std::shared_ptr<StrBuffer> StrBuffer::loadFromFile(const char* filename) {
std::ifstream file (filename, std::ios::in|std::ios::binary|std::ios::ate);
if (file.is_open()) {
@ -121,7 +121,7 @@ std::shared_ptr<StrBuffer> StrBuffer::loadFromFile(const char* filename) {
file.read((char*)result->getData(), result->getSize());
file.close();
return result;
}
return nullptr;
}
@ -131,7 +131,7 @@ void StrBuffer::saveToFile(const char* filename) {
fs.write((const char*)m_data, m_size);
fs.close();
}
p_char8 StrBuffer::getData() const {
return m_data;
}
@ -143,15 +143,15 @@ v_buff_size StrBuffer::getSize() const {
const char* StrBuffer::c_str() const {
return (const char*) m_data;
}
std::string StrBuffer::std_str() const {
return std::string((const char*) m_data, m_size);
}
bool StrBuffer::hasOwnData() const {
return m_hasOwnData;
}
std::shared_ptr<StrBuffer> StrBuffer::toLowerCase() const {
const auto& ptr = allocShared(m_data, m_size, true);
lowerCase(ptr->m_data, ptr->m_size);
@ -163,7 +163,7 @@ std::shared_ptr<StrBuffer> StrBuffer::toUpperCase() const {
upperCase(ptr->m_data, ptr->m_size);
return ptr;
}
bool StrBuffer::equals(const void* data, v_buff_size size) const {
if(m_size == size) {
return equals(m_data, data, size);
@ -172,7 +172,7 @@ bool StrBuffer::equals(const void* data, v_buff_size size) const {
}
bool StrBuffer::equals(const char* data) const {
if(m_size == std::strlen(data)) {
if(static_cast<std::size_t>(m_size) == std::strlen(data)) {
return equals(m_data, data, m_size);
}
return false;
@ -205,7 +205,7 @@ bool StrBuffer::startsWith(StrBuffer* data) const {
}
// static
v_buff_size StrBuffer::compare(const void* data1, const void* data2, v_buff_size size) {
return std::memcmp(data1, data2, size);
}
@ -224,14 +224,14 @@ v_buff_size StrBuffer::compare(StrBuffer* str1, StrBuffer* str2) {
bool StrBuffer::equals(const void* data1, const void* data2, v_buff_size size) {
return (data1 == data2) || (std::memcmp(data1, data2, size) == 0);
}
bool StrBuffer::equals(const char* data1, const char* data2) {
if(data1 == data2) return true;
if(data1 == nullptr && data2 == nullptr) return false;
v_buff_size size = std::strlen(data1);
const auto size = std::strlen(data1);
return (size == std::strlen(data2) && std::memcmp(data1, data2, size) == 0);
}
bool StrBuffer::equals(StrBuffer* str1, StrBuffer* str2) {
return (str1 == str2) ||
(str1 != nullptr && str2 != nullptr && str1->m_size == str2->m_size &&
@ -251,14 +251,14 @@ bool StrBuffer::equalsCI(const void* data1, const void* data2, v_buff_size size)
}
return true;
}
bool StrBuffer::equalsCI(const char* data1, const char* data2) {
if(data1 == data2) return true;
if(data1 == nullptr && data2 == nullptr) return false;
v_buff_size size = std::strlen(data1);
const auto size = std::strlen(data1);
return (size == std::strlen(data2) && equalsCI(data1, data2, size) == 0);
}
bool StrBuffer::equalsCI(StrBuffer* str1, StrBuffer* str2) {
return (str1 == str2) ||
(str1 != nullptr && str2 != nullptr && str1->m_size == str2->m_size &&
@ -274,11 +274,11 @@ bool StrBuffer::equalsCI_FAST(const void* data1, const void* data2, v_buff_size
}
return true;
}
bool StrBuffer::equalsCI_FAST(const char* data1, const char* data2) {
if(data1 == data2) return true;
if(data1 == nullptr && data2 == nullptr) return false;
v_buff_size size = std::strlen(data1);
const auto size = std::strlen(data1);
return (size == std::strlen(data2) && equalsCI_FAST(data1, data2, size) == 0);
}
@ -288,7 +288,7 @@ bool StrBuffer::equalsCI_FAST(StrBuffer* str1, StrBuffer* str2) {
(str1->m_data == str2->m_data || equalsCI_FAST(str1->m_data, str2->m_data, str1->m_size))
);
}
bool StrBuffer::equalsCI_FAST(StrBuffer* str1, const char* str2) {
v_buff_size len = std::strlen(str2);
return (str1->getSize() == len && equalsCI_FAST(str1->m_data, str2, str1->m_size));
@ -307,5 +307,5 @@ void StrBuffer::upperCase(const void* data, v_buff_size size) {
if(a >= 'a' && a <= 'z') ((p_char8) data)[i] = a & 223;
}
}
}}

10
src/oatpp/core/data/buffer/Processor.cpp
View File

@ -88,7 +88,7 @@ void InlineWriteData::setEof() {
ProcessingPipeline::ProcessingPipeline(const std::vector<base::ObjectHandle<Processor>>& processors)
: m_processors(processors)
{
for(v_int32 i = 0; i < m_processors.size() - 1; i ++) {
for(v_uint32 i = 0; i < m_processors.size() - 1; i ++) {
m_intermediateData.push_back(data::buffer::InlineReadData());
}
}
@ -118,7 +118,7 @@ v_int32 ProcessingPipeline::iterate(data::buffer::InlineReadData& dataIn,
}
data::buffer::InlineReadData* currDataOut = &dataOut;
if(i < m_intermediateData.size()) {
if(i < static_cast<v_int32>(m_intermediateData.size())) {
currDataOut = &m_intermediateData[i];
}
@ -126,6 +126,8 @@ v_int32 ProcessingPipeline::iterate(data::buffer::InlineReadData& dataIn,
res = p->iterate(*currDataIn, *currDataOut);
}
const v_int32 numOfProcessors = m_processors.size();
switch (res) {
case Error::PROVIDE_DATA_IN:
if (i > 0) {
@ -136,7 +138,7 @@ v_int32 ProcessingPipeline::iterate(data::buffer::InlineReadData& dataIn,
case Error::FLUSH_DATA_OUT:
if (i < m_processors.size() - 1) {
if (i < numOfProcessors - 1) {
i ++;
res = Error::OK;
}
@ -144,7 +146,7 @@ v_int32 ProcessingPipeline::iterate(data::buffer::InlineReadData& dataIn,
case Error::FINISHED:
if (i < m_processors.size() - 1) {
if (i < numOfProcessors - 1) {
i ++;
res = Error::OK;
}

2
src/oatpp/parser/json/mapping/Deserializer.cpp
View File

@ -60,7 +60,7 @@ Deserializer::Deserializer(const std::shared_ptr<Config>& config)
}
void Deserializer::setDeserializerMethod(const data::mapping::type::ClassId& classId, DeserializerMethod method) {
auto id = classId.id;
const v_uint32 id = classId.id;
if(id < m_methods.size()) {
m_methods[id] = method;
} else {

2
src/oatpp/parser/json/mapping/Serializer.cpp
View File

@ -59,7 +59,7 @@ Serializer::Serializer(const std::shared_ptr<Config>& config)
}
void Serializer::setSerializerMethod(const data::mapping::type::ClassId& classId, SerializerMethod method) {
auto id = classId.id;
const v_uint32 id = classId.id;
if(id < m_methods.size()) {
m_methods[id] = method;
} else {