change param name to avoid swig conflict

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8540 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index 1098f4795c3ce50bf0f0b9f43998b3a368db792e..09af98a44c280e2fa8954f479c1caf79b2f5037f 100644 (file)
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -192,7 +192,7 @@ class CoreSession {
        SWITCH_DECLARE(void) setPrivate(char *var, void *val);
        SWITCH_DECLARE(void *)getPrivate(char *var);
        SWITCH_DECLARE(const char *)getVariable(char *var);
-       SWITCH_DECLARE(switch_status_t) process_callback_result(char *ret);     
+       SWITCH_DECLARE(switch_status_t) process_callback_result(char *result);  
        SWITCH_DECLARE(void) say(const char *tosay, const char *module_name, const char *say_type, const char *say_method);
        SWITCH_DECLARE(void) sayPhrase(const char *phrase_name, const char *phrase_data = "", const char *phrase_lang = NULL);
 

diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index 26d4ae86708deb7adc9ef3e2754f1dd5174a20eb..3b5b07db6527fd3d22717fecb9caaa39ca647e45 100644 (file)
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -1036,7 +1036,7 @@ SWITCH_DECLARE_NONSTD(switch_status_t) dtmf_callback(switch_core_session_t *sess
 }
 
 
-SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
+SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *result)
 {
        
     switch_file_handle_t *fh = NULL;      
@@ -1044,7 +1044,7 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
        this_check(SWITCH_STATUS_FALSE);
        sanity_check(SWITCH_STATUS_FALSE);
        
-    if (switch_strlen_zero(ret)) {
+    if (switch_strlen_zero(result)) {
                return SWITCH_STATUS_SUCCESS;   
     }
 
@@ -1076,10 +1076,10 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
     }
 
 
-    if (!strncasecmp(ret, "speed", 4)) {
+    if (!strncasecmp(result, "speed", 4)) {
                char *p;
 
-               if ((p = strchr(ret, ':'))) {
+               if ((p = strchr(result, ':'))) {
                        p++;
                        if (*p == '+' || *p == '-') {
                                int step;
@@ -1096,28 +1096,28 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
 
                return SWITCH_STATUS_FALSE;
 
-    } else if (!strcasecmp(ret, "pause")) {
+    } else if (!strcasecmp(result, "pause")) {
                if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) {
                        switch_clear_flag(fh, SWITCH_FILE_PAUSE);
                } else {
                        switch_set_flag(fh, SWITCH_FILE_PAUSE);
                }
                return SWITCH_STATUS_SUCCESS;
-    } else if (!strcasecmp(ret, "stop")) {
+    } else if (!strcasecmp(result, "stop")) {
                return SWITCH_STATUS_FALSE;
-    } else if (!strcasecmp(ret, "restart")) {
+    } else if (!strcasecmp(result, "restart")) {
                unsigned int pos = 0;
                fh->speed = 0;
                switch_core_file_seek(fh, &pos, 0, SEEK_SET);
                return SWITCH_STATUS_SUCCESS;
-    } else if (!strncasecmp(ret, "seek", 4)) {
+    } else if (!strncasecmp(result, "seek", 4)) {
                switch_codec_t *codec;
                unsigned int samps = 0;
                unsigned int pos = 0;
                char *p;
                codec = switch_core_session_get_read_codec(session);
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n");
-               if ((p = strchr(ret, ':'))) {
+               if ((p = strchr(result, ':'))) {
                        p++;
                        if (*p == '+' || *p == '-') {
                                int step;
@@ -1146,7 +1146,7 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
                return SWITCH_STATUS_SUCCESS;
     }
 
-    if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) {
+    if (!strcmp(result, "true") || !strcmp(result, "undefined")) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n");
                return SWITCH_STATUS_SUCCESS;
     }