From d3510b884b3df3c923dba28af9fa3046dae49ee4 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 2 Dec 2004 09:03:59 +0000
Subject: [PATCH] Renamed js_GenericBranchCallback() to
js_CommonBranchCallback().
---
src/sbbs3/js_global.c | 2 +-
src/sbbs3/js_internal.c | 2 +-
src/sbbs3/jsexec.c | 2 +-
src/sbbs3/sbbs.h | 2 +-
src/sbbs3/services.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 15b186657c..0eee549de3 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 870343e865..c0afec0d47 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 8d9050d967..485aa3135e 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 353e3798f1..097afa3fed 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 9b974b1389..d7c81c4a97 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)
--
GitLab