From ac014798ff719c69a895aff0189a794ed9046554 Mon Sep 17 00:00:00 2001 From: Diego Pettenò Date: Sun, 27 Jun 2010 12:20:39 +0000 Subject: tableprint: use the type name as-is for the functions' names. This drops one parameter from the functions' macros, and require structures to be typedeffed, but ensures that it is possible to map 1-to-1 the type to the function name. Originally committed as revision 23820 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/tableprint.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'libavcodec/tableprint.h') diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h index 76ab8028b5..849bccf78e 100644 --- a/libavcodec/tableprint.h +++ b/libavcodec/tableprint.h @@ -26,8 +26,8 @@ #include #include -#define WRITE_1D_FUNC_ARGV(name, type, linebrk, fmtstr, ...)\ -void write_##name##_array(const type *data, int len)\ +#define WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, ...)\ +void write_##type##_array(const type *data, int len)\ {\ int i;\ printf(" ");\ @@ -38,17 +38,17 @@ void write_##name##_array(const type *data, int len)\ printf(" "fmtstr"\n", __VA_ARGS__);\ } -#define WRITE_1D_FUNC(name, type, fmtstr, linebrk)\ - WRITE_1D_FUNC_ARGV(name, type, linebrk, fmtstr, data[i]) +#define WRITE_1D_FUNC(type, fmtstr, linebrk)\ + WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, data[i]) -#define WRITE_2D_FUNC(name, type)\ -void write_##name##_2d_array(const void *arg, int len, int len2)\ +#define WRITE_2D_FUNC(type)\ +void write_##type##_2d_array(const void *arg, int len, int len2)\ {\ const type *data = arg;\ int i;\ printf(" {\n");\ for (i = 0; i < len; i++) {\ - write_##name##_array(data + i * len2, len2);\ + write_##type##_array(data + i * len2, len2);\ printf(i == len - 1 ? " }\n" : " }, {\n");\ }\ } @@ -58,15 +58,15 @@ void write_##name##_2d_array(const void *arg, int len, int len2)\ * * \{ */ -void write_int8_array (const int8_t *, int); -void write_uint8_array (const uint8_t *, int); -void write_uint16_array (const uint16_t *, int); -void write_uint32_array (const uint32_t *, int); -void write_float_array (const float *, int); -void write_int8_2d_array (const void *, int, int); -void write_uint8_2d_array (const void *, int, int); -void write_uint32_2d_array(const void *, int, int); -void write_float_2d_array (const void *, int, int); +void write_int8_t_array (const int8_t *, int); +void write_uint8_t_array (const uint8_t *, int); +void write_uint16_t_array (const uint16_t *, int); +void write_uint32_t_array (const uint32_t *, int); +void write_float_array (const float *, int); +void write_int8_t_2d_array (const void *, int, int); +void write_uint8_t_2d_array (const void *, int, int); +void write_uint32_t_2d_array(const void *, int, int); +void write_float_2d_array (const void *, int, int); /** \} */ // end of printfuncs group /** Write a standard file header */ -- cgit v1.2.3