From c60dfb50d5fef794da72660b9d84c14cb2a0a9e4 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Tue, 27 Aug 2013 12:31:25 -0500 Subject: [PATCH] fix variable setting from skinny and mismatched logging --- src/mod/endpoints/mod_skinny/skinny_server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c index 29148f952e..1dbf66b7b2 100644 --- a/src/mod/endpoints/mod_skinny/skinny_server.c +++ b/src/mod/endpoints/mod_skinny/skinny_server.c @@ -515,13 +515,13 @@ int skinny_session_set_variables_callback(void *pArg, int argc, char **argv, cha if ((xvariables = switch_xml_child(xuser, "variables"))) { for (xvariable = switch_xml_child(xvariables, "variable"); xvariable; xvariable = xvariable->next) { - char *var = (char *) switch_xml_attr_soft(xvariable, "name"); - char *val = (char *) switch_xml_attr_soft(xvariable, "value"); + char *name = (char *) switch_xml_attr_soft(xvariable, "name"); + char *value = (char *) switch_xml_attr_soft(xvariable, "value"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(helper->tech_pvt->session), SWITCH_LOG_DEBUG, - "found variable (%s=%s) for user (%s) in channel var setup\n", listener->device_name, val, var); + "found variable (%s=%s) for user (%s) in channel var setup\n", name, value, listener->device_name); - switch_channel_set_variable_name_printf(helper->channel, var, "%s", val); + switch_channel_set_variable_name_printf(helper->channel, value, "%s", name); } } }