diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-07 08:20:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:19 -0500 |
| commit | f44b9ae3e6e7d37020d4e644862772428b3a68ae (patch) | |
| tree | b453e266aea2c39619fe008e75c242cd3bb370bf /source4/scripting/ejs/ejsrpc.h | |
| parent | 3c2dc30b3ee719ceb7846f975b83a79c9cb1a9d7 (diff) | |
| download | samba-f44b9ae3e6e7d37020d4e644862772428b3a68ae.tar.gz samba-f44b9ae3e6e7d37020d4e644862772428b3a68ae.tar.bz2 samba-f44b9ae3e6e7d37020d4e644862772428b3a68ae.zip | |
r8198: - handled push/pull of simple strings in ejs
- improved the error handling, so the ejs wrappers don't just ignore a type they
don't handle, instead an exception is issued saying what isn't handled
(This used to be commit a77c2aa8606ad668f6a513211a1d9e7d6193d741)
Diffstat (limited to 'source4/scripting/ejs/ejsrpc.h')
| -rw-r--r-- | source4/scripting/ejs/ejsrpc.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/scripting/ejs/ejsrpc.h b/source4/scripting/ejs/ejsrpc.h index 1febb90ad6..5fb6ace863 100644 --- a/source4/scripting/ejs/ejsrpc.h +++ b/source4/scripting/ejs/ejsrpc.h @@ -21,7 +21,8 @@ */ struct ejs_rpc { - + int eid; + const char *callname; }; typedef NTSTATUS (*ejs_pull_t)(struct ejs_rpc *, struct MprVar *, const char *, void *); @@ -29,11 +30,13 @@ typedef NTSTATUS (*ejs_push_t)(struct ejs_rpc *, struct MprVar *, const char *, typedef NTSTATUS (*ejs_pull_function_t)(struct ejs_rpc *, struct MprVar *, void *); typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const void *); +NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why); + int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname, ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push); -NTSTATUS ejs_pull_rpc(struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull); -NTSTATUS ejs_push_rpc(struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push); +NTSTATUS ejs_pull_rpc(int eid, const char *callname, struct MprVar *v, void *ptr, ejs_pull_function_t ejs_pull); +NTSTATUS ejs_push_rpc(int eid, const char *callname, struct MprVar *v, const void *ptr, ejs_push_function_t ejs_push); NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name); NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name); @@ -63,4 +66,7 @@ NTSTATUS ejs_pull_array(struct ejs_rpc *ejs, NTSTATUS ejs_push_array(struct ejs_rpc *ejs, struct MprVar *v, const char *name, uint32_t length, size_t elsize, void *r, ejs_push_t ejs_push); - +NTSTATUS ejs_pull_string(struct ejs_rpc *ejs, + struct MprVar *v, const char *name, const char **s); +NTSTATUS ejs_push_string(struct ejs_rpc *ejs, + struct MprVar *v, const char *name, const char *s); |