summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-05-29 04:10:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:11 -0500
commit7756b990f38495bf98e335b56bdc510659c34bdb (patch)
tree530834296a60d589d0be9b3ae22c57bf3e1fdd48
parent14ade23914b328fcb5924488c2416dfa7748e4ab (diff)
downloadsamba-7756b990f38495bf98e335b56bdc510659c34bdb.tar.gz
samba-7756b990f38495bf98e335b56bdc510659c34bdb.tar.bz2
samba-7756b990f38495bf98e335b56bdc510659c34bdb.zip
r7066: Rename http_exception to ejs_exception.
(This used to be commit f2e59d3adfd7813c3c2090350f8ff2a99a5533e9)
-rw-r--r--source4/lib/ejs/miniMpr.c2
-rw-r--r--source4/scripting/ejs/smbscript.c4
-rw-r--r--source4/web_server/http.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/ejs/miniMpr.c b/source4/lib/ejs/miniMpr.c
index 2c6f7bea50..2094052b39 100644
--- a/source4/lib/ejs/miniMpr.c
+++ b/source4/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/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f1ff03ae49..0b0a446839 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/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/source4/web_server/http.c b/source4/web_server/http.c
index a072970597..df53eee4e9 100644
--- a/source4/web_server/http.c
+++ b/source4/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;
}