diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-26 23:23:58 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-11-26 23:23:58 (GMT) |
| commit | 2bb0f52edfdd0ce11595ee673a934f306ca5c4fa (patch) | |
| tree | 9be4fa9e5b48e88f993723daf1b13ebd03219f66 /src/H5Fprivate.h | |
| parent | 4c8a2f726a2eb47a937430e28994db8be1b87b00 (diff) | |
| download | hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.zip hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.tar.gz hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.tar.bz2 | |
Revert "fix issues from previous PR comments"
This reverts commit d242a900f420b040e364f6c0976c01593e955db3.
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 0fe1867..9ad33b2 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -178,19 +178,19 @@ typedef struct H5F_t H5F_t; /* Decode a variable-sized buffer */ /* (Assumes that the high bits of the integer will be zero) */ -# define DECODE_VAR(p, typ, n, l) { \ +# define DECODE_VAR(p, n, l) { \ size_t _i; \ \ n = 0; \ (p) += l; \ for (_i = 0; _i < l; _i++) \ - n = (typ)((n << 8) | *(--p)); \ + n = (uint16_t)((n << 8) | *(--p)); \ (p) += l; \ } /* Decode a variable-sized buffer into a 32-bit unsigned integer */ /* (Assumes that the high bits of the integer will be zero) */ -# define UINT32DECODE_VAR(p, n, l) DECODE_VAR(p, uint32_t, n, l) +# define UINT32DECODE_VAR(p, n, l) DECODE_VAR(p, n, l) # define INT64DECODE(p, n) { \ /* WE DON'T CHECK FOR OVERFLOW! */ \ @@ -216,14 +216,14 @@ typedef struct H5F_t H5F_t; /* Decode a variable-sized buffer into a 64-bit unsigned integer */ /* (Assumes that the high bits of the integer will be zero) */ -# define UINT64DECODE_VAR(p, n, l) DECODE_VAR(p, uint64_t, n, l) +# define UINT64DECODE_VAR(p, n, l) DECODE_VAR(p, n, l) /* Decode a 64-bit unsigned integer and its length from a variable-sized buffer */ /* (Assumes that the high bits of the integer will be zero) */ # define UINT64DECODE_VARLEN(p, n) { \ unsigned _s = *(p)++; \ \ - UINT64DECODE_VAR(p, uint64_t, n, _s); \ + UINT64DECODE_VAR(p, n, _s); \ } # define H5_DECODE_UNSIGNED(p, n) { \ |