librpc Make ndrdump use printf() rather than having to mess with DEBUG()

[metze/samba/wip.git] / librpc / tools / ndrdump.c

diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c
index 6fc903fa323b043a69eece6bb625c7d210f4ffc6..b9b4bc7fd6bc3762aa64ee28adb2ccd853d0e5de 100644 (file)
--- a/librpc/tools/ndrdump.c
+++ b/librpc/tools/ndrdump.c
@@ -127,13 +127,14 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
        return p;
 }
 
+static void printf_cb(const char *buf, void *private_data)
+{
+       printf("%s", buf);
+}
+
 static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
 {
-       if (force) {
-               dump_data(0, d, l);
-       } else {
-               dump_data_skip_zeros(0, d, l);
-       }
+       dump_data_cb(d, l, !force, printf_cb, NULL);
 }
 
  int main(int argc, const char *argv[])
@@ -172,10 +173,6 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
                { NULL }
        };
 
-       if (DEBUGLEVEL < 1) {
-               DEBUGLEVEL = 1;
-       }
-
        ndr_table_init();
 
        /* Initialise samba stuff */
@@ -183,8 +180,6 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
 
        setlinebuf(stdout);
 
-       dbf = x_stderr;
-
        setup_logging_stdout();
 
        pc = poptGetContext("ndrdump", argc, argv, long_options, 0);
@@ -354,7 +349,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
        }
 
        ndr_print = talloc_zero(mem_ctx, struct ndr_print);
-       ndr_print->print = ndr_print_debug_helper;
+       ndr_print->print = ndr_print_printf_helper;
        ndr_print->depth = 1;
        f->ndr_print(ndr_print, function, flags, st);