From de9d416ddd89e869185033ff1d379a6df3bd7921 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Thu, 27 Oct 2022 10:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B7=A8=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/gb_json.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sane/gb_json.cpp b/sane/gb_json.cpp index 428b8b0..add68b7 100644 --- a/sane/gb_json.cpp +++ b/sane/gb_json.cpp @@ -1159,7 +1159,7 @@ namespace gb for (size_t i = 0; i < bytes; ++i) { - sprintf_s(buf, _countof(buf) - 1, "%02X", ptr[i]); + sprintf(buf, "%02X", ptr[i]); hex += buf; } @@ -1205,7 +1205,7 @@ namespace gb bool sane_config_schm::load_from_mem(const char* mem, bool in_b64) { gb::base64 b64; - std::string stream(in_b64 ? b64.decode(mem, lstrlenA(mem)) : mem); + std::string stream(in_b64 ? b64.decode(mem, strlen(mem)) : mem); clear(); jsn_ = new gb::json(); @@ -1367,7 +1367,7 @@ namespace gb if(with_ver) { char ver[40] = { 0 }; - sprintf_s(ver, "%u.%u", VERSION_MAIN, VERSION_SUB); + sprintf(ver, "%u.%u", VERSION_MAIN, VERSION_SUB); jsn_->set_value("ver", ver); } @@ -1448,7 +1448,7 @@ namespace gb } while (jsn_->next_child(val, &name)); } } - sprintf_s(vs, _countof(vs) - 1, "%u.%u", VERSION_MAIN, VERSION_SUB); + sprintf(vs, "%u.%u", VERSION_MAIN, VERSION_SUB); jsn_->set_value("ver", vs); if (changed) @@ -1699,7 +1699,7 @@ namespace gb if (it == schemes_.end()) global_->set_value(scanner_cfg::cur_sel_.c_str(), -1); else - global_->set_value(scanner_cfg::cur_sel_.c_str(), it - schemes_.begin()); + global_->set_value(scanner_cfg::cur_sel_.c_str(), (int)(it - schemes_.begin())); return true; }