kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #458 from signalwire/v8 

[mod_v8] Fix scan-build warnings.
This commit is contained in:
Andrey Volk 2020-03-06 00:42:46 +04:00 committed by GitHub
parent 6f24d9b489 7bbec6611c
commit ac328bb2d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/languages/mod_v8/mod_v8.cpp
View File

@ -201,7 +201,6 @@ static switch_status_t v8_mod_load_file(const char *filename)
function_handle = (switch_loadable_module_function_table_t *)switch_dso_data_sym(dso, "v8_mod_init", &derr); function_handle = (switch_loadable_module_function_table_t *)switch_dso_data_sym(dso, "v8_mod_init", &derr);
if (!function_handle || derr) { if (!function_handle || derr) {
status = SWITCH_STATUS_FALSE;
err = derr; err = derr;
goto err; goto err;
} }
@ -1458,7 +1457,7 @@ SWITCH_STANDARD_API(process_status_function)
} else if (!strcasecmp(as, "xml")) { } else if (!strcasecmp(as, "xml")) {
switch_snprintf(tmp_str, sizeof(tmp_str), "%u", count); switch_snprintf(tmp_str, sizeof(tmp_str), "%u", count);
switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup("row_count"), strdup(tmp_str)); switch_xml_set_attr_d(xml, "row_count", tmp_str);
output_text = switch_xml_toxml(xml, SWITCH_FALSE); output_text = switch_xml_toxml(xml, SWITCH_FALSE);

6
src/mod/languages/mod_v8/src/fscoredb.cpp
View File

@ -301,7 +301,6 @@ JS_COREDB_FUNCTION_IMPL(Prepare)
JS_COREDB_FUNCTION_IMPL(BindText) JS_COREDB_FUNCTION_IMPL(BindText)
{ {
HandleScope handle_scope(info.GetIsolate()); HandleScope handle_scope(info.GetIsolate());
bool status;
int32_t param_index = -1; int32_t param_index = -1;
string param_value; string param_value;
@ -324,7 +323,6 @@ JS_COREDB_FUNCTION_IMPL(BindText)
} }
/* convert args */ /* convert args */
status = !info[0].IsEmpty() && info[0]->IsInt32() ? true : false;
param_index = info[0]->Int32Value(); param_index = info[0]->Int32Value();
String::Utf8Value str(info[1]); String::Utf8Value str(info[1]);
param_value = js_safe_str(*str); param_value = js_safe_str(*str);
@ -347,7 +345,6 @@ JS_COREDB_FUNCTION_IMPL(BindText)
JS_COREDB_FUNCTION_IMPL(BindInt) JS_COREDB_FUNCTION_IMPL(BindInt)
{ {
HandleScope handle_scope(info.GetIsolate()); HandleScope handle_scope(info.GetIsolate());
bool status;
int32_t param_index = -1; int32_t param_index = -1;
int32_t param_value = -1; int32_t param_value = -1;
@ -370,10 +367,7 @@ JS_COREDB_FUNCTION_IMPL(BindInt)
} }
/* convert args */ /* convert args */
status = !info[0].IsEmpty() && info[0]->IsInt32() ? true : false;
param_index = info[0]->Int32Value(); param_index = info[0]->Int32Value();
status = !info[1].IsEmpty() && info[1]->IsInt32() ? true : false;
param_value = info[1]->Int32Value(); param_value = info[1]->Int32Value();
if (param_index < 1) { if (param_index < 1) {

2
src/mod/languages/mod_v8/src/jsmain.cpp
View File

@ -443,7 +443,7 @@ Isolate *JSMain::GetIsolate()
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5 #if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
void JSMain::Initialize(v8::Platform **platform) void JSMain::Initialize(v8::Platform **platform)
{ {
bool res = V8::InitializeICUDefaultLocation(SWITCH_GLOBAL_dirs.mod_dir); V8::InitializeICUDefaultLocation(SWITCH_GLOBAL_dirs.mod_dir);
V8::InitializeExternalStartupData(SWITCH_GLOBAL_dirs.mod_dir); V8::InitializeExternalStartupData(SWITCH_GLOBAL_dirs.mod_dir);
*platform = v8::platform::CreateDefaultPlatform(); *platform = v8::platform::CreateDefaultPlatform();