File 0001-Fix-missing-semicolon-in-H5Epush_ret-invocations.patch of Package silo
From 307b2bb23febeb6ba98319d794f68366b79f47e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Wed, 21 Sep 2022 00:20:59 +0200
Subject: [PATCH] Fix missing semicolon in H5Epush_ret invocations
Upstream changed the macro from `{<code>}` to `do {<code>} while(0)`, so
the call now needs a trailing semicolon.
---
src/hdf5_drv/H5FDsilo.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/hdf5_drv/H5FDsilo.c b/src/hdf5_drv/H5FDsilo.c
index 1855c63..43c500f 100644
--- a/src/hdf5_drv/H5FDsilo.c
+++ b/src/hdf5_drv/H5FDsilo.c
@@ -252,13 +252,13 @@ static const char *flavors(H5F_mem_t m)
snprintf(msg, sizeof(msg), Msg "(errno=%d, \"%s\")", \
Errno, strerror(Errno)); \
ret_value = Ret; \
- H5Epush_ret(Func, Cls, Maj, Min, msg, Ret) \
+ H5Epush_ret(Func, Cls, Maj, Min, msg, Ret); \
}
#else
#define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno) \
{ \
ret_value = Ret; \
- H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret) \
+ H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret); \
}
#endif
@@ -1355,7 +1355,7 @@ H5FD_silo_sb_encode(H5FD_t *_file, char *name/*out*/,
assert(sizeof(hsize_t)<=8);
memcpy(p, &file->block_size, sizeof(hsize_t));
if (H5Tconvert(H5T_NATIVE_HSIZE, H5T_STD_U64LE, 1, buf+8, NULL, H5P_DEFAULT)<0)
- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
+ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
return 0;
}
@@ -1383,14 +1383,14 @@ H5FD_silo_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
/* Make sure the name/version number is correct */
if (strcmp(name, "LLNLsilo"))
- H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1)
+ H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1);
buf += 8;
/* Decode block size */
assert(sizeof(hsize_t)<=8);
memcpy(x, buf, 8);
if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HSIZE, 1, x, NULL, H5P_DEFAULT)<0)
- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
+ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
ap = (hsize_t*)x;
/*file->block_size = *ap; ignore stored value for now */
--
2.37.3