diff options
| author | Günther Deschner <gd@samba.org> | 2011-01-25 02:42:59 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-01-25 12:27:00 +0100 |
| commit | c9f4fad75cf9749709cbebfe55c59f3c2d01858e (patch) | |
| tree | 8327f107882dc201218912431baf53e97d5cc2a7 /source3/librpc | |
| parent | f0b3c72bcc119f497a4379c549bc55fb1031ce90 (diff) | |
| download | samba-c9f4fad75cf9749709cbebfe55c59f3c2d01858e.tar.gz samba-c9f4fad75cf9749709cbebfe55c59f3c2d01858e.tar.bz2 samba-c9f4fad75cf9749709cbebfe55c59f3c2d01858e.zip | |
idl: add file_id idl.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Jan 25 12:27:00 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/librpc')
| -rw-r--r-- | source3/librpc/idl/notify.idl | 2 | ||||
| -rw-r--r-- | source3/librpc/ndr/util.c | 39 | ||||
| -rw-r--r-- | source3/librpc/wscript_build | 2 |
3 files changed, 3 insertions, 40 deletions
diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl index 040f661b33..e776d5d715 100644 --- a/source3/librpc/idl/notify.idl +++ b/source3/librpc/idl/notify.idl @@ -1,5 +1,7 @@ #include "idl_types.h" +import "file_id.idl"; + /* IDL structures for notify change code diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c index 225d520ca6..ed24f87387 100644 --- a/source3/librpc/ndr/util.c +++ b/source3/librpc/ndr/util.c @@ -161,45 +161,6 @@ void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct s ndr->depth--; } -enum ndr_err_code ndr_push_file_id(struct ndr_push *ndr, int ndr_flags, const struct file_id *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_push_align(ndr, 4)); - NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, - (uint64_t)r->devid)); - NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, - (uint64_t)r->inode)); - NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, - (uint64_t)r->extid)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -enum ndr_err_code ndr_pull_file_id(struct ndr_pull *ndr, int ndr_flags, struct file_id *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_align(ndr, 4)); - NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->devid)); - NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->inode)); - NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->extid)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -void ndr_print_file_id(struct ndr_print *ndr, const char *name, const struct file_id *r) -{ - ndr_print_struct(ndr, name, "file_id"); - ndr->depth++; - ndr_print_udlong(ndr, "devid", (uint64_t)r->devid); - ndr_print_udlong(ndr, "inode", (uint64_t)r->inode); - ndr_print_udlong(ndr, "extid", (uint64_t)r->extid); - ndr->depth--; -} - _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss) { char addr[INET6_ADDRSTRLEN]; diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build index 5b305075bd..adf7f70c49 100644 --- a/source3/librpc/wscript_build +++ b/source3/librpc/wscript_build @@ -17,7 +17,7 @@ bld.SAMBA_SUBSYSTEM('NDR_MESSAGING', bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_notify.c', - public_deps='ndr' + public_deps='ndr NDR_FILE_ID' ) bld.SAMBA_SUBSYSTEM('NDR_PREG', |