svn commit: samba r7066 - in branches/SAMBA_4_0/source: lib/ejs
scripting/ejs web_server
tpot at samba.org
tpot at samba.org
Sun May 29 04:10:23 GMT 2005
Author: tpot
Date: 2005-05-29 04:10:22 +0000 (Sun, 29 May 2005)
New Revision: 7066
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7066
Log:
Rename http_exception to ejs_exception.
Modified:
branches/SAMBA_4_0/source/lib/ejs/miniMpr.c
branches/SAMBA_4_0/source/scripting/ejs/smbscript.c
branches/SAMBA_4_0/source/web_server/http.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ejs/miniMpr.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ejs/miniMpr.c 2005-05-29 03:53:36 UTC (rev 7065)
+++ branches/SAMBA_4_0/source/lib/ejs/miniMpr.c 2005-05-29 04:10:22 UTC (rev 7066)
@@ -163,7 +163,7 @@
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 */
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbscript.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbscript.c 2005-05-29 03:53:36 UTC (rev 7065)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbscript.c 2005-05-29 04:10:22 UTC (rev 7066)
@@ -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 @@
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);
}
Modified: branches/SAMBA_4_0/source/web_server/http.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/http.c 2005-05-29 03:53:36 UTC (rev 7065)
+++ branches/SAMBA_4_0/source/web_server/http.c 2005-05-29 04:10:22 UTC (rev 7066)
@@ -461,17 +461,17 @@
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 @@
}
#if HAVE_SETJMP_H
- if (setjmp(http_exception_buf) != 0) {
+ if (setjmp(ejs_exception_buf) != 0) {
http_error(web, 500, exception_reason);
return;
}
More information about the samba-cvs
mailing list