summaryrefslogtreecommitdiff
path: root/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-20 18:59:51 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-20 18:59:51 +0200
commit87ec1d2532eb17dfd7f98431bdfa4071be57f683 (patch)
tree7543ac112a660083d05c1b4734ffb7fdc169d656 /librpc
parent01a902f59978cebdab22aaee7d9e0c9bb78bc649 (diff)
downloadsamba-87ec1d2532eb17dfd7f98431bdfa4071be57f683.tar.gz
samba-87ec1d2532eb17dfd7f98431bdfa4071be57f683.tar.bz2
samba-87ec1d2532eb17dfd7f98431bdfa4071be57f683.zip
Make sure prototypes are always included, make some functions static and
remove some unused functions.
Diffstat (limited to 'librpc')
-rw-r--r--librpc/ndr/ndr_misc.c9
-rw-r--r--librpc/ndr/ndr_table.c2
-rw-r--r--librpc/ndr/ndr_table.h1
-rw-r--r--librpc/tools/ndrdump.c5
4 files changed, 3 insertions, 14 deletions
diff --git a/librpc/ndr/ndr_misc.c b/librpc/ndr/ndr_misc.c
index 2e5ecbac6d..c4a1adb3ea 100644
--- a/librpc/ndr/ndr_misc.c
+++ b/librpc/ndr/ndr_misc.c
@@ -24,15 +24,6 @@
#include "system/network.h"
#include "librpc/ndr/libndr.h"
-_PUBLIC_ void ndr_print_in_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip)
-{
- struct in_addr ip;
-
- ip.s_addr = htonl(_ip->s_addr);
-
- ndr->print(ndr, "%-25s: %s", name, inet_ntoa(ip));
-}
-
_PUBLIC_ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid)
{
ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, guid));
diff --git a/librpc/ndr/ndr_table.c b/librpc/ndr/ndr_table.c
index f7c381f22e..7ca04173f7 100644
--- a/librpc/ndr/ndr_table.c
+++ b/librpc/ndr/ndr_table.c
@@ -120,8 +120,6 @@ const struct ndr_interface_list *ndr_table_list(void)
}
-NTSTATUS ndr_table_register_builtin_tables(void);
-
NTSTATUS ndr_table_init(void)
{
static bool initialized = false;
diff --git a/librpc/ndr/ndr_table.h b/librpc/ndr/ndr_table.h
index 905c2e5e43..9e8fea1db6 100644
--- a/librpc/ndr/ndr_table.h
+++ b/librpc/ndr/ndr_table.h
@@ -8,6 +8,7 @@ const struct ndr_interface_table *ndr_table_by_name(const char *name);
const struct ndr_interface_table *ndr_table_by_uuid(const struct GUID *uuid);
const struct ndr_interface_list *ndr_table_list(void);
NTSTATUS ndr_table_init(void);
+NTSTATUS ndr_table_register_builtin_tables(void);
#endif /* _NDR_TABLE_PROTO_H_ */
diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c
index 3d7c644902..69b304dc9c 100644
--- a/librpc/tools/ndrdump.c
+++ b/librpc/tools/ndrdump.c
@@ -171,7 +171,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
};
ndr_table_init();
-#if (_SAMBA_BUILD_ >= 3)
+
/* Initialise samba stuff */
load_case_tables();
@@ -179,8 +179,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
dbf = x_stderr;
- setup_logging(argv[0],True);
-#endif
+ setup_logging(argv[0], true);
pc = poptGetContext("ndrdump", argc, argv, long_options, 0);