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

Introduce dump_data_file

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Jan 25 11:57:18 CET 2012 on sn-devel-104
This commit is contained in:
Volker Lendecke 2012-01-25 09:10:04 +01:00 committed by Volker Lendecke
parent 8dd63b9343
commit e9d66999c6
4 changed files with 20 additions and 13 deletions

View File

@ -701,6 +701,12 @@ void dump_data_cb(const uint8_t *buf, int len,
void (*cb)(const char *buf, void *private_data),
void *private_data);
/**
* Write dump of binary data to a FILE
*/
void dump_data_file(const uint8_t *buf, int len, bool omit_zero_bytes,
FILE *f);
/**
* Write dump of binary data to the log file.
*

View File

@ -462,6 +462,17 @@ _PUBLIC_ void dump_data_skip_zeros(int level, const uint8_t *buf, int len)
dump_data_cb(buf, len, true, debugadd_cb, &level);
}
static void fprintf_cb(const char *buf, void *private_data)
{
FILE *f = (FILE *)private_data;
fprintf(f, "%s", buf);
}
void dump_data_file(const uint8_t *buf, int len, bool omit_zero_bytes,
FILE *f)
{
dump_data_cb(buf, len, omit_zero_bytes, fprintf_cb, f);
}
/**
malloc that aborts with smb_panic on fail or zero size.

View File

@ -125,14 +125,9 @@ 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)
{
dump_data_cb(d, l, !force, printf_cb, NULL);
dump_data_file(d, l, !force, stdout);
}
static NTSTATUS ndrdump_pull_and_print_pipes(const char *function,

View File

@ -3463,11 +3463,6 @@ static int cmd_getfacl(void)
return 0;
}
static void printf_cb(const char *buf, void *private_data)
{
printf("%s", buf);
}
/****************************************************************************
Get the EA list of a file
****************************************************************************/
@ -3511,8 +3506,8 @@ static int cmd_geteas(void)
for (i=0; i<num_eas; i++) {
d_printf("%s (%d) =\n", eas[i].name, (int)eas[i].flags);
dump_data_cb(eas[i].value.data, eas[i].value.length, false,
printf_cb, NULL);
dump_data_file(eas[i].value.data, eas[i].value.length, false,
stdout);
d_printf("\n");
}