From d24a95168f1353bf1ac52e77efb73ab07fccb0be Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Thu, 9 Jan 2020 23:05:49 +0800 Subject: [PATCH] Fix a bug --- src/misc.cpp | 4 ++-- src/misc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc.cpp b/src/misc.cpp index 8c08c50..3502b34 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -861,11 +861,11 @@ void shortDisassemble(int source, unsigned short &num_a, unsigned short &num_b) num_b = (unsigned short)(source >> 16); } -int to_int(std::string &s, int def_vaule) +int to_int(std::string str, int def_vaule) { int retval = 0; char c; - std::stringstream ss(s); + std::stringstream ss(str); if(!(ss >> retval)) return def_vaule; else if(ss >> c) diff --git a/src/misc.h b/src/misc.h index 1a9de42..c50ccad 100644 --- a/src/misc.h +++ b/src/misc.h @@ -52,7 +52,7 @@ void urlParse(std::string url, std::string &host, std::string &path, int &port, void removeUTF8BOM(std::string &data); int shortAssemble(unsigned short num_a, unsigned short num_b); void shortDisassemble(int source, unsigned short &num_a, unsigned short &num_b); -int to_int(std::string &s, int def_vaule = 0); +int to_int(std::string str, int def_vaule = 0); std::string UTF8ToCodePoint(std::string data); std::string GetEnv(std::string name);