diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
commit | 2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8 (patch) | |
tree | 795739e979593ab3b0d0d3b4a6124c1f7049ab50 /src/H5system.c | |
parent | 408b9b1f3b8e84ba090c51e665d38eedef32c7ee (diff) | |
parent | d7414053638316081f11fad78474b2c3cde336c5 (diff) | |
download | hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.zip hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.gz hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.bz2 |
merge and fix conflict
Diffstat (limited to 'src/H5system.c')
-rw-r--r-- | src/H5system.c | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/src/H5system.c b/src/H5system.c index 384360d..9310243 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -86,7 +86,11 @@ static hbool_t H5_ntzset = FALSE; * prints an `hsize_t' value as a hex number right justified and * zero filled in an 18-character field. * - * The conversion `a' refers to an `haddr_t' type. + * The conversion 'a' refers to an haddr_t type. + * + * The conversion 't' refers to an htri_t type. + * + * The conversion 'k' refers to an H5O_token_t type. * * Return: Success: Number of characters printed * @@ -414,6 +418,32 @@ HDfprintf(FILE *stream, const char *fmt, ...) } break; + case 'k': + { + H5O_token_t token = HDva_arg(ap, H5O_token_t); + + /* Print the raw token. */ + n = fprintf(stream, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", + (unsigned char)token.__data[15], + (unsigned char)token.__data[14], + (unsigned char)token.__data[13], + (unsigned char)token.__data[12], + (unsigned char)token.__data[11], + (unsigned char)token.__data[10], + (unsigned char)token.__data[9], + (unsigned char)token.__data[8], + (unsigned char)token.__data[7], + (unsigned char)token.__data[6], + (unsigned char)token.__data[5], + (unsigned char)token.__data[4], + (unsigned char)token.__data[3], + (unsigned char)token.__data[2], + (unsigned char)token.__data[1], + (unsigned char)token.__data[0] + ); + } + break; + default: HDfputs(format_templ, stream); n = (int)HDstrlen(format_templ); |