summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5Ztrans.c9
-rw-r--r--test/dtransform.c4
2 files changed, 6 insertions, 7 deletions
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index 3d1ff41..04f3a52 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -380,11 +380,12 @@ done:
static H5Z_node *
H5Z_parse_expression(H5Z_token *current)
{
+ H5Z_node *expr;
void* ret_value=NULL;
-
- FUNC_ENTER_NOAPI(H5Z_parse_expression, NULL)
- H5Z_node *expr = H5Z_parse_term(current);
+ FUNC_ENTER_NOAPI_NOINIT(H5Z_parse_expression)
+
+ expr = H5Z_parse_term(current);
for (;;) {
H5Z_node *new_node;
@@ -447,8 +448,6 @@ H5Z_parse_expression(H5Z_token *current)
done:
FUNC_LEAVE_NOAPI(expr)
-
-
}
diff --git a/test/dtransform.c b/test/dtransform.c
index 0f2e4e8..b3a0943 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -60,7 +60,7 @@ int main()
windchillCcalc[row][col] = (5/9.0)*(windchillF[row][col] - 32);
}
- if( (compare(windchillCread, windchillCcalc)) == 0)
+ if( (compare((int*)windchillCread, (int*)windchillCcalc)) == 0)
{
fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
TEST_ERROR;
@@ -68,7 +68,7 @@ int main()
else
{
err = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFread);
- if( (compare(windchillF, windchillFread)) == 0)
+ if( (compare((int *)windchillF, (int *)windchillFread)) == 0)
{
fprintf(stderr, "ERROR: Conversion failed to match computed data\n");
TEST_ERROR;