kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-27 12:56:15 +00:00
Code Issues Projects Releases Wiki Activity

[mod_enum] Fix dead nested assignments

Browse Source
This commit is contained in:
Andrey Volk 2022-01-07 13:43:20 +03:00
parent 688984f8b9
commit b6264e264c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_enum/mod_enum.c
View File

@ -303,7 +303,6 @@ static void parse_naptr(const ldns_rr *naptr, const char *number, enum_record_t
char *argv[11] = { 0 }; char *argv[11] = { 0 };
int i, argc; int i, argc;
char *pack[4] = { 0 }; char *pack[4] = { 0 };
int packc;
char *p; char *p;
int order = 10; int order = 10;
@ -351,7 +350,7 @@ static void parse_naptr(const ldns_rr *naptr, const char *number, enum_record_t
} }
if ((packc = switch_split(packstr, '!', pack))) { if (switch_split(packstr, '!', pack)) {
regex = pack[1]; regex = pack[1];
replace = pack[2]; replace = pack[2];
} else { } else {
@ -673,7 +672,6 @@ SWITCH_STANDARD_DIALPLAN(enum_dialplan_hunt)
SWITCH_STANDARD_APP(enum_app_function) SWITCH_STANDARD_APP(enum_app_function)
{ {
int argc = 0;
char *argv[4] = { 0 }; char *argv[4] = { 0 };
char *mydata = NULL; char *mydata = NULL;
char *dest = NULL, *root = NULL; char *dest = NULL, *root = NULL;
@ -691,7 +689,7 @@ SWITCH_STANDARD_APP(enum_app_function)
return; return;
} }
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if (switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) {
dest = argv[0]; dest = argv[0];
root = argv[1]; root = argv[1];
if (enum_lookup(root, dest, &results, channel, session) == SWITCH_STATUS_SUCCESS) { if (enum_lookup(root, dest, &results, channel, session) == SWITCH_STATUS_SUCCESS) {
@ -737,7 +735,6 @@ SWITCH_STANDARD_APP(enum_app_function)
SWITCH_STANDARD_API(enum_api) SWITCH_STANDARD_API(enum_api)
{ {
int argc = 0;
char *argv[4] = { 0 }; char *argv[4] = { 0 };
char *mydata = NULL; char *mydata = NULL;
char *dest = NULL, *root = NULL; char *dest = NULL, *root = NULL;
@ -758,7 +755,7 @@ SWITCH_STANDARD_API(enum_api)
abort(); abort();
} }
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if (switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) {
dest = argv[0]; dest = argv[0];
root = argv[1]; root = argv[1];
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Looking up %s@%s\n", dest, root); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Looking up %s@%s\n", dest, root);
@ -814,7 +811,6 @@ static void do_load(void)
SWITCH_STANDARD_API(enum_function) SWITCH_STANDARD_API(enum_function)
{ {
int argc = 0;
char *argv[4] = { 0 }; char *argv[4] = { 0 };
enum_record_t *results, *rp; enum_record_t *results, *rp;
char *mydata = NULL; char *mydata = NULL;
@ -830,7 +826,7 @@ SWITCH_STANDARD_API(enum_function)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if (switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) {
dest = argv[0]; dest = argv[0];
root = argv[1]; root = argv[1];
switch_assert(dest); switch_assert(dest);