diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-09-30 16:52:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-09-30 16:52:03 (GMT) |
| commit | 4611f95d4c8b26e5893e024b0482be1e70f05ad1 (patch) | |
| tree | 5d2634f3d632ee83c09145116a0528e001ad74c2 | |
| parent | 2be58419840f11b83f7a506a72c31968cb4d4fc7 (diff) | |
| download | hdf5-4611f95d4c8b26e5893e024b0482be1e70f05ad1.zip hdf5-4611f95d4c8b26e5893e024b0482be1e70f05ad1.tar.gz hdf5-4611f95d4c8b26e5893e024b0482be1e70f05ad1.tar.bz2 | |
[svn-r24224] HDFFV-8529: Space separate define strings
Tested: h5committest
| -rw-r--r-- | src/H5public.h | 2 | ||||
| -rw-r--r-- | tools/lib/h5diff_array.c | 12 | ||||
| -rw-r--r-- | tools/lib/h5tools.h | 2 | ||||
| -rw-r--r-- | tools/lib/h5trav.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/H5public.h b/src/H5public.h index 7bd094a..c06ea7a 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -195,7 +195,7 @@ typedef signed long long hssize_t; #elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG # define H5_PRINTF_HADDR_FMT "%lu" #elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG_LONG -# define H5_PRINTF_HADDR_FMT "%"H5_PRINTF_LL_WIDTH"u" +# define H5_PRINTF_HADDR_FMT "%" H5_PRINTF_LL_WIDTH "u" #else # error "nothing appropriate for H5_PRINTF_HADDR_FMT" #endif diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index d08c23f..cfd171a 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -40,8 +40,8 @@ #define UI_FORMAT "%-15u %-15u %-15u\n" #define LI_FORMAT "%-15ld %-15ld %-15ld\n" #define ULI_FORMAT "%-15lu %-15lu %-15lu\n" -#define LLI_FORMAT "%-15"H5_PRINTF_LL_WIDTH"d %-15"H5_PRINTF_LL_WIDTH"d %-15"H5_PRINTF_LL_WIDTH"d\n" -#define ULLI_FORMAT "%-15"H5_PRINTF_LL_WIDTH"u %-15"H5_PRINTF_LL_WIDTH"u %-15"H5_PRINTF_LL_WIDTH"u\n" +#define LLI_FORMAT "%-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d\n" +#define ULLI_FORMAT "%-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "u\n" /* with -p option */ #define F_FORMAT_P "%-15.10g %-15.10g %-15.10g %-14.10g\n" @@ -54,8 +54,8 @@ #define UI_FORMAT_P "%-15u %-15u %-15u %-14f\n" #define LI_FORMAT_P "%-15ld %-15ld %-15ld %-14f\n" #define ULI_FORMAT_P "%-15lu %-15lu %-15lu %-14f\n" -#define LLI_FORMAT_P "%-15"H5_PRINTF_LL_WIDTH"d %-15"H5_PRINTF_LL_WIDTH"d %-15"H5_PRINTF_LL_WIDTH"d %-14f\n" -#define ULLI_FORMAT_P "%-15"H5_PRINTF_LL_WIDTH"u %-15"H5_PRINTF_LL_WIDTH"u %-15"H5_PRINTF_LL_WIDTH"d %-14f\n" +#define LLI_FORMAT_P "%-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d %-14f\n" +#define ULLI_FORMAT_P "%-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "d %-14f\n" #define SPACES " " /* not comparable */ @@ -69,8 +69,8 @@ #define UI_FORMAT_P_NOTCOMP "%-15u %-15u %-15u not comparable\n" #define LI_FORMAT_P_NOTCOMP "%-15ld %-15ld %-15ld not comparable\n" #define ULI_FORMAT_P_NOTCOMP "%-15lu %-15lu %-15lu not comparable\n" -#define LLI_FORMAT_P_NOTCOMP "%-15"H5_PRINTF_LL_WIDTH"d %-15"H5_PRINTF_LL_WIDTH"d %-15"H5_PRINTF_LL_WIDTH"d not comparable\n" -#define ULLI_FORMAT_P_NOTCOMP "%-15"H5_PRINTF_LL_WIDTH"u %-15"H5_PRINTF_LL_WIDTH"u %-15"H5_PRINTF_LL_WIDTH"d not comparable\n" +#define LLI_FORMAT_P_NOTCOMP "%-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d not comparable\n" +#define ULLI_FORMAT_P_NOTCOMP "%-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "d not comparable\n" /* if system EPSILON is defined, use the system EPSILON; otherwise, use diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index ea6a44f..d6c3720 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -32,7 +32,7 @@ #define END_OF_DATA 0x0002 /* format for hsize_t */ -#define HSIZE_T_FORMAT "%"H5_PRINTF_LL_WIDTH"u" +#define HSIZE_T_FORMAT "%" H5_PRINTF_LL_WIDTH "u" #define H5TOOLS_DUMP_MAX_RANK H5S_MAX_RANK diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index 58d7959..a475ded 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -49,7 +49,7 @@ typedef struct { } trav_print_udata_t; /* format for hsize_t */ -#define HSIZE_T_FORMAT "%"H5_PRINTF_LL_WIDTH"u" +#define HSIZE_T_FORMAT "%" H5_PRINTF_LL_WIDTH "u" /*------------------------------------------------------------------------- * local functions |