diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c index 15b186657cca78d10272311497318926be01fea0..0eee549de3c2e849944b72fa36c98ab4e1e16e11 100644 --- a/src/sbbs3/js_global.c +++ b/src/sbbs3/js_global.c @@ -137,7 +137,7 @@ static JSBool js_BranchCallback(JSContext *cx, JSScript* script) if(bg->parent_cx!=NULL && !JS_IsRunning(bg->parent_cx)) /* die when parent dies */ return(JS_FALSE); - return js_GenericBranchCallback(cx,&bg->branch); + return js_CommonBranchCallback(cx,&bg->branch); } static JSBool diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c index 870343e8654454aa8b9d3acb083bcd4cc72b83fe..c0afec0d4725989dfacf39f169b7faa72e60b94b 100644 --- a/src/sbbs3/js_internal.c +++ b/src/sbbs3/js_internal.c @@ -196,7 +196,7 @@ static char* prop_desc[] = { #endif DLLEXPORT JSBool DLLCALL -js_GenericBranchCallback(JSContext *cx, js_branch_t* branch) +js_CommonBranchCallback(JSContext *cx, js_branch_t* branch) { branch->counter++; diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c index 8d9050d9670535cbd458f1d21f09db7da3021fc4..485aa3135e98a820ac66a8e52e376e743dd4b9dc 100644 --- a/src/sbbs3/jsexec.c +++ b/src/sbbs3/jsexec.c @@ -462,7 +462,7 @@ js_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) static JSBool js_BranchCallback(JSContext *cx, JSScript *script) { - return(js_GenericBranchCallback(cx,&branch)); + return(js_CommonBranchCallback(cx,&branch)); } static BOOL js_CreateEnvObject(JSContext* cx, JSObject* glob, char** env) diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index 353e3798f117e80230b1c2e0fb929c671deed9e0..097afa3fed59f5d38ff5622436628653f950417f 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -961,7 +961,7 @@ extern "C" { /* js_internal.c */ DLLEXPORT JSObject* DLLCALL js_CreateInternalJsObject(JSContext* cx, JSObject* parent, js_branch_t* branch); - DLLEXPORT JSBool DLLCALL js_GenericBranchCallback(JSContext *cx, js_branch_t*); + DLLEXPORT JSBool DLLCALL js_CommonBranchCallback(JSContext *cx, js_branch_t*); /* js_system.c */ DLLEXPORT JSObject* DLLCALL js_CreateSystemObject(JSContext* cx, JSObject* parent diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c index 9b974b1389d577c4dbbe785dc4b00b0b3bfdcaf2..d7c81c4a9747175dd2e18af4b053f249f24e088a 100644 --- a/src/sbbs3/services.c +++ b/src/sbbs3/services.c @@ -907,7 +907,7 @@ js_BranchCallback(JSContext *cx, JSScript *script) return(JS_FALSE); } - return js_GenericBranchCallback(cx,&client->branch); + return js_CommonBranchCallback(cx,&client->branch); } static void js_init_args(JSContext* js_cx, JSObject* js_obj, const char* cmdline)