diff options
| author | Günther Deschner <gd@samba.org> | 2011-01-25 00:52:10 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-01-25 11:42:46 +0100 |
| commit | 7eac3100ea77eca64152444336180418938d5843 (patch) | |
| tree | 1638e8042365f69e6d90faab0aa066345ebef9db | |
| parent | 62e1c80cf532681c02ecd2ddcb7c920381a0465e (diff) | |
| download | samba-7eac3100ea77eca64152444336180418938d5843.tar.gz samba-7eac3100ea77eca64152444336180418938d5843.tar.bz2 samba-7eac3100ea77eca64152444336180418938d5843.zip | |
libndr: move ndr_print_bool to ndr_basic.c
Guenther
| -rw-r--r-- | librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | librpc/ndr/ndr_basic.c | 5 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/librpc/ndr/util.c | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 06cc93a891..ff20755700 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -571,4 +571,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_enum_uint16(struct ndr_push *ndr, int ndr_fl _PUBLIC_ enum ndr_err_code ndr_push_enum_uint32(struct ndr_push *ndr, int ndr_flags, uint32_t v); _PUBLIC_ enum ndr_err_code ndr_push_enum_uint1632(struct ndr_push *ndr, int ndr_flags, uint16_t v); +_PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b); + #endif /* __LIBNDR_H__ */ diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index ff207f4bb9..d628faaa9a 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -1208,3 +1208,8 @@ _PUBLIC_ uint32_t ndr_size_DATA_BLOB(int ret, const DATA_BLOB *data, int flags) if (!data) return ret; return ret + data->length; } + +_PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b) +{ + ndr->print(ndr, "%-25s: %s", name, b?"true":"false"); +} diff --git a/source3/include/proto.h b/source3/include/proto.h index de6e7acc9e..a3597cc2c8 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1587,7 +1587,6 @@ void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct s enum ndr_err_code ndr_push_file_id(struct ndr_push *ndr, int ndr_flags, const struct file_id *r); enum ndr_err_code ndr_pull_file_id(struct ndr_pull *ndr, int ndr_flags, struct file_id *r); void ndr_print_file_id(struct ndr_print *ndr, const char *name, const struct file_id *r); -_PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b); _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss); const char *ndr_errstr(enum ndr_err_code err); extern const struct ndr_syntax_id null_ndr_syntax_id; diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c index d6a41a0ef1..33b1bb2076 100644 --- a/source3/librpc/ndr/util.c +++ b/source3/librpc/ndr/util.c @@ -200,11 +200,6 @@ void ndr_print_file_id(struct ndr_print *ndr, const char *name, const struct fil ndr->depth--; } -_PUBLIC_ void ndr_print_bool(struct ndr_print *ndr, const char *name, const bool b) -{ - ndr->print(ndr, "%-25s: %s", name, b?"true":"false"); -} - _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss) { char addr[INET6_ADDRSTRLEN]; |