From a89d0e33e49adf5858ef2ed92a55c7008016daad Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Thu, 27 Mar 2025 10:11:30 +0700 Subject: [PATCH] deleted stringstream --- .gitignore | 3 ++- src/users/add_user.cpp | 14 ++++++-------- src/users/change_password.cpp | 10 ++++------ src/users/change_user.cpp | 10 ++++------ src/users/delete_user.cpp | 5 ++--- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index bbe78f7..6db44ab 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ build bin .vscode .idea -cmake-build-debug \ No newline at end of file +cmake-build-debug +.cache diff --git a/src/users/add_user.cpp b/src/users/add_user.cpp index bfb2b7b..aef5cc9 100644 --- a/src/users/add_user.cpp +++ b/src/users/add_user.cpp @@ -94,14 +94,12 @@ void add_user(const httplib::Request& request, httplib::Response& response) } } - std::stringstream new_user_data; - - new_user_data << R"({"id":")" << get_random_string(ALPHABET, 50) << R"(","username":")" - << username << R"(","password":")" << password << R"(","group":)"; - (json_body["group"] != nullptr) ? new_user_data << json_body["group"] : new_user_data << "\"users\""; - new_user_data << ",\"is_superuser\":"; - (json_body["is_superuser"] != nullptr) ? new_user_data << json_body["is_superuser"] : new_user_data << "\"0\""; - new_user_data << "}"; + std::string new_user_data; + new_user_data += R"({"id":")" + get_random_string(ALPHABET, 50) + R"(","username":")" + username + R"(","password":")" + password + R"(","group":)"; + (json_body["group"] != nullptr) ? new_user_data += R"(")" + std::string(json_body["group"]) + R"(")" : new_user_data += R"("users")"; + new_user_data += ",\"is_superuser\":"; + (json_body["is_superuser"] != nullptr) ? new_user_data += R"(")" + std::string(json_body["is_superuser"]) + R"(")" : new_user_data += "\"0\""; + new_user_data += "}"; all_users.push_back(nlohmann::json::parse(new_user_data)); std::ofstream usersfilew(USERS_FILE); diff --git a/src/users/change_password.cpp b/src/users/change_password.cpp index 6b140e8..7670fad 100644 --- a/src/users/change_password.cpp +++ b/src/users/change_password.cpp @@ -90,9 +90,8 @@ void change_password(const httplib::Request& request, httplib::Response& respons if ((all_user["id"] == changepassuserid)) { all_user["password"] = new_password; found = true; - std::stringstream syslogstring; - syslogstring << "password changed for user [" << all_user["username"] << "]"; - syslog(LOG_INFO, syslogstring.str().c_str()); + std::string syslogstring = "password changed for user [" + std::string(all_user["username"]) + "]"; + syslog(LOG_INFO, syslogstring.c_str()); break; } } @@ -102,9 +101,8 @@ void change_password(const httplib::Request& request, httplib::Response& respons if ((all_user["id"] == changepassuserid) && (all_user["password"] == old_password)) { all_user["password"] = new_password; found = true; - std::stringstream syslogstring; - syslogstring << "password changed for user [" << all_user["username"] << "]"; - syslog(LOG_INFO, syslogstring.str().c_str()); + std::string syslogstring = "password changed for user [" + std::string(all_user["username"]) + "]"; + syslog(LOG_INFO, syslogstring.c_str()); break; } } diff --git a/src/users/change_user.cpp b/src/users/change_user.cpp index f43fd06..386104f 100644 --- a/src/users/change_user.cpp +++ b/src/users/change_user.cpp @@ -81,9 +81,8 @@ void change_user(const httplib::Request& request, httplib::Response& response) if (json_body["group"] != nullptr) { all_user["group"] = json_body["group"]; } if (json_body["is_superuser"] != nullptr) { all_user["is_superuser"] = json_body["is_superuser"]; } found = true; - std::stringstream syslogstring; - syslogstring << "userdata changed for user [" << all_user["username"] << "]"; - syslog(LOG_INFO, syslogstring.str().c_str()); + std::string syslogstring = "userdata changed for user [" + std::string(all_user["username"]) + "]"; + syslog(LOG_INFO, syslogstring.c_str()); break; } } @@ -93,9 +92,8 @@ void change_user(const httplib::Request& request, httplib::Response& response) if ((all_user["id"] == changeusruserid)) { if (json_body["username"] != nullptr) { all_user["username"] = json_body["username"]; } found = true; - std::stringstream syslogstring; - syslogstring << "userdata changed for user [" << all_user["username"] << "]"; - syslog(LOG_INFO, syslogstring.str().c_str()); + std::string syslogstring = "userdata changed for user [" + std::string(all_user["username"]) + "]"; + syslog(LOG_INFO, syslogstring.c_str()); break; } } diff --git a/src/users/delete_user.cpp b/src/users/delete_user.cpp index d6dcee7..720169b 100644 --- a/src/users/delete_user.cpp +++ b/src/users/delete_user.cpp @@ -67,11 +67,10 @@ void delete_user(const httplib::Request& request, httplib::Response& response) bool found = false; for (size_t i = 0; i < all_users.size(); i++) { if (all_users[i]["id"] == deluserid) { - std::stringstream syslogstring; - syslogstring << "user deleted [" << all_users[i]["username"] << "]"; + std::string syslogstring = "user deleted [" + std::string(all_users[i]["username"]) + "]"; all_users.erase(i); found = true; - syslog(LOG_INFO, syslogstring.str().c_str()); + syslog(LOG_INFO, syslogstring.c_str()); break; } } -- 2.54.0