mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-13 18:12:50 -05:00
Code Issues Projects Releases Wiki Activity

Update base

Browse Source
This commit is contained in:
XMRig
2020-11-29 18:45:52 +07:00
parent bbcf8e2be3
commit 096b09bf4d
23 changed files with 124 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/base/tools/String.cpp
View File

@@ -1,12 +1,6 @@
/* XMRig
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,6 +24,21 @@
#include <cctype>
xmrig::String::String(const char *str, size_t size) :
m_size(size)
{
if (str == nullptr) {
m_size = 0;
return;
}
m_data = new char[m_size + 1];
memcpy(m_data, str, m_size);
m_data[m_size] = '\0';
}
xmrig::String::String(const char *str) :
m_size(str == nullptr ? 0 : strlen(str))
{
@@ -42,17 +51,18 @@ xmrig::String::String(const char *str) :
}
xmrig::String::String(const char *str, size_t size) :
m_size(size)
xmrig::String::String(const rapidjson::Value &value)
{
if (str == nullptr) {
m_size = 0;
if (!value.IsString()) {
return;
}
if ((m_size = value.GetStringLength()) == 0) {
return;
}
m_data = new char[m_size + 1];
memcpy(m_data, str, m_size);
memcpy(m_data, value.GetString(), m_size);
m_data[m_size] = '\0';
}
@@ -103,8 +113,10 @@ rapidjson::Value xmrig::String::toJSON(rapidjson::Document &doc) const
std::vector<xmrig::String> xmrig::String::split(char sep) const
{
std::vector<xmrig::String> out;
std::vector<String> out;
if (m_size == 0) {
out.emplace_back(*this);
return out;
}