sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

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

Browse Source 
This means it no longer needs to force the debug level etc.

(this builds on the fine work by Volker to create dump_data_cb())

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2010-10-27 15:19:05 +11:00
parent cf310a4306
commit d9b7123cb7
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
librpc/ndr/libndr.h
View File

@ -406,6 +406,7 @@ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx);
DATA_BLOB ndr_push_blob(struct ndr_push *ndr);
enum ndr_err_code ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size);
void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
void ndr_print_printf_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr);
void ndr_print_union_debug(ndr_print_fn_t fn, const char *name, uint32_t level, void *ptr);

19
librpc/ndr/ndr.c
View File

@ -190,6 +190,25 @@ _PUBLIC_ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format,
free(s);
}
_PUBLIC_ void ndr_print_printf_helper(struct ndr_print *ndr, const char *format, ...)
{
va_list ap;
int i;
if (!ndr->no_newline) {
for (i=0;i<ndr->depth;i++) {
printf(" ");
}
}
va_start(ap, format);
vprintf(format, ap);
va_end(ap);
if (!ndr->no_newline) {
printf("\n");
}
}
_PUBLIC_ void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...)
{
va_list ap;

19
librpc/tools/ndrdump.c
View File

@ -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);