From 4b17a6dfbbc2d6adafbc9103b97fd78c43c2efe4 Mon Sep 17 00:00:00 2001 From: Derrell Lipman Date: Tue, 3 Oct 2006 02:38:08 +0000 Subject: r19055: JSON-RPC is working! It passes the small qooxdoo JSON-RPC test suite perfectly. This check in covers the remaining fixes and enhancements to complete the server. In a subsequent check-in, I need to learn about the new qooxdoo packaging mechanism. Although it'd be nice to have the whole source tree, that's huge and needn't be in samba svn. It's now supposed to be very easy to package qooxdoo, so I'll figure out how that's done and then check in the relevant small number of files. Steps after that involve generating the stubs to allow various ejs functions to be called via JSON-RPC. Derrell (This used to be commit 5bfebbda7a5d28d4deb31c54a8feb24c4416cbf6) --- source4/scripting/ejs/smbcalls.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'source4/scripting/ejs/smbcalls.c') diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c index 815b3e2b5d..b0df390427 100644 --- a/source4/scripting/ejs/smbcalls.c +++ b/source4/scripting/ejs/smbcalls.c @@ -203,39 +203,6 @@ static int jsonrpc_include(int eid, int argc, char **argv) } -static int ejs_debug(int eid, int argc, char **argv) -{ - int i; - int level; - void *ctx = mprMemCtx(); - char *msg; - - - if (argc < 2) { - return -1; - } - - level = atoi(argv[0]); - - msg = talloc_zero_size(ctx, 1); - if (msg == NULL) { - DEBUG(0, ("out of memory in debug()\n")); - return 0; - } - - for (i = 1; i < argc; i++) { - msg = talloc_append_string(ctx, msg, argv[i]); - if (msg == NULL) { - DEBUG(0, ("out of memory in debug()\n")); - return 0; - } - } - - DEBUG(level, ("%s", msg)); - talloc_free(msg); - return 0; -} - static void (*ejs_exception_handler) (const char *) = NULL; _PUBLIC_ void ejs_exception(const char *reason) @@ -273,6 +240,5 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *)) ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE); ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE); ejsDefineStringCFunction(-1, "jsonrpc_include", jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE); - ejsDefineStringCFunction(-1, "debug", ejs_debug, NULL, MPR_VAR_SCRIPT_HANDLE); } -- cgit