SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Compare commits

base: SHS:e22630b1bd72af3d77b161351cf96608b489c4f6
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old
..
compare: SHS:master
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old

3 Commits
e22630b1bd ... master

Author SHA1 Message Date
peri4
f50a3abc8e PIString::buildData for ICU fix according to official doc 2026-02-08 17:01:52 +03:00
peri4
8c15113cb0 fix PIHTTPClient with queryArguments 2026-02-08 02:50:54 +03:00
peri4
4253acb72b rename override to override_vt 2026-02-03 20:33:23 +03:00
3 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

2
libs/http_client/pihttpclient.cpp
View File

@@ -59,7 +59,7 @@ bool PIHTTPClient::init() {
if (is_cancel) return false; if (is_cancel) return false;
CurlThreadPool::instance(); CurlThreadPool::instance();
if (!PRIVATE->init()) return false; if (!PRIVATE->init()) return false;
auto ait = request.arguments().makeIterator(); auto ait = request.queryArguments().makeIterator();
while (ait.next()) { while (ait.next()) {
if (!url.contains('?')) if (!url.contains('?'))
url.append('?'); url.append('?');

8
libs/main/serialization/pivaluetree_conversions.cpp
View File

@@ -348,8 +348,8 @@ PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path)))); auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
auto ofp = overrideFile(path); auto ofp = overrideFile(path);
if (PIFile::isExists(ofp)) { if (PIFile::isExists(ofp)) {
auto override = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp)))); auto override_vt = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
ret.merge(override); ret.merge(override_vt);
} }
return ret; return ret;
} }
@@ -361,8 +361,8 @@ PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
auto ofp = overrideFile(path); auto ofp = overrideFile(path);
if (PIFile::isExists(ofp)) { if (PIFile::isExists(ofp)) {
PIFile of(ofp, PIIODevice::ReadOnly); PIFile of(ofp, PIIODevice::ReadOnly);
auto override = PIValueTreeConversions::fromText(&of); auto override_vt = PIValueTreeConversions::fromText(&of);
ret.merge(override); ret.merge(override_vt);
} }
return ret; return ret;
} }

2
libs/main/text/pistring.cpp
View File

@@ -469,7 +469,7 @@ void PIString::buildData(const char * cp) const {
UErrorCode e((UErrorCode)0); UErrorCode e((UErrorCode)0);
UConverter * cc = ucnv_open(cp, &e); UConverter * cc = ucnv_open(cp, &e);
if (cc) { if (cc) {
const size_t len = MB_CUR_MAX * size() + 1; const size_t len = UCNV_GET_MAX_BYTES_FOR_STRING(size(), ucnv_getMaxCharSize(cc)) + 1; // MB_CUR_MAX * size() + 1;
data_ = (char *)malloc(len); data_ = (char *)malloc(len);
int sz = ucnv_fromUChars(cc, data_, len, (const UChar *)(d.data()), d.size_s(), &e); int sz = ucnv_fromUChars(cc, data_, len, (const UChar *)(d.data()), d.size_s(), &e);
ucnv_close(cc); ucnv_close(cc);