[svn-r3065] Purpose:

    Code cleanup
Description:
    Remove some warnings...
Platforms tested:
    FreeBSD 4.2 (hawkwind) & IRIX64 6.5 (modi4)

2 files changed, 19 insertions, 34 deletions

diff --git a/src/H5R.c b/src/H5R.c
index ec821ab..86044d0 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -491,7 +491,6 @@ hid_t
 H5Rdereference(hid_t id, H5R_type_t ref_type, void *_ref)
 {
     H5G_entry_t *loc = NULL;    /* Symbol table entry */
-    H5D_t *dset = NULL;     /* dataset object */
     H5F_t *file=NULL;       /* File object */
     hid_t ret_value = FAIL;
 
@@ -499,20 +498,16 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, void *_ref)
     H5TRACE3("i","iRtx",id,ref_type,_ref);
 
     /* Check args */
-    if (H5I_DATASET == H5I_get_type(id)) {
-        if(NULL == (dset = H5I_object(id)))
-            HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
-        file=H5D_get_file(dset);
-    } else {
-        if (NULL == (loc = H5G_loc(id)))
-            HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
-        file=loc->file;
-    }
+    if (NULL == (loc = H5G_loc(id)))
+        HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
     if(ref_type<=H5R_BADTYPE || ref_type>=H5R_MAXTYPE)
         HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type");
     if(_ref==NULL)
         HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer");
 
+    /* Get the file pointer from the entry */
+    file=loc->file;
+
     /* Create reference */
     if ((ret_value=H5R_dereference(file, ref_type, _ref))<0)
         HGOTO_ERROR (H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable dereference object");
@@ -635,7 +630,6 @@ hid_t
 H5Rget_region(hid_t id, H5R_type_t ref_type, void *_ref)
 {
     H5G_entry_t *loc = NULL;    /* Symbol table entry */
-    H5D_t *dset = NULL;     /* dataset object */
     H5S_t *space = NULL;    /* dataspace object */
     H5F_t *file=NULL;       /* File object */
     hid_t ret_value = FAIL;
@@ -644,20 +638,16 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, void *_ref)
     H5TRACE3("i","iRtx",id,ref_type,_ref);
 
     /* Check args */
-    if (H5I_DATASET == H5I_get_type(id)) {
-        if(NULL == (dset = H5I_object(id)))
-            HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
-        file=H5D_get_file(dset);
-    } else {
-        if (NULL == (loc = H5G_loc(id)))
-            HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
-        file=loc->file;
-    }
+    if (NULL == (loc = H5G_loc(id)))
+        HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
     if(ref_type!=H5R_DATASET_REGION)
         HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type");
     if(_ref==NULL)
         HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer");
 
+    /* Get the file pointer from the entry */
+    file=loc->file;
+
     /* Get the dataspace with the correct region selected */
     if ((space=H5R_get_region(file,ref_type,_ref))==NULL)
         HGOTO_ERROR (H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create dataspace");
@@ -749,7 +739,6 @@ int
 H5Rget_object_type(hid_t id, void *_ref)
 {
     H5G_entry_t *loc = NULL;    /* Symbol table entry */
-    H5D_t *dset = NULL;     /* dataset object */
     H5F_t *file=NULL;       /* File object */
     hid_t ret_value = H5G_UNKNOWN;
 
@@ -757,19 +746,15 @@ H5Rget_object_type(hid_t id, void *_ref)
     H5TRACE2("Is","ix",id,_ref);
 
     /* Check args */
-    if (H5I_DATASET == H5I_get_type(id)) {
-        if(NULL == (dset = H5I_object(id)))
-            HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
-        file=H5D_get_file(dset);
-    } else {
-        if (NULL == (loc = H5G_loc(id)))
-            HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
-        file=loc->file;
-    }
+    if (NULL == (loc = H5G_loc(id)))
+        HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
     if(_ref==NULL)
         HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN,
 		     "invalid reference pointer");
 
+    /* Get the file pointer from the entry */
+    file=loc->file;
+
     /* Get the object information */
     if ((ret_value=H5R_get_object_type(file,_ref))<0) {
 	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN,
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 6420d2e..0934bd2 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -995,7 +995,7 @@ for(i=0; i<file_space->extent.u.simple.rank; i++)
 #endif /* QAK */
     /* Check if we stopped in the middle of a sequence of elements */
     if((file_iter->hyp.pos[fast_dim]-file_space->select.sel_info.hslab.diminfo[fast_dim].start)%file_space->select.sel_info.hslab.diminfo[fast_dim].stride!=0 ||
-        (file_iter->hyp.pos[fast_dim]!=file_space->select.sel_info.hslab.diminfo[fast_dim].start) && file_space->select.sel_info.hslab.diminfo[fast_dim].stride==1) {
+        ((file_iter->hyp.pos[fast_dim]!=file_space->select.sel_info.hslab.diminfo[fast_dim].start) && file_space->select.sel_info.hslab.diminfo[fast_dim].stride==1)) {
         size_t leftover;  /* The number of elements left over from the last sequence */
 
 #ifdef QAK
@@ -1591,7 +1591,7 @@ for(i=0; i<file_space->extent.u.simple.rank; i++)
 
     /* Check if we stopped in the middle of a sequence of elements */
     if((file_iter->hyp.pos[fast_dim]-file_space->select.sel_info.hslab.diminfo[fast_dim].start)%file_space->select.sel_info.hslab.diminfo[fast_dim].stride!=0 ||
-        (file_iter->hyp.pos[fast_dim]!=file_space->select.sel_info.hslab.diminfo[fast_dim].start) && file_space->select.sel_info.hslab.diminfo[fast_dim].stride==1) {
+        ((file_iter->hyp.pos[fast_dim]!=file_space->select.sel_info.hslab.diminfo[fast_dim].start) && file_space->select.sel_info.hslab.diminfo[fast_dim].stride==1)) {
         size_t leftover;  /* The number of elements left over from the last sequence */
 
 #ifdef QAK
@@ -2146,7 +2146,7 @@ for(i=0; i<ndims; i++)
 
     /* Check if we stopped in the middle of a sequence of elements */
     if((mem_iter->hyp.pos[fast_dim]-mem_space->select.sel_info.hslab.diminfo[fast_dim].start)%mem_space->select.sel_info.hslab.diminfo[fast_dim].stride!=0 ||
-        (mem_iter->hyp.pos[fast_dim]!=mem_space->select.sel_info.hslab.diminfo[fast_dim].start) && mem_space->select.sel_info.hslab.diminfo[fast_dim].stride==1) {
+        ((mem_iter->hyp.pos[fast_dim]!=mem_space->select.sel_info.hslab.diminfo[fast_dim].start) && mem_space->select.sel_info.hslab.diminfo[fast_dim].stride==1)) {
         size_t leftover;  /* The number of elements left over from the last sequence */
 
 #ifdef QAK
@@ -2657,7 +2657,7 @@ for(i=0; i<ndims; i++)
 
     /* Check if we stopped in the middle of a sequence of elements */
     if((mem_iter->hyp.pos[fast_dim]-mem_space->select.sel_info.hslab.diminfo[fast_dim].start)%mem_space->select.sel_info.hslab.diminfo[fast_dim].stride!=0 ||
-        (mem_iter->hyp.pos[fast_dim]!=mem_space->select.sel_info.hslab.diminfo[fast_dim].start) && mem_space->select.sel_info.hslab.diminfo[fast_dim].stride==1) {
+        ((mem_iter->hyp.pos[fast_dim]!=mem_space->select.sel_info.hslab.diminfo[fast_dim].start) && mem_space->select.sel_info.hslab.diminfo[fast_dim].stride==1)) {
         uintn leftover;  /* The number of elements left over from the last sequence */
 
 #ifdef QAK