diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-08 21:30:38 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-08 21:30:38 (GMT) |
| commit | db4acaf3abfcc3e156e7ac575005257ea4e3e065 (patch) | |
| tree | 0a496cf3d24b757f52133f3ce8e7f2b9e0cbd654 /tools/h5repack | |
| parent | 2fdeab0ebde453b113cfab01b6bc32003e6e3275 (diff) | |
| download | hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.zip hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.gz hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.bz2 | |
[svn-r27165] Merge 27133 & 27158 from trunk:
- Add a new attribute function characterstic for format:
* H5_ATTR_FORMAT(X,Y,Z) __attribute__((format(X, Y, Z)))
- Rename UNUSED attribute characterstic to H5_ATTR_UNUSED.
- Rename NORETURN attribute characterstic to H5_ATTR_NORETURN
tested with h5committest.
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 2 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index a25e789..1963750 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -66,7 +66,7 @@ static void print_user_block(const char *filename, hid_t fid); static herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void *udata); /* get the major number from the error stack. */ -static herr_t walk_error_callback(UNUSED unsigned n, const H5E_error2_t *err_desc, void *udata) { +static herr_t walk_error_callback(H5_ATTR_UNUSED unsigned n, const H5E_error2_t *err_desc, void *udata) { if (err_desc) *((int *) udata) = err_desc->maj_num; diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index 2d896f7..f3fd469 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -21,7 +21,7 @@ #define PROGRAMNAME "h5repack" static int parse_command_line(int argc, const char **argv, pack_opt_t* options); -static void leave(int ret) NORETURN; +static void leave(int ret) H5_ATTR_NORETURN; /* module-scoped variables */ |