From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 04:10:22 +0000 (+0000)
Subject: r7066: Rename http_exception to ejs_exception.
X-Git-Tag: samba-misc-tags/initial-v4-0-unstable~9127
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=f2e59d3adfd7813c3c2090350f8ff2a99a5533e9;p=sfrench%2Fsamba-autobuild%2F.git

r7066: Rename http_exception to ejs_exception.
---

diff --git a/source/lib/ejs/miniMpr.c b/source/lib/ejs/miniMpr.c
index 2c6f7bea501..2094052b393 100644
--- a/source/lib/ejs/miniMpr.c
+++ b/source/lib/ejs/miniMpr.c
@@ -163,7 +163,7 @@ void mprBreakpoint(const char *file, int line, const char *cond)
 	char *buf;
 	mprAllocSprintf(&buf, MPR_MAX_STRING, "esp exception - ASSERT at %s:%d, %s\n", 
 					file, line, cond);
-	http_exception(buf);
+	ejs_exception(buf);
 }
 
 #endif /* !BLD_GOAHEAD_WEBSERVER */
diff --git a/source/scripting/ejs/smbscript.c b/source/scripting/ejs/smbscript.c
index f1ff03ae494..0b0a4468398 100644
--- a/source/scripting/ejs/smbscript.c
+++ b/source/scripting/ejs/smbscript.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/ejs/ejs.h"
 
-void http_exception(const char *reason)
+void ejs_exception(const char *reason)
 {
 	fprintf(stderr, "smbscript exception: %s", reason);
 	exit(1);
@@ -61,7 +61,7 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 		exit(1);
 	}
 
-	if (ejsEvalScript(eid, "write(\"hello\n\");", &result, &emsg) == -1) {
+	if (ejsEvalFile(eid, (char *)argv[1], &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
diff --git a/source/web_server/http.c b/source/web_server/http.c
index a0729705970..df53eee4e9d 100644
--- a/source/web_server/http.c
+++ b/source/web_server/http.c
@@ -461,17 +461,17 @@ static void http_setup_arrays(struct esp_state *esp)
    report a internal server error via http
 */
 #include <setjmp.h>
-static jmp_buf http_exception_buf;
+static jmp_buf ejs_exception_buf;
 static const char *exception_reason;
 
-void http_exception(const char *reason)
+void ejs_exception(const char *reason)
 {
 	exception_reason = reason;
 	DEBUG(0,("%s", reason));
-	longjmp(http_exception_buf, -1);
+	longjmp(ejs_exception_buf, -1);
 }
 #else
-void http_exception(const char *reason)
+void ejs_exception(const char *reason)
 {
 	DEBUG(0,("%s", reason));
 	smb_panic(reason);
@@ -497,7 +497,7 @@ static void esp_request(struct esp_state *esp)
 	}
 
 #if HAVE_SETJMP_H
-	if (setjmp(http_exception_buf) != 0) {
+	if (setjmp(ejs_exception_buf) != 0) {
 		http_error(web, 500, exception_reason);
 		return;
 	}