libndr: move ndr_print_bool to ndr_basic.c

Guenther

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 06cc93a8919ed2b58180a5ed28a672ce38755fb1..ff20755700d4890660971315a97704a538c923d1 100644 (file)
--- 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 ff207f4bb93f0a86fe76ef89fd6b11f4f50850ef..d628faaa9aa09e5e951a1fa4670bdaec84a0ab6f 100644 (file)
--- 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 de6e7acc9e9438cce1d5176881b1950db5474f57..a3597cc2c809716b05d4cec98d479b2fb8ecab0d 100644 (file)
--- 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 d6a41a0ef1934f659d46bf969ccf01bc79b9d975..33b1bb2076a0a116f09bad68627e6ec909867311 100644 (file)
--- 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];