fix variable setting from skinny and mismatched logging

diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 29148f952ef1bbd673748eada62f00129b58efa2..1dbf66b7b2c5301944839f14c5a6f8dff3b0c8bc 100644 (file)
--- 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);
                        }
                }
        }