From 3311712d1663487836ed4f6e3aa0960797c6afee Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 8 Apr 2025 10:27:22 -0400 Subject: [PATCH] MT#62181 use std::move These are all instances of an object being put into a container just before it goes out of scope. Use move semantics to avoid copying. Change-Id: I9c40a56c4a67df2b8e244d51f068b50ec286f5bf Warned-by: Coverity --- apps/dsm/DSMCall.cpp | 2 +- apps/dsm/DSMCoreModule.cpp | 2 +- apps/dsm/DSMStateEngine.cpp | 2 +- apps/dsm/mods/mod_dlg/ModDlg.cpp | 6 +- apps/sbc/CallLeg.cpp | 2 +- apps/sbc/ParamReplacer.cpp | 2 +- apps/sbc/SBCCallProfile.cpp | 2 +- apps/sbc/SDPFilter.cpp | 2 +- apps/sw_vsc/SW_Vsc.cpp | 192 +++++++++++++++---------------- core/AmPlugIn.cpp | 2 +- core/AmSdp.cpp | 2 +- core/jsonArg.cpp | 2 +- core/sems.cpp | 2 +- tools/logfile-splitter.cpp | 2 +- 14 files changed, 111 insertions(+), 111 deletions(-) diff --git a/apps/dsm/DSMCall.cpp b/apps/dsm/DSMCall.cpp index 3e2caa1c..4a4deab7 100644 --- a/apps/dsm/DSMCall.cpp +++ b/apps/dsm/DSMCall.cpp @@ -665,7 +665,7 @@ void DSMCall::process(AmEvent* event) } /* add headers if any */ if (!hdrs.empty()) { - b2b_ev->params["hdrs"] = hdrs; + b2b_ev->params["hdrs"] = std::move(hdrs); } } diff --git a/apps/dsm/DSMCoreModule.cpp b/apps/dsm/DSMCoreModule.cpp index 513c5283..b9d8cf5c 100644 --- a/apps/dsm/DSMCoreModule.cpp +++ b/apps/dsm/DSMCoreModule.cpp @@ -1579,7 +1579,7 @@ EXEC_ACTION_START(SCB2BGetHeaderRequestAction) { /* write only if we got something */ if (!result.empty()) - sc_sess->var[destination_variable] = result; + sc_sess->var[destination_variable] = std::move(result); else DBG("No header with name '%s' found.\n", hdr_name.c_str()); } EXEC_ACTION_END; diff --git a/apps/dsm/DSMStateEngine.cpp b/apps/dsm/DSMStateEngine.cpp index eb10f28f..dc2fd261 100644 --- a/apps/dsm/DSMStateEngine.cpp +++ b/apps/dsm/DSMStateEngine.cpp @@ -505,7 +505,7 @@ bool DSMStateEngine::runactions(vector::iterator from, if (array_for->for_type == DSMArrayFor::Struct) { if (v_exists) - sc_sess->var[v_name] = v_save; + sc_sess->var[v_name] = std::move(v_save); else sc_sess->var.erase(v_name); } diff --git a/apps/dsm/mods/mod_dlg/ModDlg.cpp b/apps/dsm/mods/mod_dlg/ModDlg.cpp index d02e3400..84fffe4f 100644 --- a/apps/dsm/mods/mod_dlg/ModDlg.cpp +++ b/apps/dsm/mods/mod_dlg/ModDlg.cpp @@ -323,9 +323,9 @@ EXEC_ACTION_START(DLGDialoutAction) { break; string varname = lb->first.substr(varprefix.length()); if (!has_auth) // sess_params is variable struct - (*sess_params)[varname] = lb->second; + (*sess_params)[std::move(varname)] = lb->second; else // variable struct is in sess_params array - var_struct[varname] = lb->second; + var_struct[std::move(varname)] = lb->second; lb++; has_vars = true; @@ -522,7 +522,7 @@ EXEC_ACTION_START(DLGInfoAction) { "call doesn't have SIP dialog (OOPS!)"); } - string body_crlf = body_str; + string body_crlf = std::move(body_str); AmMimeBody *body = new AmMimeBody(); if (!content_type.empty()) { DBG("body_crlf is '%s'\n", body_crlf.c_str()); diff --git a/apps/sbc/CallLeg.cpp b/apps/sbc/CallLeg.cpp index c9d156b8..37bd3ede 100644 --- a/apps/sbc/CallLeg.cpp +++ b/apps/sbc/CallLeg.cpp @@ -1487,7 +1487,7 @@ void CallLeg::addExistingCallee(const string &session_tag, ReconnectLegEvent *ev return; } - other_legs.push_back(b); + other_legs.push_back(std::move(b)); if (call_status == Disconnected) updateCallStatus(NoReply); } diff --git a/apps/sbc/ParamReplacer.cpp b/apps/sbc/ParamReplacer.cpp index 4781e3e0..2558c9c5 100644 --- a/apps/sbc/ParamReplacer.cpp +++ b/apps/sbc/ParamReplacer.cpp @@ -521,7 +521,7 @@ string replaceParameters(const string& s, call_profile, app_param, ruri_parser, from_parser, to_parser, rebuild_ruri, rebuild_from, rebuild_to); - val = &it->second[vn]; + val = &it->second[std::move(vn)]; } else { DBG("CC variable '%s' has wrong type: '%s'\n", vn.c_str(), AmArg::print(it->second).c_str()); diff --git a/apps/sbc/SBCCallProfile.cpp b/apps/sbc/SBCCallProfile.cpp index 244c3e27..43c7af22 100644 --- a/apps/sbc/SBCCallProfile.cpp +++ b/apps/sbc/SBCCallProfile.cpp @@ -1336,7 +1336,7 @@ static bool readPayloadList(std::vector &dst, const std::string &sr for (vector::iterator it=elems.begin(); it != elems.end(); ++it) { PayloadDesc payload; if (!payload.read(*it)) return false; - dst.push_back(payload); + dst.push_back(std::move(payload)); } return true; } diff --git a/apps/sbc/SDPFilter.cpp b/apps/sbc/SDPFilter.cpp index 68a714d8..859a0a4b 100644 --- a/apps/sbc/SDPFilter.cpp +++ b/apps/sbc/SDPFilter.cpp @@ -72,7 +72,7 @@ int filterSDP(AmSdp& sdp, const vector& filter_list) { media_line_filtered_out = true; } else media_line_left = true; - media.payloads = new_pl; + media.payloads = std::move(new_pl); } if ((!media_line_left) && media_line_filtered_out) { // no filter adds new payloads, we can safely return error diff --git a/apps/sw_vsc/SW_Vsc.cpp b/apps/sw_vsc/SW_Vsc.cpp index 1fb912aa..cb0715ba 100644 --- a/apps/sw_vsc/SW_Vsc.cpp +++ b/apps/sw_vsc/SW_Vsc.cpp @@ -104,7 +104,7 @@ using namespace re2; { \ ERROR(config_var " file does not exist ('%s').\n", \ member.c_str()); \ - filename = failAnnouncement; \ + filename = std::move(failAnnouncement); \ goto out; \ } @@ -961,7 +961,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { ERROR("UnknownAnnouncement file does not exist ('%s').\n", unknownAnnouncement.c_str()); - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -975,14 +975,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { ERROR("Error connecting to provisioning db: %s", mysql_error(my_handler)); - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if (mysql_options(my_handler, MYSQL_OPT_RECONNECT, &recon) != 0) { ERROR("Error setting reconnect-option for provisioning db: %s", mysql_error(my_handler)); - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -990,7 +990,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) &domain, domId, profId, &username); if (!subId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1009,40 +1009,40 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) /// Remove CFU if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFU, "cfu", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } /// Remove CFB if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFB, "cfb", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } /// Remove CFT if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFT, "cft", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } attId = getAttributeId(my_handler, "ringtimeout"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } prefId = getPreference(my_handler, subId, attId, &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (foundPref && !deletePreferenceId(my_handler, prefId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else @@ -1054,38 +1054,38 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) /// Remove CFNA if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFNA, "cfna", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } /// Remove CFS if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFS, "cfs", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } /// Remove CFR if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFR, "cfr", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } /// Remove CFO if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFO, "cfo", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } /// END - filename = cfOffAnnouncement; + filename = std::move(cfOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1097,20 +1097,20 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) u_int64_t attId = getAttributeId(my_handler, "cfu"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if(!checkSubscriberProfile(my_handler, profId, attId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if (!number2uri(req, my_handler, uuid, subId, domain, domId, 4, uri, username)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1118,7 +1118,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) SW_VSC_DESTSET_CFU, "cfu"); if (!mapId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } snprintf(map_str, sizeof(mapStr), "%llu", @@ -1129,14 +1129,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) { if (!insertPreference(my_handler, subId, attId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully set VSC CFU to '%s' using mapping id '%llu' for uuid '%s'", @@ -1146,19 +1146,19 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { if (!updatePreferenceId(my_handler, prefId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully updated VSC CFU to '%s' using mapping id '%llu' for uuid '%s'", uri.c_str(), (unsigned long long int)mapId, uuid.c_str()); } - filename = cfuOnAnnouncement; + filename = std::move(cfuOnAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1169,16 +1169,16 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFU, "cfu", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } - filename = cfuOffAnnouncement; + filename = std::move(cfuOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1190,20 +1190,20 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) u_int64_t attId = getAttributeId(my_handler, "cfb"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if(!checkSubscriberProfile(my_handler, profId, attId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if (!number2uri(req, my_handler, uuid, subId, domain, domId, 4, uri, username)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1211,7 +1211,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) SW_VSC_DESTSET_CFB, "cfb"); if (!mapId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } snprintf(map_str, sizeof(mapStr), "%llu", @@ -1222,14 +1222,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) { if (!insertPreference(my_handler, subId, attId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully set VSC CFB to '%s' for uuid '%s'", @@ -1239,19 +1239,19 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { if (!updatePreferenceId(my_handler, prefId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully updated VSC CFB to '%s' for uuid '%s'", uri.c_str(), uuid.c_str()); } - filename = cfbOnAnnouncement; + filename = std::move(cfbOnAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1262,16 +1262,16 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFB, "cfb", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } - filename = cfbOffAnnouncement; + filename = std::move(cfbOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1283,13 +1283,13 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) u_int64_t attId = getAttributeId(my_handler, "cft"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if(!checkSubscriberProfile(my_handler, profId, attId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1301,7 +1301,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if (!number2uri(req, my_handler, uuid, subId, domain, domId, timend + 1, uri, username)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1309,7 +1309,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) SW_VSC_DESTSET_CFT, "cft"); if (!mapId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } snprintf(map_str, sizeof(mapStr), "%llu", @@ -1320,14 +1320,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) { if (!insertPreference(my_handler, subId, attId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully set VSC CFT to '%s' for uuid '%s'", @@ -1337,7 +1337,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { if (!updatePreferenceId(my_handler, prefId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully updated VSC CFT to '%s' for uuid '%s'", @@ -1347,20 +1347,20 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) attId = getAttributeId(my_handler, "ringtimeout"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } prefId = getPreference(my_handler, subId, attId, &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) { if (!insertPreference(my_handler, subId, attId, tim)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully set VSC ringtimeout to '%s' for uuid '%s'", @@ -1370,19 +1370,19 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { if (!updatePreferenceId(my_handler, prefId, tim)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully updated VSC ringtimeout to '%s' for uuid '%s'", tim.c_str(), uuid.c_str()); } - filename = cftOnAnnouncement; + filename = std::move(cftOnAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1393,25 +1393,25 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFT, "cft", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } u_int64_t attId = getAttributeId(my_handler, "ringtimeout"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } u_int64_t prefId = getPreference(my_handler, subId, attId, &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (foundPref && !deletePreferenceId(my_handler, prefId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else @@ -1421,12 +1421,12 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) } - filename = cftOffAnnouncement; + filename = std::move(cftOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1438,20 +1438,20 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) u_int64_t attId = getAttributeId(my_handler, "cfna"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if(!checkSubscriberProfile(my_handler, profId, attId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if (!number2uri(req, my_handler, uuid, subId, domain, domId, 4, uri, username)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1459,7 +1459,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) SW_VSC_DESTSET_CFNA, "cfna"); if (!mapId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } snprintf(map_str, sizeof(mapStr), "%llu", @@ -1470,14 +1470,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) { if (!insertPreference(my_handler, subId, attId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully set VSC CFNA to '%s' for uuid '%s'", @@ -1487,19 +1487,19 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { if (!updatePreferenceId(my_handler, prefId, mapStr)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully updated VSC CFNA to '%s' for uuid '%s'", uri.c_str(), uuid.c_str()); } - filename = cfnaOnAnnouncement; + filename = std::move(cfnaOnAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1510,16 +1510,16 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if(!deleteCF(my_handler, subId, SW_VSC_DESTSET_CFNA, "cfna", &foundPref, &prefStr, uuid.c_str())) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } - filename = cfnaOffAnnouncement; + filename = std::move(cfnaOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1532,12 +1532,12 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if (!number2uri(req, my_handler, uuid, subId, domain, domId, 5, uri, username)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } if (!insertSpeedDialSlot(my_handler, subId, slot, uri)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else @@ -1546,12 +1546,12 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) slot.c_str(), uuid.c_str()); } - filename = speedDialAnnouncement; + filename = std::move(speedDialAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1567,14 +1567,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if (hour < 0 || hour > 23) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); INFO("Invalid hour '%s' in reminder data for uuid '%s'", req.user.substr(4, 2).c_str(), uuid.c_str()); goto out; } if (min < 0 || min > 59) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); INFO("Invalid minute '%s' in reminder data for uuid '%s'", req.user.substr(6, 2).c_str(), uuid.c_str()); goto out; @@ -1585,7 +1585,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if (!insertReminder(my_handler, subId, recur, tim)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else @@ -1594,12 +1594,12 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) c_tim, uuid.c_str()); } - filename = reminderOnAnnouncement; + filename = std::move(reminderOnAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1610,7 +1610,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) if (!deleteReminder(my_handler, subId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else @@ -1619,12 +1619,12 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) uuid.c_str()); } - filename = reminderOffAnnouncement; + filename = std::move(reminderOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1638,21 +1638,21 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) u_int64_t attId = getAttributeId(my_handler, "block_in_clir"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } u_int64_t prefId = getPreference(my_handler, subId, attId, &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) { if (!insertPreference(my_handler, subId, attId, val)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully set VSC block_in_clir for uuid '%s'", @@ -1662,19 +1662,19 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) { if (!updatePreferenceId(my_handler, prefId, val)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Successfully updated VSC block_in_clir for uuid '%s'", uuid.c_str()); } - filename = blockinclirOnAnnouncement; + filename = std::move(blockinclirOnAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } @@ -1686,14 +1686,14 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) u_int64_t attId = getAttributeId(my_handler, "block_in_clir"); if (!attId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } u_int64_t prefId = getPreference(my_handler, subId, attId, &foundPref, &prefStr); if (!prefId) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else if (!foundPref) @@ -1703,7 +1703,7 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) } else if (!deletePreferenceId(my_handler, prefId)) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } else @@ -1712,18 +1712,18 @@ void SW_VscDialog::onInvite(const AmSipRequest &req) uuid.c_str()); } - filename = blockinclirOffAnnouncement; + filename = std::move(blockinclirOffAnnouncement); goto out; } else if (ret != REG_NOMATCH) { - filename = failAnnouncement; + filename = std::move(failAnnouncement); goto out; } INFO("Unkown VSC code '%s' found", req.user.c_str()); - filename = unknownAnnouncement; + filename = std::move(unknownAnnouncement); out: diff --git a/core/AmPlugIn.cpp b/core/AmPlugIn.cpp index 76aee7a5..985f947c 100644 --- a/core/AmPlugIn.cpp +++ b/core/AmPlugIn.cpp @@ -835,7 +835,7 @@ AmSessionFactory* AmPlugIn::findSessionFactory(const AmSipRequest& req, string& ERROR("AmPlugIn::findSessionFactory: application '%s' not found !\n", m_app_name.c_str()); } - app_name = m_app_name; + app_name = std::move(m_app_name); return session_factory; } diff --git a/core/AmSdp.cpp b/core/AmSdp.cpp index de28a93c..56a79f68 100644 --- a/core/AmSdp.cpp +++ b/core/AmSdp.cpp @@ -858,7 +858,7 @@ static void parse_sdp_media(AmSdp* sdp_msg, char* s) if (next > media_line) media = string(media_line, int(next-media_line) - 1); - m.type = media_type(media); + m.type = media_type(std::move(media)); if (m.type == MT_NONE) { ERROR("parse_sdp_media: Unknown media type\n"); diff --git a/core/jsonArg.cpp b/core/jsonArg.cpp index 78cfc8ca..fa8cf9c9 100644 --- a/core/jsonArg.cpp +++ b/core/jsonArg.cpp @@ -209,7 +209,7 @@ bool object_parse(std::istream& input, AmArg& res) { return false; } res[key] = AmArg(); // using the reference - if (!json2arg(input, res[key])) { + if (!json2arg(input, res[std::move(key)])) { res.clear(); return false; } diff --git a/core/sems.cpp b/core/sems.cpp index f46edab7..bc4f4405 100644 --- a/core/sems.cpp +++ b/core/sems.cpp @@ -161,7 +161,7 @@ static void set_default_interface(const string& iface_name) if(if_it == AmConfig::RTP_If_names.end()) { AmConfig::RTP_interface intf; intf.name = "default"; - AmConfig::RTP_Ifs.push_back(intf); + AmConfig::RTP_Ifs.push_back(std::move(intf)); AmConfig::RTP_If_names["default"] = AmConfig::RTP_Ifs.size()-1; idx = AmConfig::RTP_Ifs.size()-1; } diff --git a/tools/logfile-splitter.cpp b/tools/logfile-splitter.cpp index 0d07e106..46f3e5e9 100644 --- a/tools/logfile-splitter.cpp +++ b/tools/logfile-splitter.cpp @@ -166,7 +166,7 @@ std::vector explode(const string& s, const string& delim, subend = search(substart, s.end(), delim.begin(), delim.end()); string temp(substart, subend); if (keep_empty || !temp.empty()) { - result.push_back(temp); + result.push_back(std::move(temp)); } if (subend == s.end()) { break;