diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5.c | 2 | ||||
| -rw-r--r-- | src/H5R.c | 20 | ||||
| -rw-r--r-- | src/H5Rpublic.h | 9 |
3 files changed, 13 insertions, 18 deletions
@@ -2419,7 +2419,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...) } } else { hobj_ref_t ref = va_arg (ap, hobj_ref_t); - fprintf (out, "Reference Object=%p", (void *)&ref); + HDfprintf(out, "Reference Object=%a", ref); } break; @@ -158,7 +158,7 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, uint8_t *p; /* Pointer to OID to store */ /* Set information for reference */ - p=(uint8_t *)ref->oid; + p=(uint8_t *)ref; H5F_addr_pack(loc->file,&addr,&sb.objno[0]); H5F_addr_encode(loc->file,&p,addr); break; @@ -180,8 +180,8 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, /* Return any previous heap block to the free list if we are garbage collecting */ if(loc->file->shared->gc_ref) { /* Check for an existing heap ID in the reference */ - for(u=0, heapid_found=0; u<H5R_DSET_REG_REF_BUF_SIZE; u++) - if(ref->heapid[u]!=0) { + for(u=0, heapid_found=0, p=(uint8_t *)ref; u<H5R_DSET_REG_REF_BUF_SIZE; u++) + if(p[u]!=0) { heapid_found=1; break; } /* end if */ @@ -192,7 +192,7 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, } /* end if */ /* Zero the heap ID out, may leak heap space if user is re-using reference and doesn't have garbage collection on */ - HDmemset(ref->heapid,H5R_DSET_REG_REF_BUF_SIZE,0); + HDmemset(ref,H5R_DSET_REG_REF_BUF_SIZE,0); /* Get the amount of space required to serialize the selection */ if ((buf_size = H5S_SELECT_SERIAL_SIZE(space)) < 0) @@ -221,7 +221,7 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, HGOTO_ERROR(H5E_REFERENCE, H5E_WRITEERROR, FAIL, "Unable to serialize selection"); /* Serialize the heap ID and index for storage in the file */ - p=(uint8_t *)ref->heapid; + p=(uint8_t *)ref; H5F_addr_encode(loc->file,&p,hobjid.addr); INT32ENCODE(p,hobjid.idx); @@ -357,7 +357,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) * open a dataset for now */ /* Get the object oid */ - p=(uint8_t *)ref->oid; + p=(uint8_t *)ref; H5F_addr_decode(ent.file,(const uint8_t **)&p,&(ent.header)); } /* end case */ break; @@ -369,7 +369,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) uint8_t *buf; /* Buffer to store serialized selection in */ /* Get the heap ID for the dataset region */ - p=(uint8_t *)ref->heapid; + p=(uint8_t *)ref; H5F_addr_decode(ent.file,(const uint8_t **)&p,&(hobjid.addr)); INT32DECODE(p,hobjid.idx); @@ -536,7 +536,7 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, H5R_type_t UNUSED ref_type, void *_re ent.file=file; /* Get the heap ID for the dataset region */ - p=(uint8_t *)ref->heapid; + p=(uint8_t *)ref; H5F_addr_decode(ent.file,(const uint8_t **)&p,&(hobjid.addr)); INT32DECODE(p,hobjid.idx); @@ -772,7 +772,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) hobj_ref_t *ref=(hobj_ref_t *)_ref; /* Only object references currently supported */ /* Get the object oid */ - p=(uint8_t *)ref->oid; + p=(uint8_t *)ref; H5F_addr_decode(ent.file,(const uint8_t **)&p,&(ent.header)); } /* end case */ break; @@ -784,7 +784,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref) uint8_t *buf; /* Buffer to store serialized selection in */ /* Get the heap ID for the dataset region */ - p=(uint8_t *)ref->heapid; + p=(uint8_t *)ref; H5F_addr_decode(ent.file,(const uint8_t **)&p,&(hobjid.addr)); INT32DECODE(p,hobjid.idx); diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index 00a1fbd..9cdd56e 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -49,21 +49,16 @@ typedef struct { * them. -QAK */ #define H5R_OBJ_REF_BUF_SIZE sizeof(haddr_t) -/* Object reference structure for user's code */ -typedef struct { - unsigned char oid[H5R_OBJ_REF_BUF_SIZE]; /* Buffer to store OID of object referenced */ +typedef haddr_t hobj_ref_t; /* Buffer to store OID of object referenced */ /* Needs to be large enough to store largest haddr_t in a worst case machine (ie. 8 bytes currently) */ -} hobj_ref_t; #define H5R_DSET_REG_REF_BUF_SIZE (sizeof(haddr_t)+4) /* 4 is used instead of sizeof(int) to permit portability between the Crays and other machines (the heap ID is always encoded as an int32 anyway) */ /* Dataset Region reference structure for user's code */ -typedef struct { - unsigned char heapid[H5R_DSET_REG_REF_BUF_SIZE]; /* Buffer to store heap ID and index */ +typedef unsigned char hdset_reg_ref_t[H5R_DSET_REG_REF_BUF_SIZE];/* Buffer to store heap ID and index */ /* Needs to be large enough to store largest haddr_t in a worst case machine (ie. 8 bytes currently) plus an int */ -} hdset_reg_ref_t; /* Publicly visible datastructures */ |