mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-14 01:49:05 +00:00
use more correct const char * for things that should not be modified. This should also fix the switch_cpp.cpp changes from MODAPP-44. More patches to follow up on this for a few more modules that will likely break with this commit.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6120 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -1524,7 +1524,8 @@ static JSBool session_streamfile(JSContext * cx, JSObject * obj, uintN argc, jsv
|
||||
switch_file_handle_t fh = { 0 };
|
||||
JSFunction *function;
|
||||
switch_input_args_t args = { 0 };
|
||||
char *prebuf, posbuf[35] = "";
|
||||
const char *prebuf;
|
||||
char posbuf[35] = "";
|
||||
|
||||
METHOD_SANITY_CHECK();
|
||||
|
||||
@@ -1627,7 +1628,7 @@ static JSBool session_get_variable(JSContext * cx, JSObject * obj, uintN argc, j
|
||||
assert(channel != NULL);
|
||||
|
||||
if (argc > 0) {
|
||||
char *var, *val;
|
||||
const char *var, *val;
|
||||
|
||||
var = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
|
||||
val = switch_channel_get_variable(channel, var);
|
||||
@@ -2510,16 +2511,16 @@ static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsva
|
||||
JSObject *session_obj;
|
||||
switch_core_session_t *session = NULL, *peer_session = NULL;
|
||||
switch_caller_profile_t *caller_profile = NULL, *orig_caller_profile = NULL;
|
||||
char *dest = NULL;
|
||||
char *dialplan = NULL;
|
||||
char *cid_name = "";
|
||||
char *cid_num = "";
|
||||
char *network_addr = "";
|
||||
char *ani = "";
|
||||
char *aniii = "";
|
||||
char *rdnis = "";
|
||||
char *context = "";
|
||||
char *username = NULL;
|
||||
const char *dest = NULL;
|
||||
const char *dialplan = NULL;
|
||||
const char *cid_name = "";
|
||||
const char *cid_num = "";
|
||||
const char *network_addr = "";
|
||||
const char *ani = "";
|
||||
const char *aniii = "";
|
||||
const char *rdnis = "";
|
||||
const char *context = "";
|
||||
const char *username = NULL;
|
||||
char *to = NULL;
|
||||
char *tmp;
|
||||
|
||||
@@ -3109,10 +3110,11 @@ static int env_init(JSContext * cx, JSObject * javascript_object)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void js_parse_and_execute(switch_core_session_t *session, char *input_code, struct request_obj *ro)
|
||||
static void js_parse_and_execute(switch_core_session_t *session, const char *input_code, struct request_obj *ro)
|
||||
{
|
||||
JSObject *javascript_global_object = NULL;
|
||||
char buf[1024], *script, *arg, *argv[512];
|
||||
char buf[1024], *arg, *argv[512];
|
||||
const char *script;
|
||||
int argc = 0, x = 0, y = 0;
|
||||
unsigned int flags = 0;
|
||||
struct js_session jss;
|
||||
@@ -3172,9 +3174,9 @@ static void js_parse_and_execute(switch_core_session_t *session, char *input_cod
|
||||
}
|
||||
}
|
||||
|
||||
static void js_dp_function(switch_core_session_t *session, char *input_code)
|
||||
SWITCH_STANDARD_APP(js_dp_function)
|
||||
{
|
||||
js_parse_and_execute(session, input_code, NULL);
|
||||
js_parse_and_execute(session, data, NULL);
|
||||
}
|
||||
|
||||
static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t * thread, void *obj)
|
||||
|
@@ -71,12 +71,12 @@ SWITCH_BEGIN_EXTERN_C
|
||||
#else //not win32
|
||||
#define SWITCH_SM_DECLARE(type) type
|
||||
#endif
|
||||
int eval_some_js(char *code, JSContext * cx, JSObject * obj, jsval * rval)
|
||||
int eval_some_js(const char *code, JSContext * cx, JSObject * obj, jsval * rval)
|
||||
{
|
||||
JSScript *script = NULL;
|
||||
char *cptr;
|
||||
const char *cptr;
|
||||
char *path = NULL;
|
||||
char *script_name = NULL;
|
||||
const char *script_name = NULL;
|
||||
int result = 0;
|
||||
|
||||
JS_ClearPendingException(cx);
|
||||
|
Reference in New Issue
Block a user