diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-10-04 04:17:36 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-10-04 04:17:36 (GMT) |
| commit | c9157c5d5e4af4b6f350f932c9d9e13c3c51d8ed (patch) | |
| tree | b41f5770f89ba448b659b0cf81780b7ba8795064 | |
| parent | d1a4ff0b3056b323ba4ae9e8b03f86115d7456e7 (diff) | |
| download | hdf5-c9157c5d5e4af4b6f350f932c9d9e13c3c51d8ed.zip hdf5-c9157c5d5e4af4b6f350f932c9d9e13c3c51d8ed.tar.gz hdf5-c9157c5d5e4af4b6f350f932c9d9e13c3c51d8ed.tar.bz2 | |
[svn-r22860] fix one issue exposed by daily test in H5Tconv where if statement needs to be on one line in the function Macro
| -rw-r--r-- | src/H5Tconv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 8081ae3..8057530 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -629,8 +629,7 @@ case H5T_CONV_INIT: \ /* Sanity check and initialize statistics */ \ cdata->need_bkg = H5T_BKG_NO; \ - if (NULL==(st=(H5T_t*)H5I_object_verify(src_id, H5I_DATATYPE)) || \ - NULL==(dt=(H5T_t*)H5I_object_verify(dst_id, H5I_DATATYPE))) \ + if (NULL==(st=(H5T_t*)H5I_object_verify(src_id, H5I_DATATYPE)) || NULL==(dt=(H5T_t*)H5I_object_verify(dst_id, H5I_DATATYPE))) \ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, \ "unable to dereference datatype object ID") \ if (st->shared->size!=sizeof(ST) || dt->shared->size!=sizeof(DT)) \ @@ -677,8 +676,7 @@ HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get conversion exception callback") \ \ /* Get source and destination datatypes */ \ - if (NULL==(st=(H5T_t*)H5I_object_verify(src_id, H5I_DATATYPE)) || \ - NULL==(dt=(H5T_t*)H5I_object_verify(dst_id, H5I_DATATYPE))) \ + if (NULL==(st=(H5T_t*)H5I_object_verify(src_id, H5I_DATATYPE)) || NULL==(dt=(H5T_t*)H5I_object_verify(dst_id, H5I_DATATYPE))) \ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to dereference datatype object ID") \ \ /* Get source & destination precisions into a variable */ \ |