[svn-r14148] Description:

	Add H5Rget_obj_type() to the API versioning and switch internal
routines to use H5Rget_obj_type2()

	Misc. other code cleanups, etc.

Tested on:
        FreeBSD/32 6.2 (duty)
        FreeBSD/64 6.2 (liberty)
        Linux/32 2.6 (kagiso)
        Linux/64 2.6 (smirom)
        AIX/32 5.3 (copper)
        Solaris/32 2.10 (linew)
        Mac OS X/32 10.4.10 (amazon)

3 files changed, 246 insertions, 221 deletions

diff --git a/test/ntypes.c b/test/ntypes.c
index a842ddb..a7713cb 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -1897,6 +1897,8 @@ test_refer_dtype(hid_t file)
     if (envval == NULL) 
         envval = "nomatch";
     if (HDstrcmp(envval, "multi")) {
+        H5O_type_t          obj_type;       /* Object type */
+
 	/* Allocate write & read buffers */
 	wbuf=HDmalloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t)));
 	rbuf=HDmalloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t)));
@@ -1939,9 +1941,11 @@ test_refer_dtype(hid_t file)
 	    TEST_ERROR;
 
 	/* Create reference to named datatype */
-	if(H5Rcreate(wbuf,file,"/Group1/Datatype1",H5R_OBJECT,-1)<0)
+	if(H5Rcreate(wbuf, file, "/Group1/Datatype1", H5R_OBJECT, -1) < 0)
+	    TEST_ERROR;
+	if(H5Rget_obj_type2(dataset, H5R_OBJECT, wbuf, &obj_type) < 0)
 	    TEST_ERROR;
-	if(H5Rget_obj_type(dataset,H5R_OBJECT,wbuf)!=H5G_TYPE)
+	if(obj_type != H5O_TYPE_NAMED_DATATYPE)
 	    TEST_ERROR;
 
 	/* Write selection to disk */
@@ -2050,6 +2054,7 @@ test_refer_dtype2(hid_t file)
     uint8_t             *dwbuf,      /* Buffer for writing numeric data to disk */
                         *drbuf;      /* Buffer for reading numeric data from disk */
     uint8_t             *tu8;        /* Temporary pointer to uint8 data */
+    H5O_type_t          obj_type;    /* Object type */
     int                 i;           /* counting variables */
 
     /* Output message about test being performed */
@@ -2080,61 +2085,63 @@ test_refer_dtype2(hid_t file)
 
 
     /* Create dataspace for the reference dataset */
-    if((sid1=H5Screate_simple(SPACE1_RANK, dims1, NULL))<0)
+    if((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0)
         TEST_ERROR;
 
     /* Create a reference dataset */
-    if((dset1=H5Dcreate(file,"Dataset1",H5T_STD_REF_DSETREG,sid1,H5P_DEFAULT))<0)
+    if((dset1 = H5Dcreate(file, "Dataset1", H5T_STD_REF_DSETREG, sid1, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /* Create references */
     /* Select 6x6 hyperslab for first reference */
-    start[0]=2; start[1]=2;
-    stride[0]=1; stride[1]=1;
-    count[0]=1; count[1]=1;
-    block[0]=6; block[1]=6;
+    start[0] = 2; start[1] = 2;
+    stride[0] = 1; stride[1] = 1;
+    count[0] = 1; count[1] = 1;
+    block[0] = 6; block[1] = 6;
 
-    if(H5Sselect_hyperslab(sid2,H5S_SELECT_SET,start,stride,count,block)<0)
+    if(H5Sselect_hyperslab(sid2, H5S_SELECT_SET, start, stride, count, block) < 0)
         TEST_ERROR;
 
     if((int)H5Sget_select_npoints(sid2) != 36)
         TEST_ERROR;
 
     /* Store first dataset region */
-    if(H5Rcreate(&wbuf,file,"/Dataset2",H5R_DATASET_REGION,sid2)<0)
+    if(H5Rcreate(&wbuf, file, "/Dataset2", H5R_DATASET_REGION, sid2) < 0)
+        TEST_ERROR;
+    if(H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &wbuf, &obj_type) < 0)
         TEST_ERROR;
-    if(H5Rget_obj_type(dset1,H5R_DATASET_REGION,&wbuf) != H5G_DATASET)
+    if(obj_type != H5O_TYPE_DATASET)
         TEST_ERROR;
 
     /* Write selection to disk */
-    if(H5Dwrite(dset1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,&wbuf)<0)
+    if(H5Dwrite(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wbuf) < 0)
         TEST_ERROR;
 
     /* Close disk dataspace */
-    if(H5Sclose(sid1)<0)
+    if(H5Sclose(sid1) < 0)
         TEST_ERROR;
 
     /* Close Dataset */
-    if(H5Dclose(dset1)<0)
+    if(H5Dclose(dset1) < 0)
         TEST_ERROR;
 
     /* Close uint8 dataset dataspace */
-    if(H5Sclose(sid2)<0)
+    if(H5Sclose(sid2) < 0)
         TEST_ERROR;
 
 
 
 
     /* Open the dataset */
-    if((dset1=H5Dopen(file,"/Dataset1"))<0)
+    if((dset1 = H5Dopen(file, "/Dataset1")) < 0)
         TEST_ERROR;
 
     /* Get datatype for dataset */
-    if((dtype = H5Dget_type(dset1))<0)
+    if((dtype = H5Dget_type(dset1)) < 0)
         TEST_ERROR;
 
     /* Construct native type */
-    if((native_type=H5Tget_native_type(dtype, H5T_DIR_DEFAULT))<0)
+    if((native_type = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
         TEST_ERROR;
 
     /* Check if the data type is equal */
@@ -2142,34 +2149,36 @@ test_refer_dtype2(hid_t file)
         TEST_ERROR;
 
     /* Read selection from disk */
-    if(H5Dread(dset1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,&rbuf)<0)
+    if(H5Dread(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rbuf) < 0)
         TEST_ERROR;
 
     /* Try to open objects */
-    if((dset2=H5Rdereference(dset1,H5R_DATASET_REGION,&rbuf))<0)
+    if((dset2 = H5Rdereference(dset1, H5R_DATASET_REGION, &rbuf)) < 0)
         TEST_ERROR;
 
-    /* Check what H5Rget_obj_type function returns */
-    if(H5Rget_obj_type(dset1, H5R_DATASET_REGION,&rbuf) != H5G_DATASET)
+    /* Check what H5Rget_obj_type2 function returns */
+    if(H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &rbuf, &obj_type) < 0)
+        TEST_ERROR;
+    if(obj_type != H5O_TYPE_DATASET)
         TEST_ERROR;
 
     /* Check information in referenced dataset */
-    if((sid1 = H5Dget_space(dset2))<0)
+    if((sid1 = H5Dget_space(dset2)) < 0)
         TEST_ERROR;
 
-    if((int)H5Sget_simple_extent_npoints(sid1)!=100)
+    if((int)H5Sget_simple_extent_npoints(sid1) != 100)
         TEST_ERROR;
 
     /* Read from disk */
-    if(H5Dread(dset2,H5T_STD_U8LE,H5S_ALL,H5S_ALL,H5P_DEFAULT,drbuf)<0)
+    if(H5Dread(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, drbuf) < 0)
         TEST_ERROR;
 
-    for(tu8=(uint8_t *)drbuf,i=0; i<SPACE2_DIM1*SPACE2_DIM2; i++,tu8++)
-        if(*tu8 != (uint8_t)(i*3))
+    for(tu8 = (uint8_t *)drbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++, tu8++)
+        if(*tu8 != (uint8_t)(i * 3))
             TEST_ERROR;
 
     /* Get the hyperslab selection */
-    if((sid2=H5Rget_region(dset1,H5R_DATASET_REGION,&rbuf))<0)
+    if((sid2 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf)) < 0)
         TEST_ERROR;
 
     /* Verify correct hyperslab selected */
@@ -2179,19 +2188,19 @@ test_refer_dtype2(hid_t file)
         TEST_ERROR;
 
     /* Close region space */
-    if(H5Sclose(sid2)<0)
+    if(H5Sclose(sid2) < 0)
         TEST_ERROR;
 
     /* Close first space */
-    if(H5Sclose(sid1)<0)
+    if(H5Sclose(sid1) < 0)
         TEST_ERROR;
 
     /* Close dereferenced Dataset */
-    if(H5Dclose(dset2)<0)
+    if(H5Dclose(dset2) < 0)
         TEST_ERROR;
 
     /* Close Dataset */
-    if(H5Dclose(dset1)<0)
+    if(H5Dclose(dset1) < 0)
         TEST_ERROR;
 
     /* Free memory buffers */
diff --git a/test/objcopy.c b/test/objcopy.c
index c916f8f..d6740a4 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -876,11 +876,11 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
             ref_buf2 = buf2;
             for(u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) {
                 hid_t obj1_id, obj2_id;         /* IDs for objects referenced */
-                H5G_obj_t obj1_type, obj2_type; /* Types of objects referenced */
+                H5O_type_t obj1_type, obj2_type; /* Types of objects referenced */
 
                 /* Check for types of objects handled */
-                if((obj1_type = H5Rget_obj_type(parent1, H5R_OBJECT, ref_buf1)) < 0) TEST_ERROR
-                if((obj2_type = H5Rget_obj_type(parent2, H5R_OBJECT, ref_buf2)) < 0) TEST_ERROR
+                if(H5Rget_obj_type2(parent1, H5R_OBJECT, ref_buf1, &obj1_type) < 0) TEST_ERROR
+                if(H5Rget_obj_type2(parent2, H5R_OBJECT, ref_buf2, &obj2_type) < 0) TEST_ERROR
                 if(obj1_type != obj2_type) TEST_ERROR
 
                 /* Open referenced objects */
@@ -903,15 +903,15 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
                 /* Check for types of objects handled */
                 switch(obj1_type)
                 {
-                    case H5G_DATASET:
+                    case H5O_TYPE_DATASET:
                         if(compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) TEST_ERROR
                         break;
 
-                    case H5G_GROUP:
+                    case H5O_TYPE_GROUP:
                         if(compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) TEST_ERROR
                         break;
 
-                    case H5G_TYPE:
+                    case H5O_TYPE_NAMED_DATATYPE:
                         if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR
                         break;
 
@@ -933,11 +933,11 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
             for(u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) {
                 hid_t obj1_id, obj2_id;         /* IDs for objects referenced */
                 hid_t obj1_sid, obj2_sid;       /* Dataspace IDs for objects referenced */
-                H5G_obj_t obj1_type, obj2_type; /* Types of objects referenced */
+                H5O_type_t obj1_type, obj2_type; /* Types of objects referenced */
 
                 /* Check for types of objects handled */
-                if((obj1_type = H5Rget_obj_type(parent1, H5R_DATASET_REGION, ref_buf1)) < 0) TEST_ERROR
-                if((obj2_type = H5Rget_obj_type(parent2, H5R_DATASET_REGION, ref_buf2)) < 0) TEST_ERROR
+                if(H5Rget_obj_type2(parent1, H5R_DATASET_REGION, ref_buf1, &obj1_type) < 0) TEST_ERROR
+                if(H5Rget_obj_type2(parent2, H5R_DATASET_REGION, ref_buf2, &obj2_type) < 0) TEST_ERROR
                 if(obj1_type != obj2_type) TEST_ERROR
 
                 /* Open referenced objects */
@@ -960,15 +960,15 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
                 /* Check for types of objects handled */
                 switch(obj1_type)
                 {
-                    case H5G_DATASET:
+                    case H5O_TYPE_DATASET:
                         if(compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) TEST_ERROR
                         break;
 
-                    case H5G_GROUP:
+                    case H5O_TYPE_GROUP:
                         if(compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) TEST_ERROR
                         break;
 
-                    case H5G_TYPE:
+                    case H5O_TYPE_NAMED_DATATYPE:
                         if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR
                         break;
 
diff --git a/test/trefer.c b/test/trefer.c
index aff967a..974af4b 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -82,20 +82,21 @@ test_reference_obj(void)
     hobj_ref_t      *wbuf,      /* buffer to write to disk */
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temp. buffer read from disk */
-    hobj_ref_t  nvrbuf[3]={0,100,1000000000}; /* buffer with non-valid refs */
+    hobj_ref_t  nvrbuf[3]={0,101,1000000000}; /* buffer with non-valid refs */
     unsigned      *tu32;      /* Temporary pointer to uint32 data */
     int        i, j;          /* counting variables */
     const char *write_comment="Foo!"; /* Comments for group */
     char read_comment[10];
+    H5O_type_t          obj_type;       /* Object type */
     herr_t		ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Object Reference Functions\n"));
 
     /* Allocate write & read buffers */
-    wbuf=malloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t))*SPACE1_DIM1);
-    rbuf=malloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t))*SPACE1_DIM1);
-    tbuf=malloc(MAX(sizeof(unsigned),sizeof(hobj_ref_t))*SPACE1_DIM1);
+    wbuf = malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    rbuf = malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    tbuf = malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
 
     /* Create file */
     fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -110,18 +111,18 @@ test_reference_obj(void)
     CHECK(group, FAIL, "H5Gcreate2");
 
     /* Set group's comment */
-    ret=H5Oset_comment(group, ".", write_comment, H5P_DEFAULT);
+    ret = H5Oset_comment(group, ".", write_comment, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Oset_comment");
 
     /* Create a dataset (inside Group1) */
-    dataset=H5Dcreate(group,"Dataset1",H5T_NATIVE_UINT,sid1,H5P_DEFAULT);
+    dataset = H5Dcreate(group, "Dataset1", H5T_NATIVE_UINT, sid1, H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate");
 
-    for(tu32=(unsigned *)wbuf,i=0; i<SPACE1_DIM1; i++)
+    for(tu32 = (unsigned *)wbuf, i = 0; i < SPACE1_DIM1; i++)
         *tu32++=i*3;
 
     /* Write selection to disk */
-    ret=H5Dwrite(dataset,H5T_NATIVE_UINT,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
+    ret = H5Dwrite(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close Dataset */
@@ -129,7 +130,7 @@ test_reference_obj(void)
     CHECK(ret, FAIL, "H5Dclose");
 
     /* Create another dataset (inside Group1) */
-    dataset=H5Dcreate(group,"Dataset2",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT);
+    dataset = H5Dcreate(group, "Dataset2", H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate");
 
     /* Close Dataset */
@@ -137,21 +138,21 @@ test_reference_obj(void)
     CHECK(ret, FAIL, "H5Dclose");
 
     /* Create a datatype to refer to */
-    tid1 = H5Tcreate (H5T_COMPOUND, sizeof(s1_t));
+    tid1 = H5Tcreate(H5T_COMPOUND, sizeof(s1_t));
     CHECK(tid1, FAIL, "H5Tcreate");
 
     /* Insert fields */
-    ret=H5Tinsert (tid1, "a", HOFFSET(s1_t,a), H5T_NATIVE_INT);
+    ret = H5Tinsert(tid1, "a", HOFFSET(s1_t,a), H5T_NATIVE_INT);
     CHECK(ret, FAIL, "H5Tinsert");
 
-    ret=H5Tinsert (tid1, "b", HOFFSET(s1_t,b), H5T_NATIVE_INT);
+    ret = H5Tinsert(tid1, "b", HOFFSET(s1_t,b), H5T_NATIVE_INT);
     CHECK(ret, FAIL, "H5Tinsert");
 
-    ret=H5Tinsert (tid1, "c", HOFFSET(s1_t,c), H5T_NATIVE_FLOAT);
+    ret = H5Tinsert(tid1, "c", HOFFSET(s1_t,c), H5T_NATIVE_FLOAT);
     CHECK(ret, FAIL, "H5Tinsert");
 
     /* Save datatype for later */
-    ret=H5Tcommit (group, "Datatype1", tid1);
+    ret = H5Tcommit(group, "Datatype1", tid1);
     CHECK(ret, FAIL, "H5Tcommit");
 
     /* Close datatype */
@@ -163,35 +164,39 @@ test_reference_obj(void)
     CHECK(ret, FAIL, "H5Gclose");
 
     /* Create a dataset */
-    dataset=H5Dcreate(fid1,"Dataset3",H5T_STD_REF_OBJ,sid1,H5P_DEFAULT);
+    dataset = H5Dcreate(fid1, "Dataset3", H5T_STD_REF_OBJ, sid1, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Dcreate");
 
     /* Create reference to dataset */
-    ret = H5Rcreate(&wbuf[0],fid1,"/Group1/Dataset1",H5R_OBJECT,-1);
+    ret = H5Rcreate(&wbuf[0], fid1, "/Group1/Dataset1", H5R_OBJECT, -1);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &wbuf[0], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Create reference to dataset */
-    ret = H5Rcreate(&wbuf[1],fid1,"/Group1/Dataset2",H5R_OBJECT,-1);
+    ret = H5Rcreate(&wbuf[1], fid1, "/Group1/Dataset2", H5R_OBJECT, -1);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[1]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &wbuf[1], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Create reference to group */
-    ret = H5Rcreate(&wbuf[2],fid1,"/Group1",H5R_OBJECT,-1);
+    ret = H5Rcreate(&wbuf[2], fid1, "/Group1", H5R_OBJECT, -1);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[2]);
-    VERIFY(ret, H5G_GROUP, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &wbuf[2], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_GROUP, "H5Rget_obj_type2");
 
     /* Create reference to named datatype */
-    ret = H5Rcreate(&wbuf[3],fid1,"/Group1/Datatype1",H5R_OBJECT,-1);
+    ret = H5Rcreate(&wbuf[3], fid1, "/Group1/Datatype1", H5R_OBJECT, -1);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[3]);
-    VERIFY(ret, H5G_TYPE, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &wbuf[3], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_NAMED_DATATYPE, "H5Rget_obj_type2");
 
     /* Write selection to disk */
-    ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
+    ret = H5Dwrite(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close disk dataspace */
@@ -211,29 +216,29 @@ test_reference_obj(void)
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Open the dataset */
-    dataset=H5Dopen(fid1,"/Dataset3");
+    dataset = H5Dopen(fid1, "/Dataset3");
     CHECK(ret, FAIL, "H5Dcreate");
 
     /* Read selection from disk */
-    ret=H5Dread(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,rbuf);
+    ret = H5Dread(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
     CHECK(ret, FAIL, "H5Dread");
 
     /* Open dataset object */
-    dset2 = H5Rdereference(dataset,H5R_OBJECT,&rbuf[0]);
+    dset2 = H5Rdereference(dataset, H5R_OBJECT, &rbuf[0]);
     CHECK(dset2, FAIL, "H5Rdereference");
 
     /* Check information in referenced dataset */
     sid1 = H5Dget_space(dset2);
     CHECK(sid1, FAIL, "H5Dget_space");
 
-    ret=(int)H5Sget_simple_extent_npoints(sid1);
+    ret = (int)H5Sget_simple_extent_npoints(sid1);
     VERIFY(ret, 4, "H5Sget_simple_extent_npoints");
 
     /* Read from disk */
-    ret=H5Dread(dset2,H5T_NATIVE_UINT,H5S_ALL,H5S_ALL,H5P_DEFAULT,tbuf);
+    ret = H5Dread(dset2, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, tbuf);
     CHECK(ret, FAIL, "H5Dread");
 
-    for(tu32=(unsigned *)tbuf,i=0; i<SPACE1_DIM1; i++,tu32++)
+    for(tu32 = (unsigned *)tbuf, i = 0; i < SPACE1_DIM1; i++, tu32++)
         VERIFY(*tu32, (uint32_t)(i*3), "Data");
 
     /* Close dereferenced Dataset */
@@ -241,7 +246,7 @@ test_reference_obj(void)
     CHECK(ret, FAIL, "H5Dclose");
 
     /* Open group object */
-    group = H5Rdereference(dataset,H5R_OBJECT,&rbuf[2]);
+    group = H5Rdereference(dataset, H5R_OBJECT, &rbuf[2]);
     CHECK(group, FAIL, "H5Rdereference");
 
     /* Get group's comment */
@@ -257,14 +262,14 @@ test_reference_obj(void)
     CHECK(ret, FAIL, "H5Gclose");
 
     /* Open datatype object */
-    tid1 = H5Rdereference(dataset,H5R_OBJECT,&rbuf[3]);
+    tid1 = H5Rdereference(dataset, H5R_OBJECT, &rbuf[3]);
     CHECK(tid1, FAIL, "H5Rdereference");
 
     /* Verify correct datatype */
     {
         H5T_class_t tclass;
 
-        tclass= H5Tget_class(tid1);
+        tclass = H5Tget_class(tid1);
         VERIFY(tclass, H5T_COMPOUND, "H5Tget_class");
 
         ret= H5Tget_nmembers(tid1);
@@ -272,10 +277,12 @@ test_reference_obj(void)
     }
 
     /* Attempting to retrieve type of object using non-valid refs */
-    for (j=0; j<3; j++){
-        ret = H5Rget_obj_type(dataset,H5R_OBJECT,&nvrbuf[j]);
-        VERIFY(ret, H5G_UNKNOWN, "H5Rget_obj_type");
-    }
+    for(j = 0; j < 3; j++) {
+        H5E_BEGIN_TRY {
+            ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &nvrbuf[j], &obj_type);
+        } H5E_END_TRY;
+        VERIFY(ret, FAIL, "H5Rget_obj_type2");
+    } /* end for */
 
     /* Close datatype */
     ret = H5Tclose(tid1);
@@ -321,10 +328,11 @@ test_reference_region(void)
     hsize_t	high[SPACE2_RANK];	/* Selection bounds */
     hdset_reg_ref_t      *wbuf,		/* buffer to write to disk */
                *rbuf;       /* buffer read from disk */
-    hdset_reg_ref_t  nvrbuf[3]={0,100,1000000000}; /* buffer with non-valid refs */
+    hdset_reg_ref_t  nvrbuf[3]={0,101,1000000000}; /* buffer with non-valid refs */
     uint8_t    *dwbuf,      /* Buffer for writing numeric data to disk */
                *drbuf;      /* Buffer for reading numeric data from disk */
     uint8_t    *tu8;        /* Temporary pointer to uint8 data */
+    H5O_type_t  obj_type;       /* Type of object */
     int        i, j;           /* counting variables */
     herr_t	ret;		/* Generic return value		*/
 
@@ -335,7 +343,7 @@ test_reference_region(void)
     wbuf = HDcalloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1);
     rbuf = HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1);
     dwbuf = HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2);
-    drbuf = HDcalloc(sizeof(uint8_t),(size_t)(SPACE2_DIM1 * SPACE2_DIM2));
+    drbuf = HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2));
 
     /* Create file */
     fid1 = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -346,14 +354,14 @@ test_reference_region(void)
     CHECK(sid2, FAIL, "H5Screate_simple");
 
     /* Create a dataset */
-    dset2=H5Dcreate(fid1,"Dataset2",H5T_STD_U8LE,sid2,H5P_DEFAULT);
+    dset2 = H5Dcreate(fid1, "Dataset2", H5T_STD_U8LE, sid2, H5P_DEFAULT);
     CHECK(dset2, FAIL, "H5Dcreate");
 
-    for(tu8=dwbuf,i=0; i<SPACE2_DIM1*SPACE2_DIM2; i++)
-        *tu8++=i*3;
+    for(tu8 = dwbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++)
+        *tu8++ = i * 3;
 
     /* Write selection to disk */
-    ret=H5Dwrite(dset2,H5T_STD_U8LE,H5S_ALL,H5S_ALL,H5P_DEFAULT,dwbuf);
+    ret = H5Dwrite(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close Dataset */
@@ -365,39 +373,40 @@ test_reference_region(void)
     CHECK(sid1, FAIL, "H5Screate_simple");
 
     /* Create a dataset */
-    dset1=H5Dcreate(fid1,"Dataset1",H5T_STD_REF_DSETREG,sid1,H5P_DEFAULT);
+    dset1 = H5Dcreate(fid1, "Dataset1", H5T_STD_REF_DSETREG, sid1, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Dcreate");
 
     /* Create references */
 
     /* Select 6x6 hyperslab for first reference */
-    start[0]=2; start[1]=2;
-    stride[0]=1; stride[1]=1;
-    count[0]=1; count[1]=1;
-    block[0]=6; block[1]=6;
-    ret = H5Sselect_hyperslab(sid2,H5S_SELECT_SET,start,stride,count,block);
+    start[0] = 2; start[1] = 2;
+    stride[0] = 1; stride[1] = 1;
+    count[0] = 1; count[1] = 1;
+    block[0] = 6; block[1] = 6;
+    ret = H5Sselect_hyperslab(sid2, H5S_SELECT_SET, start, stride, count, block);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
     ret = (int)H5Sget_select_npoints(sid2);
     VERIFY(ret, 36, "H5Sget_select_npoints");
 
     /* Store first dataset region */
-    ret = H5Rcreate(&wbuf[0],fid1,"/Dataset2",H5R_DATASET_REGION,sid2);
+    ret = H5Rcreate(&wbuf[0], fid1, "/Dataset2", H5R_DATASET_REGION, sid2);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dset1,H5R_DATASET_REGION,&wbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &wbuf[0], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Select sequence of ten points for second reference */
-    coord1[0][0]=6; coord1[0][1]=9;
-    coord1[1][0]=2; coord1[1][1]=2;
-    coord1[2][0]=8; coord1[2][1]=4;
-    coord1[3][0]=1; coord1[3][1]=6;
-    coord1[4][0]=2; coord1[4][1]=8;
-    coord1[5][0]=3; coord1[5][1]=2;
-    coord1[6][0]=0; coord1[6][1]=4;
-    coord1[7][0]=9; coord1[7][1]=0;
-    coord1[8][0]=7; coord1[8][1]=1;
-    coord1[9][0]=3; coord1[9][1]=3;
+    coord1[0][0] = 6; coord1[0][1] = 9;
+    coord1[1][0] = 2; coord1[1][1] = 2;
+    coord1[2][0] = 8; coord1[2][1] = 4;
+    coord1[3][0] = 1; coord1[3][1] = 6;
+    coord1[4][0] = 2; coord1[4][1] = 8;
+    coord1[5][0] = 3; coord1[5][1] = 2;
+    coord1[6][0] = 0; coord1[6][1] = 4;
+    coord1[7][0] = 9; coord1[7][1] = 0;
+    coord1[8][0] = 7; coord1[8][1] = 1;
+    coord1[9][0] = 3; coord1[9][1] = 3;
     ret = H5Sselect_elements(sid2, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
@@ -405,11 +414,11 @@ test_reference_region(void)
     VERIFY(ret, 10, "H5Sget_select_npoints");
 
     /* Store second dataset region */
-    ret = H5Rcreate(&wbuf[1],fid1,"/Dataset2",H5R_DATASET_REGION,sid2);
+    ret = H5Rcreate(&wbuf[1], fid1, "/Dataset2", H5R_DATASET_REGION, sid2);
     CHECK(ret, FAIL, "H5Rcreate");
 
     /* Write selection to disk */
-    ret=H5Dwrite(dset1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
+    ret = H5Dwrite(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close disk dataspace */
@@ -433,37 +442,38 @@ test_reference_region(void)
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Open the dataset */
-    dset1=H5Dopen(fid1,"/Dataset1");
+    dset1 = H5Dopen(fid1,"/Dataset1");
     CHECK(dset1, FAIL, "H5Dopen");
 
     /* Read selection from disk */
-    ret=H5Dread(dset1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,rbuf);
+    ret = H5Dread(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
     CHECK(ret, FAIL, "H5Dread");
 
     /* Try to open objects */
-    dset2 = H5Rdereference(dset1,H5R_DATASET_REGION,&rbuf[0]);
+    dset2 = H5Rdereference(dset1, H5R_DATASET_REGION, &rbuf[0]);
     CHECK(dset2, FAIL, "H5Rdereference");
 
-    /* Check what H5Rget_obj_type function returns */
-    ret = H5Rget_obj_type(dset1, H5R_DATASET_REGION,&rbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    /* Check what H5Rget_obj_type2 function returns */
+    ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &rbuf[0], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Check information in referenced dataset */
     sid1 = H5Dget_space(dset2);
     CHECK(sid1, FAIL, "H5Dget_space");
 
-    ret=(int)H5Sget_simple_extent_npoints(sid1);
+    ret = (int)H5Sget_simple_extent_npoints(sid1);
     VERIFY(ret, 100, "H5Sget_simple_extent_npoints");
 
     /* Read from disk */
-    ret=H5Dread(dset2,H5T_STD_U8LE,H5S_ALL,H5S_ALL,H5P_DEFAULT,drbuf);
+    ret = H5Dread(dset2, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, drbuf);
     CHECK(ret, FAIL, "H5Dread");
 
-    for(tu8=(uint8_t *)drbuf,i=0; i<SPACE2_DIM1*SPACE2_DIM2; i++,tu8++)
-        VERIFY(*tu8, (uint8_t)(i*3), "Data");
+    for(tu8 = (uint8_t *)drbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++, tu8++)
+        VERIFY(*tu8, (uint8_t)(i * 3), "Data");
 
     /* Get the hyperslab selection */
-    sid2=H5Rget_region(dset1,H5R_DATASET_REGION,&rbuf[0]);
+    sid2 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf[0]);
     CHECK(sid2, FAIL, "H5Rget_region");
 
     /* Verify correct hyperslab selected */
@@ -471,15 +481,15 @@ test_reference_region(void)
     VERIFY(ret, 36, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_hyper_nblocks(sid2);
     VERIFY(ret, 1, "H5Sget_select_hyper_nblocks");
-    coords=HDmalloc(ret*SPACE2_RANK*sizeof(hsize_t)*2); /* allocate space for the hyperslab blocks */
-    ret = H5Sget_select_hyper_blocklist(sid2,(hsize_t)0,(hsize_t)ret,coords);
+    coords = HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */
+    ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist");
     VERIFY(coords[0], 2, "Hyperslab Coordinates");
     VERIFY(coords[1], 2, "Hyperslab Coordinates");
     VERIFY(coords[2], 7, "Hyperslab Coordinates");
     VERIFY(coords[3], 7, "Hyperslab Coordinates");
     HDfree(coords);
-    ret = H5Sget_select_bounds(sid2,low,high);
+    ret = H5Sget_select_bounds(sid2, low, high);
     CHECK(ret, FAIL, "H5Sget_select_bounds");
     VERIFY(low[0], 2, "Selection Bounds");
     VERIFY(low[1], 2, "Selection Bounds");
@@ -491,7 +501,7 @@ test_reference_region(void)
     CHECK(ret, FAIL, "H5Sclose");
 
     /* Get the element selection */
-    sid2=H5Rget_region(dset1,H5R_DATASET_REGION,&rbuf[1]);
+    sid2 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf[1]);
     CHECK(sid2, FAIL, "H5Rget_region");
 
     /* Verify correct elements selected */
@@ -499,8 +509,8 @@ test_reference_region(void)
     VERIFY(ret, 10, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_elem_npoints(sid2);
     VERIFY(ret, 10, "H5Sget_select_elem_npoints");
-    coords=HDmalloc(ret*SPACE2_RANK*sizeof(hsize_t)); /* allocate space for the element points */
-    ret = H5Sget_select_elem_pointlist(sid2,(hsize_t)0,(hsize_t)ret,coords);
+    coords = HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t)); /* allocate space for the element points */
+    ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_elem_pointlist");
     VERIFY(coords[0], coord1[0][0], "Element Coordinates");
     VERIFY(coords[1], coord1[0][1], "Element Coordinates");
@@ -523,7 +533,7 @@ test_reference_region(void)
     VERIFY(coords[18], coord1[9][0], "Element Coordinates");
     VERIFY(coords[19], coord1[9][1], "Element Coordinates");
     HDfree(coords);
-    ret = H5Sget_select_bounds(sid2,low,high);
+    ret = H5Sget_select_bounds(sid2, low, high);
     CHECK(ret, FAIL, "H5Sget_select_bounds");
     VERIFY(low[0], 0, "Selection Bounds");
     VERIFY(low[1], 0, "Selection Bounds");
@@ -543,10 +553,12 @@ test_reference_region(void)
     CHECK(ret, FAIL, "H5Dclose");
 
     /* Attempting to retrieve type of object using non-valid refs */
-    for (j=0; j<3; j++){
-        ret = H5Rget_obj_type(dset1,H5R_DATASET_REGION,&nvrbuf[j]);
-        VERIFY(ret, H5G_UNKNOWN, "H5Rget_obj_type");
-    }
+    for(j = 0; j < 3; j++) {
+        H5E_BEGIN_TRY {
+            ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &nvrbuf[j], &obj_type);
+        } H5E_END_TRY;
+        VERIFY(ret, FAIL, "H5Rget_obj_type2");
+    } /* end for */
 
     /* Close Dataset */
     ret = H5Dclose(dset1);
@@ -592,6 +604,7 @@ test_reference_region_1D(void)
     uint8_t    *dwbuf,  /* Buffer for writing numeric data to disk */
                *drbuf;  /* Buffer for reading numeric data from disk */
     uint8_t    *tu8;    /* Temporary pointer to uint8 data */
+    H5O_type_t  obj_type;       /* Object type */
     int         i;      /* counting variables */
     herr_t	ret;    /* Generic return value		*/
 
@@ -613,14 +626,14 @@ test_reference_region_1D(void)
     CHECK(sid3, FAIL, "H5Screate_simple");
 
     /* Create a dataset */
-    dset3=H5Dcreate(fid1,"Dataset2",H5T_STD_U8LE,sid3,H5P_DEFAULT);
+    dset3 = H5Dcreate(fid1, "Dataset2", H5T_STD_U8LE, sid3, H5P_DEFAULT);
     CHECK(dset3, FAIL, "H5Dcreate");
 
-    for(tu8=dwbuf,i=0; i<SPACE3_DIM1; i++)
-        *tu8++=i*3;
+    for(tu8 = dwbuf, i = 0; i < SPACE3_DIM1; i++)
+        *tu8++ = i * 3;
 
     /* Write selection to disk */
-    ret=H5Dwrite(dset3,H5T_STD_U8LE,H5S_ALL,H5S_ALL,H5P_DEFAULT,dwbuf);
+    ret = H5Dwrite(dset3, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close Dataset */
@@ -632,39 +645,40 @@ test_reference_region_1D(void)
     CHECK(sid1, FAIL, "H5Screate_simple");
 
     /* Create a dataset */
-    dset1=H5Dcreate(fid1,"Dataset1",H5T_STD_REF_DSETREG,sid1,H5P_DEFAULT);
+    dset1 = H5Dcreate(fid1, "Dataset1", H5T_STD_REF_DSETREG, sid1, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Dcreate");
 
     /* Create references */
 
     /* Select 15 2x1 hyperslabs for first reference */
-    start[0]=2;
-    stride[0]=5;
-    count[0]=15;
-    block[0]=2;
-    ret = H5Sselect_hyperslab(sid3,H5S_SELECT_SET,start,stride,count,block);
+    start[0] = 2;
+    stride[0] = 5;
+    count[0] = 15;
+    block[0] = 2;
+    ret = H5Sselect_hyperslab(sid3, H5S_SELECT_SET, start, stride, count, block);
     CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
     ret = (int)H5Sget_select_npoints(sid3);
     VERIFY(ret, 30, "H5Sget_select_npoints");
 
     /* Store first dataset region */
-    ret = H5Rcreate(&wbuf[0],fid1,"/Dataset2",H5R_DATASET_REGION,sid3);
+    ret = H5Rcreate(&wbuf[0], fid1, "/Dataset2", H5R_DATASET_REGION, sid3);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dset1,H5R_DATASET_REGION,&wbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &wbuf[0], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Select sequence of ten points for second reference */
-    coord1[0][0]=16;
-    coord1[1][0]=22;
-    coord1[2][0]=38;
-    coord1[3][0]=41;
-    coord1[4][0]=52;
-    coord1[5][0]=63;
-    coord1[6][0]=70;
-    coord1[7][0]=89;
-    coord1[8][0]=97;
-    coord1[9][0]=03;
+    coord1[0][0] = 16;
+    coord1[1][0] = 22;
+    coord1[2][0] = 38;
+    coord1[3][0] = 41;
+    coord1[4][0] = 52;
+    coord1[5][0] = 63;
+    coord1[6][0] = 70;
+    coord1[7][0] = 89;
+    coord1[8][0] = 97;
+    coord1[9][0] = 03;
     ret = H5Sselect_elements(sid3, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, (const hsize_t **)coord1);
     CHECK(ret, FAIL, "H5Sselect_elements");
 
@@ -672,11 +686,11 @@ test_reference_region_1D(void)
     VERIFY(ret, 10, "H5Sget_select_npoints");
 
     /* Store second dataset region */
-    ret = H5Rcreate(&wbuf[1],fid1,"/Dataset2",H5R_DATASET_REGION,sid3);
+    ret = H5Rcreate(&wbuf[1], fid1, "/Dataset2", H5R_DATASET_REGION, sid3);
     CHECK(ret, FAIL, "H5Rcreate");
 
     /* Write selection to disk */
-    ret=H5Dwrite(dset1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
+    ret = H5Dwrite(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close disk dataspace */
@@ -700,37 +714,38 @@ test_reference_region_1D(void)
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Open the dataset */
-    dset1=H5Dopen(fid1,"/Dataset1");
+    dset1 = H5Dopen(fid1, "/Dataset1");
     CHECK(dset1, FAIL, "H5Dopen");
 
     /* Read selection from disk */
-    ret=H5Dread(dset1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,rbuf);
+    ret = H5Dread(dset1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
     CHECK(ret, FAIL, "H5Dread");
 
     /* Try to open objects */
-    dset3 = H5Rdereference(dset1,H5R_DATASET_REGION,&rbuf[0]);
+    dset3 = H5Rdereference(dset1, H5R_DATASET_REGION, &rbuf[0]);
     CHECK(dset3, FAIL, "H5Rdereference");
 
-    /* Check what H5Rget_obj_type function returns */
-    ret = H5Rget_obj_type(dset1, H5R_DATASET_REGION,&rbuf[0]);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    /* Check what H5Rget_obj_type2 function returns */
+    ret = H5Rget_obj_type2(dset1, H5R_DATASET_REGION, &rbuf[0], &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Check information in referenced dataset */
     sid1 = H5Dget_space(dset3);
     CHECK(sid1, FAIL, "H5Dget_space");
 
-    ret=(int)H5Sget_simple_extent_npoints(sid1);
+    ret = (int)H5Sget_simple_extent_npoints(sid1);
     VERIFY(ret, 100, "H5Sget_simple_extent_npoints");
 
     /* Read from disk */
-    ret=H5Dread(dset3,H5T_STD_U8LE,H5S_ALL,H5S_ALL,H5P_DEFAULT,drbuf);
+    ret = H5Dread(dset3, H5T_STD_U8LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, drbuf);
     CHECK(ret, FAIL, "H5Dread");
 
-    for(tu8=(uint8_t *)drbuf,i=0; i<SPACE3_DIM1; i++,tu8++)
-        VERIFY(*tu8, (uint8_t)(i*3), "Data");
+    for(tu8 = (uint8_t *)drbuf, i = 0; i < SPACE3_DIM1; i++, tu8++)
+        VERIFY(*tu8, (uint8_t)(i * 3), "Data");
 
     /* Get the hyperslab selection */
-    sid3=H5Rget_region(dset1,H5R_DATASET_REGION,&rbuf[0]);
+    sid3 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf[0]);
     CHECK(sid3, FAIL, "H5Rget_region");
 
     /* Verify correct hyperslab selected */
@@ -738,41 +753,41 @@ test_reference_region_1D(void)
     VERIFY(ret, 30, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_hyper_nblocks(sid3);
     VERIFY(ret, 15, "H5Sget_select_hyper_nblocks");
-    coords=HDmalloc(ret*SPACE3_RANK*sizeof(hsize_t)*2); /* allocate space for the hyperslab blocks */
-    ret = H5Sget_select_hyper_blocklist(sid3,(hsize_t)0,(hsize_t)ret,coords);
+    coords = HDmalloc(ret * SPACE3_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */
+    ret = H5Sget_select_hyper_blocklist(sid3, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist");
-    VERIFY(coords[0], 2, "Hyperslab Coordinates");
-    VERIFY(coords[1], 3, "Hyperslab Coordinates");
-    VERIFY(coords[2], 7, "Hyperslab Coordinates");
-    VERIFY(coords[3], 8, "Hyperslab Coordinates");
-    VERIFY(coords[4],12, "Hyperslab Coordinates");
-    VERIFY(coords[5],13, "Hyperslab Coordinates");
-    VERIFY(coords[6],17, "Hyperslab Coordinates");
-    VERIFY(coords[7],18, "Hyperslab Coordinates");
-    VERIFY(coords[8],22, "Hyperslab Coordinates");
-    VERIFY(coords[9],23, "Hyperslab Coordinates");
-    VERIFY(coords[10],27, "Hyperslab Coordinates");
-    VERIFY(coords[11],28, "Hyperslab Coordinates");
-    VERIFY(coords[12],32, "Hyperslab Coordinates");
-    VERIFY(coords[13],33, "Hyperslab Coordinates");
-    VERIFY(coords[14],37, "Hyperslab Coordinates");
-    VERIFY(coords[15],38, "Hyperslab Coordinates");
-    VERIFY(coords[16],42, "Hyperslab Coordinates");
-    VERIFY(coords[17],43, "Hyperslab Coordinates");
-    VERIFY(coords[18],47, "Hyperslab Coordinates");
-    VERIFY(coords[19],48, "Hyperslab Coordinates");
-    VERIFY(coords[20],52, "Hyperslab Coordinates");
-    VERIFY(coords[21],53, "Hyperslab Coordinates");
-    VERIFY(coords[22],57, "Hyperslab Coordinates");
-    VERIFY(coords[23],58, "Hyperslab Coordinates");
-    VERIFY(coords[24],62, "Hyperslab Coordinates");
-    VERIFY(coords[25],63, "Hyperslab Coordinates");
-    VERIFY(coords[26],67, "Hyperslab Coordinates");
-    VERIFY(coords[27],68, "Hyperslab Coordinates");
-    VERIFY(coords[28],72, "Hyperslab Coordinates");
-    VERIFY(coords[29],73, "Hyperslab Coordinates");
+    VERIFY(coords[0],   2, "Hyperslab Coordinates");
+    VERIFY(coords[1],   3, "Hyperslab Coordinates");
+    VERIFY(coords[2],   7, "Hyperslab Coordinates");
+    VERIFY(coords[3],   8, "Hyperslab Coordinates");
+    VERIFY(coords[4],  12, "Hyperslab Coordinates");
+    VERIFY(coords[5],  13, "Hyperslab Coordinates");
+    VERIFY(coords[6],  17, "Hyperslab Coordinates");
+    VERIFY(coords[7],  18, "Hyperslab Coordinates");
+    VERIFY(coords[8],  22, "Hyperslab Coordinates");
+    VERIFY(coords[9],  23, "Hyperslab Coordinates");
+    VERIFY(coords[10], 27, "Hyperslab Coordinates");
+    VERIFY(coords[11], 28, "Hyperslab Coordinates");
+    VERIFY(coords[12], 32, "Hyperslab Coordinates");
+    VERIFY(coords[13], 33, "Hyperslab Coordinates");
+    VERIFY(coords[14], 37, "Hyperslab Coordinates");
+    VERIFY(coords[15], 38, "Hyperslab Coordinates");
+    VERIFY(coords[16], 42, "Hyperslab Coordinates");
+    VERIFY(coords[17], 43, "Hyperslab Coordinates");
+    VERIFY(coords[18], 47, "Hyperslab Coordinates");
+    VERIFY(coords[19], 48, "Hyperslab Coordinates");
+    VERIFY(coords[20], 52, "Hyperslab Coordinates");
+    VERIFY(coords[21], 53, "Hyperslab Coordinates");
+    VERIFY(coords[22], 57, "Hyperslab Coordinates");
+    VERIFY(coords[23], 58, "Hyperslab Coordinates");
+    VERIFY(coords[24], 62, "Hyperslab Coordinates");
+    VERIFY(coords[25], 63, "Hyperslab Coordinates");
+    VERIFY(coords[26], 67, "Hyperslab Coordinates");
+    VERIFY(coords[27], 68, "Hyperslab Coordinates");
+    VERIFY(coords[28], 72, "Hyperslab Coordinates");
+    VERIFY(coords[29], 73, "Hyperslab Coordinates");
     HDfree(coords);
-    ret = H5Sget_select_bounds(sid3,low,high);
+    ret = H5Sget_select_bounds(sid3, low, high);
     CHECK(ret, FAIL, "H5Sget_select_bounds");
     VERIFY(low[0], 2, "Selection Bounds");
     VERIFY(high[0], 73, "Selection Bounds");
@@ -782,7 +797,7 @@ test_reference_region_1D(void)
     CHECK(ret, FAIL, "H5Sclose");
 
     /* Get the element selection */
-    sid3=H5Rget_region(dset1,H5R_DATASET_REGION,&rbuf[1]);
+    sid3 = H5Rget_region(dset1, H5R_DATASET_REGION, &rbuf[1]);
     CHECK(sid3, FAIL, "H5Rget_region");
 
     /* Verify correct elements selected */
@@ -790,8 +805,8 @@ test_reference_region_1D(void)
     VERIFY(ret, 10, "H5Sget_select_npoints");
     ret = (int)H5Sget_select_elem_npoints(sid3);
     VERIFY(ret, 10, "H5Sget_select_elem_npoints");
-    coords=HDmalloc(ret*SPACE3_RANK*sizeof(hsize_t)); /* allocate space for the element points */
-    ret = H5Sget_select_elem_pointlist(sid3,(hsize_t)0,(hsize_t)ret,coords);
+    coords = HDmalloc(ret * SPACE3_RANK * sizeof(hsize_t)); /* allocate space for the element points */
+    ret = H5Sget_select_elem_pointlist(sid3, (hsize_t)0, (hsize_t)ret, coords);
     CHECK(ret, FAIL, "H5Sget_select_elem_pointlist");
     VERIFY(coords[0], coord1[0][0], "Element Coordinates");
     VERIFY(coords[1], coord1[1][0], "Element Coordinates");
@@ -804,7 +819,7 @@ test_reference_region_1D(void)
     VERIFY(coords[8], coord1[8][0], "Element Coordinates");
     VERIFY(coords[9], coord1[9][0], "Element Coordinates");
     HDfree(coords);
-    ret = H5Sget_select_bounds(sid3,low,high);
+    ret = H5Sget_select_bounds(sid3, low, high);
     CHECK(ret, FAIL, "H5Sget_select_bounds");
     VERIFY(low[0], 3, "Selection Bounds");
     VERIFY(high[0], 97, "Selection Bounds");
@@ -850,6 +865,7 @@ test_reference_obj_deleted(void)
                 dset2;      /* Dereferenced dataset ID */
     hid_t		sid1;       /* Dataspace ID			*/
     hobj_ref_t  oref;       /* Object Reference to test */
+    H5O_type_t          obj_type;       /* Object type */
     herr_t		ret;		/* Generic return value		*/
 
     /* Create file */
@@ -861,7 +877,7 @@ test_reference_obj_deleted(void)
     CHECK(sid1, FAIL, "H5Screate_simple");
 
     /* Create a dataset to reference (deleted later) */
-    dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_INT,sid1,H5P_DEFAULT);
+    dataset = H5Dcreate(fid1, "Dataset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate");
 
     /* Close Dataset */
@@ -869,17 +885,18 @@ test_reference_obj_deleted(void)
     CHECK(ret, FAIL, "H5Dclose");
 
     /* Create a dataset */
-    dataset=H5Dcreate(fid1,"Dataset2",H5T_STD_REF_OBJ,sid1,H5P_DEFAULT);
+    dataset = H5Dcreate(fid1, "Dataset2", H5T_STD_REF_OBJ, sid1, H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate");
 
     /* Create reference to dataset */
-    ret = H5Rcreate(&oref,fid1,"/Dataset1",H5R_OBJECT,-1);
+    ret = H5Rcreate(&oref, fid1, "/Dataset1", H5R_OBJECT, -1);
     CHECK(ret, FAIL, "H5Rcreate");
-    ret = H5Rget_obj_type(dataset,H5R_OBJECT,&oref);
-    VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
+    ret = H5Rget_obj_type2(dataset, H5R_OBJECT, &oref, &obj_type);
+    CHECK(ret, FAIL, "H5Rget_obj_type2");
+    VERIFY(obj_type, H5O_TYPE_DATASET, "H5Rget_obj_type2");
 
     /* Write selection to disk */
-    ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,&oref);
+    ret = H5Dwrite(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, &oref);
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Close Dataset */
@@ -903,21 +920,21 @@ test_reference_obj_deleted(void)
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Open the dataset */
-    dataset=H5Dopen(fid1,"/Dataset2");
-    CHECK(ret, FAIL, "H5Dcreate");
+    dataset = H5Dopen(fid1, "/Dataset2");
+    CHECK(ret, FAIL, "H5Dopen");
 
     /* Read selection from disk */
-    memset(&oref,0,sizeof(hobj_ref_t));
-    ret=H5Dread(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,&oref);
+    HDmemset(&oref, 0, sizeof(hobj_ref_t));
+    ret = H5Dread(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, &oref);
     CHECK(ret, FAIL, "H5Dread");
 
     /* Open deleted dataset object */
-    dset2 = H5Rdereference(dataset,H5R_OBJECT,&oref);
+    dset2 = H5Rdereference(dataset, H5R_OBJECT, &oref);
     VERIFY(dset2, FAIL, "H5Rdereference");
 
     /* Open nonsense reference */
-    memset(&oref,0,sizeof(hobj_ref_t));
-    dset2 = H5Rdereference(dataset,H5R_OBJECT,&oref);
+    HDmemset(&oref, 0, sizeof(hobj_ref_t));
+    dset2 = H5Rdereference(dataset, H5R_OBJECT, &oref);
     VERIFY(dset2, FAIL, "H5Rdereference");
 
     /* Close Dataset */
@@ -927,7 +944,6 @@ test_reference_obj_deleted(void)
     /* Close file */
     ret = H5Fclose(fid1);
     CHECK(ret, FAIL, "H5Fclose");
-
 }   /* test_reference_obj_deleted() */
 
 /****************************************************************