diff options
| author | James Laird <jlaird@hdfgroup.org> | 2006-12-18 19:16:17 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2006-12-18 19:16:17 (GMT) |
| commit | e100695eb0c207e9087696ccd3ca923b2ff248e2 (patch) | |
| tree | 3b0a7b88619faf50bce86d316c7384f7ad1218da | |
| parent | ddbc06fce64bc49ff6b3e83da3ff74d08251fc2c (diff) | |
| download | hdf5-e100695eb0c207e9087696ccd3ca923b2ff248e2.zip hdf5-e100695eb0c207e9087696ccd3ca923b2ff248e2.tar.gz hdf5-e100695eb0c207e9087696ccd3ca923b2ff248e2.tar.bz2 | |
[svn-r13068] Ran bin/reconfigure. Some of the scripts have been changed or haven't
been run in a while, so many of the source files were updated with
tracing macros, etc. No code changes by me.
Tested on kagiso and smirom.
62 files changed, 470 insertions, 462 deletions
@@ -430,8 +430,8 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5set_free_list_limits, FAIL) - H5TRACE6("e","IsIsIsIsIsIs",reg_global_lim,reg_list_lim,arr_global_lim, - arr_list_lim,blk_global_lim,blk_list_lim); + H5TRACE6("e", "IsIsIsIsIsIs", reg_global_lim, reg_list_lim, arr_global_lim, + arr_list_lim, blk_global_lim, blk_list_lim); /* Call the free list function to actually set the limits */ if(H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim, blk_list_lim)<0) @@ -560,7 +560,7 @@ H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5get_libversion, FAIL) - H5TRACE3("e","*Iu*Iu*Iu",majnum,minnum,relnum); + H5TRACE3("e", "*Iu*Iu*Iu", majnum, minnum, relnum); /* Set the version information */ if (majnum) *majnum = H5_VERS_MAJOR; @@ -612,7 +612,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT_NOFS(H5check_version) - H5TRACE3("e","IuIuIu",majnum,minnum,relnum); + H5TRACE3("e", "IuIuIu", majnum, minnum, relnum); /* Don't check again, if we already have */ if (checked) @@ -232,6 +232,7 @@ H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Acreate, FAIL) + H5TRACE5("i", "isiii", loc_id, name, type_id, space_id, plist_id); /* check arguments */ if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id)) @@ -467,7 +468,7 @@ H5Aopen_name(hid_t loc_id, const char *name) hid_t ret_value; FUNC_ENTER_API(H5Aopen_name, FAIL) - H5TRACE2("i","is",loc_id,name); + H5TRACE2("i", "is", loc_id, name); /* check arguments */ if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id)) @@ -521,7 +522,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx) hid_t ret_value; FUNC_ENTER_API(H5Aopen_idx, FAIL) - H5TRACE2("i","iIu",loc_id,idx); + H5TRACE2("i", "iIu", loc_id, idx); /* check arguments */ if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id)) @@ -703,7 +704,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf) herr_t ret_value; FUNC_ENTER_API(H5Awrite, FAIL) - H5TRACE3("e","iix",attr_id,dtype_id,buf); + H5TRACE3("e", "iix", attr_id, dtype_id, buf); /* check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -861,7 +862,7 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf) herr_t ret_value; FUNC_ENTER_API(H5Aread, FAIL) - H5TRACE3("e","iix",attr_id,dtype_id,buf); + H5TRACE3("e", "iix", attr_id, dtype_id, buf); /* check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1005,7 +1006,7 @@ H5Aget_space(hid_t attr_id) hid_t ret_value; FUNC_ENTER_API(H5Aget_space, FAIL) - H5TRACE1("i","i",attr_id); + H5TRACE1("i", "i", attr_id); /* check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1051,7 +1052,7 @@ H5Aget_type(hid_t attr_id) hid_t ret_value; FUNC_ENTER_API(H5Aget_type, FAIL) - H5TRACE1("i","i",attr_id); + H5TRACE1("i", "i", attr_id); /* check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1112,7 +1113,7 @@ H5Aget_create_plist(hid_t attr_id) hid_t ret_value; FUNC_ENTER_API(H5Aget_create_plist, FAIL) - H5TRACE1("i","i",attr_id); + H5TRACE1("i", "i", attr_id); HDassert(H5P_LST_ATTRIBUTE_CREATE_g != -1); @@ -1168,7 +1169,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf) ssize_t ret_value; FUNC_ENTER_API(H5Aget_name, FAIL) - H5TRACE3("Zs","izs",attr_id,buf_size,buf); + H5TRACE3("Zs", "izs", attr_id, buf_size, buf); /* check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1223,7 +1224,7 @@ H5Aget_storage_size(hid_t attr_id) hsize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Aget_storage_size, 0) - H5TRACE1("h","i",attr_id); + H5TRACE1("h", "i", attr_id); /* Check args */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1289,7 +1290,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Arename, FAIL) - H5TRACE3("e","iss",loc_id,old_name,new_name); + H5TRACE3("e", "iss", loc_id, old_name, new_name); /* check arguments */ if(!old_name || !new_name) @@ -1351,7 +1352,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data) herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Aiterate, FAIL) - H5TRACE4("e","i*Iuxx",loc_id,attr_num,op,op_data); + H5TRACE4("e", "i*Iuxx", loc_id, attr_num, op, op_data); /* check arguments */ if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id)) @@ -1394,7 +1395,7 @@ H5Adelete(hid_t loc_id, const char *name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Adelete, FAIL) - H5TRACE2("e","is",loc_id,name); + H5TRACE2("e", "is", loc_id, name); /* check arguments */ if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id)) @@ -1434,7 +1435,7 @@ H5Aclose(hid_t attr_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Aclose, FAIL) - H5TRACE1("e","i",attr_id); + H5TRACE1("e", "i", attr_id); /* check arguments */ if(NULL == H5I_object_verify(attr_id, H5I_ATTR)) diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index dc5f65a..6b75495 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -129,7 +129,7 @@ H5Aget_num_attrs(hid_t loc_id) int ret_value; FUNC_ENTER_API(H5Aget_num_attrs, FAIL) - H5TRACE1("Is","i",loc_id); + H5TRACE1("Is", "i", loc_id); /* check arguments */ if(H5I_FILE == H5I_get_type(loc_id) || H5I_ATTR == H5I_get_type(loc_id)) @@ -356,7 +356,7 @@ H5Dcreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Dcreate, FAIL) - H5TRACE5("i","isiii",loc_id,name,type_id,space_id,dcpl_id); + H5TRACE5("i", "isiii", loc_id, name, type_id, space_id, dcpl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -467,7 +467,7 @@ H5Dcreate_expand(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Dcreate_expand, FAIL) - H5TRACE5("i","iiiii",loc_id,type_id,space_id,dcpl_id,dapl_id); + H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -539,7 +539,7 @@ H5Dopen(hid_t loc_id, const char *name) hid_t ret_value; FUNC_ENTER_API(H5Dopen, FAIL) - H5TRACE2("i","is",loc_id,name); + H5TRACE2("i", "is", loc_id, name); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -620,7 +620,7 @@ H5Dopen_expand(hid_t loc_id, const char *name, hid_t dapl_id) hid_t ret_value; FUNC_ENTER_API(H5Dopen_expand, FAIL) - H5TRACE3("i","isi",loc_id,name,dapl_id); + H5TRACE3("i", "isi", loc_id, name, dapl_id); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -698,7 +698,7 @@ H5Dclose(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Dclose, FAIL) - H5TRACE1("e","i",dset_id); + H5TRACE1("e", "i", dset_id); /* Check args */ if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET))) @@ -740,7 +740,7 @@ H5Dget_space(hid_t dset_id) hid_t ret_value; FUNC_ENTER_API(H5Dget_space, FAIL) - H5TRACE1("i","i",dset_id); + H5TRACE1("i", "i", dset_id); /* Check args */ if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -787,7 +787,7 @@ H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Dget_space_status, FAIL) - H5TRACE2("e","i*Ds",dset_id,allocation); + H5TRACE2("e", "i*Ds", dset_id, allocation); /* Check arguments */ if(NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -891,7 +891,7 @@ H5Dget_type(hid_t dset_id) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Dget_type, FAIL) - H5TRACE1("i","i",dset_id); + H5TRACE1("i", "i", dset_id); /* Check args */ if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -952,7 +952,7 @@ H5Dget_create_plist(hid_t dset_id) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Dget_create_plist, FAIL) - H5TRACE1("i","i",dset_id); + H5TRACE1("i", "i", dset_id); /* Check args */ if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -1017,7 +1017,7 @@ H5Dextend(hid_t dset_id, const hsize_t *size) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Dextend, FAIL) - H5TRACE2("e","i*h",dset_id,size); + H5TRACE2("e", "i*h", dset_id, size); /* Check args */ if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -2673,7 +2673,7 @@ H5Dget_storage_size(hid_t dset_id) hsize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Dget_storage_size, 0) - H5TRACE1("h","i",dset_id); + H5TRACE1("h", "i", dset_id); /* Check args */ if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -2759,7 +2759,7 @@ H5Dget_offset(hid_t dset_id) haddr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Dget_offset, HADDR_UNDEF) - H5TRACE1("a","i",dset_id); + H5TRACE1("a", "i", dset_id); /* Check args */ if (NULL==(dset=H5I_object_verify(dset_id, H5I_DATASET))) @@ -2897,7 +2897,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, herr_t ret_value; FUNC_ENTER_API(H5Diterate, FAIL) - H5TRACE5("e","xiixx",buf,type_id,space_id,op,operator_data); + H5TRACE5("e", "xiixx", buf, type_id, space_id, op, operator_data); /* Check args */ if(NULL==op) @@ -2975,7 +2975,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf) herr_t ret_value; FUNC_ENTER_API(H5Dvlen_reclaim, FAIL) - H5TRACE4("e","iiix",type_id,space_id,plist_id,buf); + H5TRACE4("e", "iiix", type_id, space_id, plist_id, buf); /* Check args */ if (H5I_DATATYPE != H5I_get_type(type_id) || buf == NULL) @@ -3172,7 +3172,7 @@ H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, herr_t ret_value=FAIL; FUNC_ENTER_API(H5Dvlen_get_buf_size, FAIL) - H5TRACE4("e","iii*h",dataset_id,type_id,space_id,size); + H5TRACE4("e", "iii*h", dataset_id, type_id, space_id, size); /* Check args */ if(H5I_DATASET!=H5I_get_type(dataset_id) || @@ -3269,7 +3269,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t *size) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Dset_extent, FAIL) - H5TRACE2("e","i*h",dset_id,size); + H5TRACE2("e", "i*h", dset_id, size); /* Check args */ if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET))) @@ -3513,7 +3513,7 @@ H5Ddebug(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Ddebug, FAIL) - H5TRACE1("e","i",dset_id); + H5TRACE1("e", "i", dset_id); /* Check args */ if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET))) diff --git a/src/H5Dio.c b/src/H5Dio.c index 13fcffd..c143c83 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -183,7 +183,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_ herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Dfill, FAIL) - H5TRACE5("e","xixii",fill,fill_type_id,buf,buf_type_id,space_id); + H5TRACE5("e", "xixii", fill, fill_type_id, buf, buf_type_id, space_id); /* Check args */ if (buf==NULL) @@ -465,8 +465,8 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Dread, FAIL) - H5TRACE6("e","iiiiix",dset_id,mem_type_id,mem_space_id,file_space_id, - plist_id,buf); + H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id, + plist_id, buf); /* check arguments */ if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET))) @@ -549,8 +549,8 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Dwrite, FAIL) - H5TRACE6("e","iiiiix",dset_id,mem_type_id,mem_space_id,file_space_id, - plist_id,buf); + H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id, + plist_id, buf); /* check arguments */ if(NULL == (dset = H5I_object_verify(dset_id, H5I_DATASET))) @@ -370,7 +370,7 @@ H5Eregister_class(const char *cls_name, const char *lib_name, const char *versio hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Eregister_class, FAIL) - H5TRACE3("i","sss",cls_name,lib_name,version); + H5TRACE3("i", "sss", cls_name, lib_name, version); /* Check arguments */ if (cls_name==NULL || lib_name==NULL || version==NULL) @@ -456,7 +456,7 @@ H5Eunregister_class(hid_t class_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eunregister_class, FAIL) - H5TRACE1("e","i",class_id); + H5TRACE1("e", "i", class_id); /* Check arguments */ if (H5I_ERROR_CLASS != H5I_get_type(class_id)) @@ -535,7 +535,7 @@ H5Eget_class_name(hid_t class_id, char *name, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Eget_class_name, FAIL) - H5TRACE3("Zs","isz",class_id,name,size); + H5TRACE3("Zs", "isz", class_id, name, size); /* Get the error class */ if(NULL==(cls = H5I_object_verify(class_id, H5I_ERROR_CLASS))) @@ -647,7 +647,7 @@ H5Eclose_msg(hid_t err_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eclose_msg, FAIL) - H5TRACE1("e","i",err_id); + H5TRACE1("e", "i", err_id); /* Check arguments */ if (H5I_ERROR_MSG != H5I_get_type(err_id)) @@ -714,7 +714,7 @@ H5Ecreate_msg(hid_t class_id, H5E_type_t msg_type, const char *msg_str) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Ecreate_msg, FAIL) - H5TRACE3("i","iEts",class_id,msg_type,msg_str); + H5TRACE3("i", "iEts", class_id, msg_type, msg_str); /* Check arguments */ if(msg_type!=H5E_MAJOR && msg_type!=H5E_MINOR) @@ -905,7 +905,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Eget_msg, FAIL) - H5TRACE4("Zs","i*Etsz",msg_id,type,msg_str,size); + H5TRACE4("Zs", "i*Etsz", msg_id, type, msg_str, size); /* Get the message object */ if((msg = H5I_object_verify(msg_id, H5I_ERROR_MSG))==NULL) @@ -1099,7 +1099,7 @@ H5Eset_current_stack(hid_t err_stack) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eset_current_stack, FAIL) - H5TRACE1("e","i",err_stack); + H5TRACE1("e", "i", err_stack); if(err_stack != H5E_DEFAULT) { if((estack = H5I_object_verify(err_stack, H5I_ERROR_STACK))==NULL) @@ -1201,7 +1201,7 @@ H5Eclose_stack(hid_t stack_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eclose_stack, FAIL) - H5TRACE1("e","i",stack_id); + H5TRACE1("e", "i", stack_id); if(H5E_DEFAULT != stack_id) { /* Check arguments */ @@ -1278,7 +1278,7 @@ H5Eget_num(hid_t error_stack_id) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5Eget_num, FAIL) - H5TRACE1("Zs","i",error_stack_id); + H5TRACE1("Zs", "i", error_stack_id); /* Need to check for errors */ if(error_stack_id == H5E_DEFAULT) { @@ -1353,7 +1353,7 @@ H5Epop(hid_t err_stack, size_t count) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5Epop, FAIL) - H5TRACE2("e","iz",err_stack,count); + H5TRACE2("e", "iz", err_stack, count); /* Need to check for errors */ if(err_stack == H5E_DEFAULT) { @@ -1448,7 +1448,7 @@ H5Epush(const char *file, const char *func, unsigned line, /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5Epush, FAIL) - H5TRACE6("e","ssIuiis",file,func,line,maj,min,str); + H5TRACE6("e", "ssIuiis", file, func, line, maj, min, str); /* Push the error on the stack */ if(H5E_push_stack(estack, file, func, line, H5E_ERR_CLS_g, maj, min, str)<0) @@ -1730,7 +1730,7 @@ H5Eclear_stack(hid_t err_stack) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5Eclear_stack, FAIL) - H5TRACE1("e","i",err_stack); + H5TRACE1("e", "i", err_stack); /* Need to check for errors */ if(err_stack == H5E_DEFAULT) @@ -2466,7 +2466,7 @@ H5Eget_auto(H5E_auto_t *func, void **client_data) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eget_auto, FAIL) - H5TRACE2("e","*xx",func,client_data); + H5TRACE2("e", "*xx", func, client_data); /* Retrieve default error stack */ if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ @@ -2506,7 +2506,7 @@ H5Eget_auto_stack(hid_t estack_id, H5E_auto_stack_t *func, void **client_data) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eget_auto_stack, FAIL) - H5TRACE3("e","i*xx",estack_id,func,client_data); + H5TRACE3("e", "i*xx", estack_id, func, client_data); if(estack_id == H5E_DEFAULT) { if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ @@ -2597,7 +2597,7 @@ H5Eset_auto(H5E_auto_t func, void *client_data) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5Eset_auto, FAIL) - H5TRACE2("e","xx",func,client_data); + H5TRACE2("e", "xx", func, client_data); if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack") @@ -2645,7 +2645,7 @@ H5Eset_auto_stack(hid_t estack_id, H5E_auto_stack_t func, void *client_data) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5Eset_auto_stack, FAIL) - H5TRACE3("e","ixx",estack_id,func,client_data); + H5TRACE3("e", "ixx", estack_id, func, client_data); if(estack_id == H5E_DEFAULT) { if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ @@ -2776,7 +2776,7 @@ H5Eauto_is_stack(hid_t estack_id, unsigned *is_stack) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Eauto_is_stack, FAIL) - H5TRACE2("e","i*Iu",estack_id,is_stack); + H5TRACE2("e", "i*Iu", estack_id, is_stack); if(estack_id == H5E_DEFAULT) { if((estack = H5E_get_my_stack())==NULL) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ diff --git a/src/H5Edefin.h b/src/H5Edefin.h index f24fc20..35579ea 100644 --- a/src/H5Edefin.h +++ b/src/H5Edefin.h @@ -183,6 +183,13 @@ hid_t H5E_CANTNEXT_g = FAIL; /* Can't move to next iterator location hid_t H5E_BADSELECT_g = FAIL; /* Invalid selection */ hid_t H5E_CANTCOMPARE_g = FAIL; /* Can't compare objects */ +/* Argument errors */ +hid_t H5E_UNINITIALIZED_g = FAIL; /* Information is uinitialized */ +hid_t H5E_UNSUPPORTED_g = FAIL; /* Feature is unsupported */ +hid_t H5E_BADTYPE_g = FAIL; /* Inappropriate type */ +hid_t H5E_BADRANGE_g = FAIL; /* Out of range */ +hid_t H5E_BADVALUE_g = FAIL; /* Bad value */ + /* B-tree related errors */ hid_t H5E_NOTFOUND_g = FAIL; /* Object not found */ hid_t H5E_EXISTS_g = FAIL; /* Object already exists */ @@ -196,13 +203,6 @@ hid_t H5E_CANTLIST_g = FAIL; /* Unable to list node */ hid_t H5E_CANTMODIFY_g = FAIL; /* Unable to modify record */ hid_t H5E_CANTREMOVE_g = FAIL; /* Unable to remove object */ -/* Argument errors */ -hid_t H5E_UNINITIALIZED_g = FAIL; /* Information is uinitialized */ -hid_t H5E_UNSUPPORTED_g = FAIL; /* Feature is unsupported */ -hid_t H5E_BADTYPE_g = FAIL; /* Inappropriate type */ -hid_t H5E_BADRANGE_g = FAIL; /* Out of range */ -hid_t H5E_BADVALUE_g = FAIL; /* Bad value */ - /* Datatype conversion errors */ hid_t H5E_CANTCONVERT_g = FAIL; /* Can't convert datatypes */ hid_t H5E_BADSIZE_g = FAIL; /* Bad size for object */ diff --git a/src/H5Einit.h b/src/H5Einit.h index aae3a82..8b2429a 100644 --- a/src/H5Einit.h +++ b/src/H5Einit.h @@ -693,6 +693,33 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL) if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +/* Argument errors */ +assert(H5E_UNINITIALIZED_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_UNSUPPORTED_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_BADTYPE_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_BADRANGE_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_BADVALUE_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") + /* B-tree related errors */ assert(H5E_NOTFOUND_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL) @@ -750,33 +777,6 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to remove object"))==NULL) if((H5E_CANTREMOVE_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -/* Argument errors */ -assert(H5E_UNINITIALIZED_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_UNSUPPORTED_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_BADTYPE_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_BADRANGE_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_BADVALUE_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") - /* Datatype conversion errors */ assert(H5E_CANTCONVERT_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL) diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h index 2975f05..ccd1d52 100644 --- a/src/H5Epubgen.h +++ b/src/H5Epubgen.h @@ -314,6 +314,18 @@ H5_DLLVAR hid_t H5E_CANTNEXT_g; /* Can't move to next iterator location */ H5_DLLVAR hid_t H5E_BADSELECT_g; /* Invalid selection */ H5_DLLVAR hid_t H5E_CANTCOMPARE_g; /* Can't compare objects */ +/* Argument errors */ +#define H5E_UNINITIALIZED (H5OPEN H5E_UNINITIALIZED_g) +#define H5E_UNSUPPORTED (H5OPEN H5E_UNSUPPORTED_g) +#define H5E_BADTYPE (H5OPEN H5E_BADTYPE_g) +#define H5E_BADRANGE (H5OPEN H5E_BADRANGE_g) +#define H5E_BADVALUE (H5OPEN H5E_BADVALUE_g) +H5_DLLVAR hid_t H5E_UNINITIALIZED_g; /* Information is uinitialized */ +H5_DLLVAR hid_t H5E_UNSUPPORTED_g; /* Feature is unsupported */ +H5_DLLVAR hid_t H5E_BADTYPE_g; /* Inappropriate type */ +H5_DLLVAR hid_t H5E_BADRANGE_g; /* Out of range */ +H5_DLLVAR hid_t H5E_BADVALUE_g; /* Bad value */ + /* B-tree related errors */ #define H5E_NOTFOUND (H5OPEN H5E_NOTFOUND_g) #define H5E_EXISTS (H5OPEN H5E_EXISTS_g) @@ -338,18 +350,6 @@ H5_DLLVAR hid_t H5E_CANTLIST_g; /* Unable to list node */ H5_DLLVAR hid_t H5E_CANTMODIFY_g; /* Unable to modify record */ H5_DLLVAR hid_t H5E_CANTREMOVE_g; /* Unable to remove object */ -/* Argument errors */ -#define H5E_UNINITIALIZED (H5OPEN H5E_UNINITIALIZED_g) -#define H5E_UNSUPPORTED (H5OPEN H5E_UNSUPPORTED_g) -#define H5E_BADTYPE (H5OPEN H5E_BADTYPE_g) -#define H5E_BADRANGE (H5OPEN H5E_BADRANGE_g) -#define H5E_BADVALUE (H5OPEN H5E_BADVALUE_g) -H5_DLLVAR hid_t H5E_UNINITIALIZED_g; /* Information is uinitialized */ -H5_DLLVAR hid_t H5E_UNSUPPORTED_g; /* Feature is unsupported */ -H5_DLLVAR hid_t H5E_BADTYPE_g; /* Inappropriate type */ -H5_DLLVAR hid_t H5E_BADRANGE_g; /* Out of range */ -H5_DLLVAR hid_t H5E_BADVALUE_g; /* Bad value */ - /* Datatype conversion errors */ #define H5E_CANTCONVERT (H5OPEN H5E_CANTCONVERT_g) #define H5E_BADSIZE (H5OPEN H5E_BADSIZE_g) diff --git a/src/H5Eterm.h b/src/H5Eterm.h index ded4c66..1c4e762 100644 --- a/src/H5Eterm.h +++ b/src/H5Eterm.h @@ -185,6 +185,13 @@ H5E_CANTNEXT_g= H5E_BADSELECT_g= H5E_CANTCOMPARE_g= +/* Argument errors */ +H5E_UNINITIALIZED_g= +H5E_UNSUPPORTED_g= +H5E_BADTYPE_g= +H5E_BADRANGE_g= +H5E_BADVALUE_g= + /* B-tree related errors */ H5E_NOTFOUND_g= H5E_EXISTS_g= @@ -198,13 +205,6 @@ H5E_CANTLIST_g= H5E_CANTMODIFY_g= H5E_CANTREMOVE_g= -/* Argument errors */ -H5E_UNINITIALIZED_g= -H5E_UNSUPPORTED_g= -H5E_BADTYPE_g= -H5E_BADRANGE_g= -H5E_BADVALUE_g= - /* Datatype conversion errors */ H5E_CANTCONVERT_g= H5E_BADSIZE_g= (-1); @@ -209,7 +209,7 @@ H5Fget_create_plist(hid_t file_id) hid_t ret_value; FUNC_ENTER_API(H5Fget_create_plist, FAIL) - H5TRACE1("i","i",file_id); + H5TRACE1("i", "i", file_id); /* check args */ if (NULL==(file=H5I_object_verify(file_id, H5I_FILE))) @@ -271,7 +271,7 @@ H5Fget_access_plist(hid_t file_id) hid_t ret_value = SUCCEED; FUNC_ENTER_API(H5Fget_access_plist, FAIL) - H5TRACE1("i","i",file_id); + H5TRACE1("i", "i", file_id); /* Check args */ if (NULL==(f=H5I_object_verify(file_id, H5I_FILE))) @@ -406,7 +406,7 @@ H5Fget_obj_count(hid_t file_id, unsigned types) int ret_value; /* Return value */ FUNC_ENTER_API(H5Fget_obj_count, FAIL) - H5TRACE2("Is","iIu",file_id,types); + H5TRACE2("Is", "iIu", file_id, types); if( file_id != (hid_t)H5F_OBJ_ALL && (NULL==(f=H5I_object_verify(file_id,H5I_FILE))) ) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file id") @@ -470,7 +470,7 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, int max_objs, hid_t *oid_list) H5F_t *f=NULL; FUNC_ENTER_API(H5Fget_obj_ids, FAIL) - H5TRACE4("e","iIuIs*i",file_id,types,max_objs,oid_list); + H5TRACE4("e", "iIuIs*i", file_id, types, max_objs, oid_list); if( file_id != (hid_t)H5F_OBJ_ALL && (NULL==(f=H5I_object_verify(file_id,H5I_FILE))) ) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file id") @@ -715,7 +715,7 @@ H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle) herr_t ret_value; FUNC_ENTER_API(H5Fget_vfd_handle, FAIL) - H5TRACE3("e","iix",file_id,fapl,file_handle); + H5TRACE3("e", "iix", file_id, fapl, file_handle); /* Check args */ assert(file_handle); @@ -857,7 +857,7 @@ H5Fis_hdf5(const char *name) htri_t ret_value; FUNC_ENTER_API(H5Fis_hdf5, FAIL) - H5TRACE1("t","s",name); + H5TRACE1("t", "s", name); /* Check args and all the boring stuff. */ if (!name || !*name) @@ -1550,7 +1550,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id) hid_t ret_value; /*return value */ FUNC_ENTER_API(H5Fcreate, FAIL) - H5TRACE4("i","sIuii",filename,flags,fcpl_id,fapl_id); + H5TRACE4("i", "sIuii", filename, flags, fcpl_id, fapl_id); /* Check/fix arguments */ if (!filename || !*filename) @@ -1652,7 +1652,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id) hid_t ret_value; /*return value */ FUNC_ENTER_API(H5Fopen, FAIL) - H5TRACE3("i","sIui",filename,flags,fapl_id); + H5TRACE3("i", "sIui", filename, flags, fapl_id); /* Check/fix arguments. */ if(!filename || !*filename) @@ -1720,7 +1720,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Fflush, FAIL) - H5TRACE2("e","iFs",object_id,scope); + H5TRACE2("e", "iFs", object_id, scope); switch(H5I_get_type(object_id)) { case H5I_FILE: @@ -2185,7 +2185,7 @@ H5Fclose(hid_t file_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Fclose, FAIL) - H5TRACE1("e","i",file_id); + H5TRACE1("e", "i", file_id); /* Check/fix arguments. */ if(H5I_FILE != H5I_get_type(file_id)) @@ -2233,7 +2233,7 @@ H5Freopen(hid_t file_id) hid_t ret_value; FUNC_ENTER_API(H5Freopen, FAIL) - H5TRACE1("i","i",file_id); + H5TRACE1("i", "i", file_id); /* Check arguments */ if(NULL == (old_file = H5I_object_verify(file_id, H5I_FILE))) @@ -2286,7 +2286,7 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Fget_intent, FAIL) - H5TRACE2("e","i*Iu",file_id,intent_flags); + H5TRACE2("e", "i*Iu", file_id, intent_flags); if(NULL == (file = H5I_object_verify(file_id, H5I_FILE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file") @@ -3240,7 +3240,7 @@ H5Fget_freespace(hid_t file_id) hssize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Fget_freespace, FAIL) - H5TRACE1("Hs","i",file_id); + H5TRACE1("Hs", "i", file_id); /* Check args */ if(NULL == (file = H5I_object_verify(file_id, H5I_FILE))) @@ -3281,7 +3281,7 @@ H5Fget_filesize(hid_t file_id, hsize_t *size) haddr_t eof; FUNC_ENTER_API(H5Fget_filesize, FAIL) - H5TRACE2("e","i*h",file_id,size); + H5TRACE2("e", "i*h", file_id, size); /* Check args */ if(NULL==(file=H5I_object_verify(file_id, H5I_FILE))) @@ -3331,7 +3331,7 @@ H5Fget_mdc_config(hid_t file_id, herr_t result; FUNC_ENTER_API(H5Fget_mdc_config, FAIL) - H5TRACE2("e","ix",file_id,config_ptr); + H5TRACE2("e", "ix", file_id, config_ptr); /* Check args */ if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { @@ -3390,7 +3390,7 @@ H5Fset_mdc_config(hid_t file_id, herr_t result; FUNC_ENTER_API(H5Fset_mdc_config, FAIL) - H5TRACE2("e","ix",file_id,config_ptr); + H5TRACE2("e", "ix", file_id, config_ptr); /* Check args */ if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { @@ -3444,7 +3444,7 @@ H5Fget_mdc_hit_rate(hid_t file_id, herr_t result; FUNC_ENTER_API(H5Fget_mdc_hit_rate, FAIL) - H5TRACE2("e","i*d",file_id,hit_rate_ptr); + H5TRACE2("e", "i*d", file_id, hit_rate_ptr); /* Check args */ if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { @@ -3508,8 +3508,8 @@ H5Fget_mdc_size(hid_t file_id, int32_t cur_num_entries; FUNC_ENTER_API(H5Fget_mdc_size, FAIL) - H5TRACE5("e","i*z*z*z*Is",file_id,max_size_ptr,min_clean_size_ptr, - cur_size_ptr,cur_num_entries_ptr); + H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr, + cur_size_ptr, cur_num_entries_ptr); /* Check args */ if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { @@ -3574,7 +3574,7 @@ H5Freset_mdc_hit_rate_stats(hid_t file_id) herr_t result; FUNC_ENTER_API(H5Freset_mdc_hit_rate_stats, FAIL) - H5TRACE1("e","i",file_id); + H5TRACE1("e", "i", file_id); /* Check args */ if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) { @@ -3628,7 +3628,7 @@ H5Fget_name(hid_t obj_id, char *name/*out*/, size_t size) ssize_t ret_value; FUNC_ENTER_API (H5Fget_name, FAIL) - H5TRACE3("Zs","ixz",obj_id,name,size); + H5TRACE3("Zs", "ixz", obj_id, name, size); /* For file IDs, get the file object directly */ /* (This prevents the H5G_loc() call from returning the file pointer for @@ -248,7 +248,7 @@ H5FDregister(const H5FD_class_t *cls) H5FD_mem_t type; FUNC_ENTER_API(H5FDregister, FAIL) - H5TRACE1("i","x",cls); + H5TRACE1("i", "x", cls); /* Check arguments */ if(!cls) @@ -363,7 +363,7 @@ H5FDunregister(hid_t driver_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDunregister, FAIL) - H5TRACE1("e","i",driver_id); + H5TRACE1("e", "i", driver_id); /* Check arguments */ if(NULL==H5I_object_verify(driver_id,H5I_VFL)) @@ -1107,7 +1107,7 @@ H5FDclose(H5FD_t *file) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDclose, FAIL) - H5TRACE1("e","x",file); + H5TRACE1("e", "x", file); if(!file || !file->cls) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer") @@ -1277,7 +1277,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2) int ret_value; FUNC_ENTER_API(H5FDcmp, -1) /*return value is arbitrary*/ - H5TRACE2("Is","xx",f1,f2); + H5TRACE2("Is", "xx", f1, f2); ret_value = H5FD_cmp(f1, f2); @@ -1358,7 +1358,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/) int ret_value; FUNC_ENTER_API(H5FDquery, FAIL) - H5TRACE2("Is","xx",f,flags); + H5TRACE2("Is", "xx", f, flags); assert(f); assert(flags); @@ -1454,7 +1454,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) haddr_t ret_value = HADDR_UNDEF; FUNC_ENTER_API(H5FDalloc, HADDR_UNDEF) - H5TRACE4("a","xMtih",file,type,dxpl_id,size); + H5TRACE4("a", "xMtih", file, type, dxpl_id, size); /* Check args */ if(!file || !file->cls) @@ -2197,7 +2197,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDfree, FAIL) - H5TRACE5("e","xMtiah",file,type,dxpl_id,addr,size); + H5TRACE5("e", "xMtiah", file, type, dxpl_id, addr, size); /* Check args */ if(!file || !file->cls) @@ -2492,7 +2492,7 @@ H5FDrealloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsiz haddr_t ret_value=HADDR_UNDEF; FUNC_ENTER_API(H5FDrealloc, HADDR_UNDEF) - H5TRACE6("a","xMtiahh",file,type,dxpl_id,old_addr,old_size,new_size); + H5TRACE6("a", "xMtiahh", file, type, dxpl_id, old_addr, old_size, new_size); /* Check args */ if(H5P_DEFAULT == dxpl_id) @@ -2844,7 +2844,7 @@ H5FDget_eoa(H5FD_t *file) haddr_t ret_value; FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF) - H5TRACE1("a","x",file); + H5TRACE1("a", "x", file); /* Check args */ if(!file || !file->cls) @@ -2925,7 +2925,7 @@ H5FDset_eoa(H5FD_t *file, haddr_t addr) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDset_eoa, FAIL) - H5TRACE2("e","xa",file,addr); + H5TRACE2("e", "xa", file, addr); /* Check args */ if(!file || !file->cls) @@ -3010,7 +3010,7 @@ H5FDget_eof(H5FD_t *file) haddr_t ret_value; FUNC_ENTER_API(H5FDget_eof, HADDR_UNDEF) - H5TRACE1("a","x",file); + H5TRACE1("a", "x", file); /* Check arguments */ if(!file || !file->cls) @@ -3091,7 +3091,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDread, FAIL) - H5TRACE6("e","xMtiazx",file,type,dxpl_id,addr,size,buf); + H5TRACE6("e", "xMtiazx", file, type, dxpl_id, addr, size, buf); /* Check args */ if(!file || !file->cls) @@ -3320,7 +3320,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDwrite, FAIL) - H5TRACE6("e","xMtiazx",file,type,dxpl_id,addr,size,buf); + H5TRACE6("e", "xMtiazx", file, type, dxpl_id, addr, size, buf); /* Check args */ if(!file || !file->cls) @@ -3624,7 +3624,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDflush, FAIL) - H5TRACE3("e","xiIu",file,dxpl_id,closing); + H5TRACE3("e", "xiIu", file, dxpl_id, closing); /* Check args */ if(!file || !file->cls) diff --git a/src/H5FDcore.c b/src/H5FDcore.c index b27949b..72ed14d 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -247,7 +247,7 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store) herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_core, FAIL) - H5TRACE3("e","izb",fapl_id,increment,backing_store); + H5TRACE3("e", "izb", fapl_id, increment, backing_store); /* Check argument */ if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) @@ -294,7 +294,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_fapl_core, FAIL) - H5TRACE3("e","ixx",fapl_id,increment,backing_store); + H5TRACE3("e", "ixx", fapl_id, increment, backing_store); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index 1af8bc5..b981e13 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -313,7 +313,7 @@ H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbu herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_direct, FAIL) - H5TRACE4("e","izzz",fapl_id,boundary,block_size,cbuf_size); + H5TRACE4("e", "izzz", fapl_id, boundary, block_size, cbuf_size); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") @@ -368,7 +368,7 @@ H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*o herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_fapl_direct, FAIL) - H5TRACE4("e","ixxx",fapl_id,boundary,block_size,cbuf_size); + H5TRACE4("e", "ixxx", fapl_id, boundary, block_size, cbuf_size); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list") diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index cacc758..8b678b5 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -257,7 +257,7 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t msize, hid_t memb_fapl_id) H5P_genplist_t *plist; /* Property list pointer */ FUNC_ENTER_API(H5Pset_fapl_family, FAIL) - H5TRACE3("e","ihi",fapl_id,msize,memb_fapl_id); + H5TRACE3("e", "ihi", fapl_id, msize, memb_fapl_id); /* Check arguments */ @@ -316,7 +316,7 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize/*out*/, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_fapl_family, FAIL) - H5TRACE3("e","ixx",fapl_id,msize,memb_fapl_id); + H5TRACE3("e", "ixx", fapl_id, msize, memb_fapl_id); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list") diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 7c2c3f2..c317355 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -348,7 +348,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_s herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_log, FAIL) - H5TRACE4("e","isIuz",fapl_id,logfile,flags,buf_size); + H5TRACE4("e", "isIuz", fapl_id, logfile, flags, buf_size); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 73bc2dc..8178b7a 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -319,7 +319,7 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info) herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_mpio, FAIL) - H5TRACE3("e","iMcMi",fapl_id,comm,info); + H5TRACE3("e", "iMcMi", fapl_id, comm, info); if(fapl_id==H5P_DEFAULT) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list") @@ -390,7 +390,7 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_fapl_mpio, FAIL) - H5TRACE3("e","ixx",fapl_id,comm,info); + H5TRACE3("e", "ixx", fapl_id, comm, info); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list") @@ -464,7 +464,7 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode) herr_t ret_value; FUNC_ENTER_API(H5Pset_dxpl_mpio, FAIL) - H5TRACE2("e","iDt",dxpl_id,xfer_mode); + H5TRACE2("e", "iDt", dxpl_id, xfer_mode); if(dxpl_id==H5P_DEFAULT) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list") @@ -514,7 +514,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_dxpl_mpio, FAIL) - H5TRACE2("e","ix",dxpl_id,xfer_mode); + H5TRACE2("e", "ix", dxpl_id, xfer_mode); if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER))) HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl") @@ -661,7 +661,7 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc) herr_t ret_value; FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_num, FAIL) - H5TRACE2("e","iIu",dxpl_id,num_chunk_per_proc); + H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc); if(dxpl_id==H5P_DEFAULT) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list") @@ -708,7 +708,7 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch herr_t ret_value; FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_ratio, FAIL) - H5TRACE2("e","iIu",dxpl_id,percent_num_proc_per_chunk); + H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk); if(dxpl_id==H5P_DEFAULT) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list") diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index 2809539..df76070 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -364,7 +364,7 @@ H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm, hbool_t use_gpfs) herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_mpiposix, FAIL) - H5TRACE3("e","iMcb",fapl_id,comm,use_gpfs); + H5TRACE3("e", "iMcb", fapl_id, comm, use_gpfs); /* Check arguments */ if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) @@ -423,7 +423,7 @@ H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*ou herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_fapl_mpiposix, FAIL) - H5TRACE3("e","ixx",fapl_id,comm,use_gpfs); + H5TRACE3("e", "ixx", fapl_id, comm, use_gpfs); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list") diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 3586e6c..af020db 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -298,7 +298,7 @@ H5Pset_fapl_sec2(hid_t fapl_id) herr_t ret_value; FUNC_ENTER_API(H5Pset_fapl_sec2, FAIL) - H5TRACE1("e","i",fapl_id); + H5TRACE1("e", "i", fapl_id); if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") diff --git a/src/H5Fmount.c b/src/H5Fmount.c index 452cf28..a4a7a67 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -480,7 +480,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Fmount, FAIL) - H5TRACE4("e","isii",loc_id,name,child_id,plist_id); + H5TRACE4("e", "isii", loc_id, name, child_id, plist_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -530,7 +530,7 @@ H5Funmount(hid_t loc_id, const char *name) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Funmount, FAIL) - H5TRACE2("e","is",loc_id,name); + H5TRACE2("e", "is", loc_id, name); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -161,7 +161,7 @@ H5Gcreate(hid_t loc_id, const char *name, size_t size_hint) hid_t ret_value; FUNC_ENTER_API(H5Gcreate, FAIL) - H5TRACE3("i","isz",loc_id,name,size_hint); + H5TRACE3("i", "isz", loc_id, name, size_hint); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -293,7 +293,7 @@ H5Gcreate_expand(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id) hid_t ret_value; FUNC_ENTER_API(H5Gcreate_expand, FAIL) - H5TRACE3("i","iii",loc_id,gcpl_id,gapl_id); + H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -359,7 +359,7 @@ H5Gopen(hid_t loc_id, const char *name) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Gopen, FAIL) - H5TRACE2("i","is",loc_id,name); + H5TRACE2("i", "is", loc_id, name); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -437,7 +437,7 @@ H5Gopen_expand(hid_t loc_id, const char *name, hid_t gapl_id) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Gopen_expand, FAIL); - H5TRACE3("i","isi",loc_id,name,gapl_id); + H5TRACE3("i", "isi", loc_id, name, gapl_id); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -520,7 +520,7 @@ H5Gget_create_plist(hid_t group_id) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Gget_create_plist, FAIL) - H5TRACE1("i","i",group_id); + H5TRACE1("i", "i", group_id); /* Check args */ if(NULL == (grp = H5I_object_verify(group_id, H5I_GROUP))) @@ -727,7 +727,7 @@ H5Gclose(hid_t group_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gclose, FAIL); - H5TRACE1("e","i",group_id); + H5TRACE1("e", "i", group_id); /* Check args */ if(NULL == H5I_object_verify(group_id,H5I_GROUP)) diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 9cb5abd..108e48c 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -138,7 +138,7 @@ H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, const char *new herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Glink, FAIL) - H5TRACE4("e","iLlss",cur_loc_id,type,cur_name,new_name); + H5TRACE4("e", "iLlss", cur_loc_id, type, cur_name, new_name); /* Check arguments */ if(!cur_name || !*cur_name) @@ -184,7 +184,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5L_type_t type, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Glink2, FAIL) - H5TRACE5("e","isLlis",cur_loc_id,cur_name,type,new_loc_id,new_name); + H5TRACE5("e", "isLlis", cur_loc_id, cur_name, type, new_loc_id, new_name); /* Check arguments */ if(!cur_name || !*cur_name) @@ -287,7 +287,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gmove, FAIL) - H5TRACE3("e","iss",src_loc_id,src_name,dst_name); + H5TRACE3("e", "iss", src_loc_id, src_name, dst_name); /* Call common routine to move the link */ if(H5G_move(src_loc_id, src_name, H5L_SAME_LOC, dst_name) < 0) @@ -312,7 +312,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gmove2, FAIL) - H5TRACE4("e","isis",src_loc_id,src_name,dst_loc_id,dst_name); + H5TRACE4("e", "isis", src_loc_id, src_name, dst_loc_id, dst_name); /* Call common routine to move the link */ if(H5G_move(src_loc_id, src_name, dst_loc_id, dst_name) < 0) @@ -394,7 +394,7 @@ H5Gunlink(hid_t loc_id, const char *name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gunlink, FAIL) - H5TRACE2("e","is",loc_id,name); + H5TRACE2("e", "is", loc_id, name); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -426,7 +426,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gget_linkval, FAIL) - H5TRACE4("e","iszx",loc_id,name,size,buf); + H5TRACE4("e", "iszx", loc_id, name, size, buf); /* Check arguments */ if(H5G_loc(loc_id, &loc)) @@ -474,7 +474,7 @@ H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size) ssize_t ret_value; FUNC_ENTER_API(H5Gget_objname_by_idx, FAIL) - H5TRACE4("Zs","ihsz",loc_id,idx,name,size); + H5TRACE4("Zs", "ihsz", loc_id, idx, name, size); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -517,7 +517,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gset_comment, FAIL) - H5TRACE3("e","iss",loc_id,name,comment); + H5TRACE3("e", "iss", loc_id, name, comment); if(H5G_loc(loc_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") @@ -562,7 +562,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf) int ret_value; FUNC_ENTER_API(H5Gget_comment, FAIL) - H5TRACE4("Is","iszs",loc_id,name,bufsize,buf); + H5TRACE4("Is", "iszs", loc_id, name, bufsize, buf); if(H5G_loc(loc_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") @@ -727,7 +727,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op, herr_t ret_value; FUNC_ENTER_API(H5Giterate, FAIL) - H5TRACE5("e","is*Isxx",loc_id,name,idx_p,op,op_data); + H5TRACE5("e", "is*Isxx", loc_id, name, idx_p, op, op_data); /* Check args */ if(!name || !*name) @@ -781,7 +781,7 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx) H5G_obj_t ret_value; FUNC_ENTER_API(H5Gget_objtype_by_idx, H5G_UNKNOWN) - H5TRACE2("Go","ih",loc_id,idx); + H5TRACE2("Go", "ih", loc_id, idx); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -825,7 +825,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Gget_objinfo, FAIL) - H5TRACE4("e","isbx",loc_id,name,follow_link,statbuf); + H5TRACE4("e", "isbx", loc_id, name, follow_link, statbuf); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -1015,7 +1015,7 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Gget_num_objs, FAIL) - H5TRACE2("e","i*h",loc_id,num_objs); + H5TRACE2("e", "i*h", loc_id, num_objs); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -1075,7 +1075,7 @@ H5Iget_type(hid_t id) H5I_type_t ret_value = H5I_BADID; FUNC_ENTER_API(H5Iget_type, H5I_BADID); - H5TRACE1("It","i",id); + H5TRACE1("It", "i", id); ret_value = H5I_get_type(id); @@ -1260,7 +1260,7 @@ H5Idec_ref(hid_t id) int ret_value; /* Return value */ FUNC_ENTER_API(H5Idec_ref, FAIL); - H5TRACE1("Is","i",id); + H5TRACE1("Is", "i", id); /* Check arguments */ if (id<0) @@ -1385,7 +1385,7 @@ H5Iinc_ref(hid_t id) int ret_value; /* Return value */ FUNC_ENTER_API(H5Iinc_ref, FAIL); - H5TRACE1("Is","i",id); + H5TRACE1("Is", "i", id); /* Check arguments */ if (id<0) @@ -1470,7 +1470,7 @@ H5Iget_ref(hid_t id) int ret_value; /* Return value */ FUNC_ENTER_API(H5Iget_ref, FAIL); - H5TRACE1("Is","i",id); + H5TRACE1("Is", "i", id); /* Check arguments */ if (id<0) @@ -1556,7 +1556,7 @@ H5Iinc_type_ref(H5I_type_t type) int ret_value; /* Return value */ FUNC_ENTER_API(H5Iinc_type_ref, FAIL); - H5TRACE1("Is","It",type); + H5TRACE1("Is", "It", type); /* Check arguments */ if (type<=0 || type >= H5I_next_type) @@ -1743,7 +1743,7 @@ H5Iget_type_ref(H5I_type_t type) int ret_value; /* Return value */ FUNC_ENTER_API(H5Iget_type_ref, FAIL); - H5TRACE1("Is","It",type); + H5TRACE1("Is", "It", type); /* Check arguments */ if (type<=0 || type >= H5I_next_type) @@ -1999,7 +1999,7 @@ H5Iget_name(hid_t id, char *name/*out*/, size_t size) ssize_t ret_value; FUNC_ENTER_API(H5Iget_name, FAIL) - H5TRACE3("Zs","ixz",id,name,size); + H5TRACE3("Zs", "ixz", id, name, size); /* Call internal group routine to retrieve object's name */ if((ret_value = H5G_get_name(id, name, size, H5AC_ind_dxpl_id)) < 0) @@ -2033,7 +2033,7 @@ H5Iget_file_id(hid_t obj_id) hid_t ret_value; FUNC_ENTER_API(H5Iget_file_id, FAIL); - H5TRACE1("i","i",obj_id); + H5TRACE1("i", "i", obj_id); if((ret_value = H5I_get_file_id(obj_id))<0) HGOTO_ERROR (H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve file ID"); @@ -319,7 +319,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lmove, FAIL) - H5TRACE6("e","isisii",src_loc_id,src_name,dst_loc_id,dst_name,lcpl_id, + H5TRACE6("e", "isisii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id); /* Check arguments */ @@ -377,7 +377,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lcopy, FAIL) - H5TRACE6("e","isisii",src_loc_id,src_name,dst_loc_id,dst_name,lcpl_id, + H5TRACE6("e", "isisii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id); /* Check arguments */ @@ -442,7 +442,7 @@ H5Llink(hid_t new_loc_id, const char *new_name, hid_t obj_id, hid_t lcpl_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Llink, FAIL) - H5TRACE5("e","isiii",new_loc_id,new_name,obj_id,lcpl_id,lapl_id); + H5TRACE5("e", "isiii", new_loc_id, new_name, obj_id, lcpl_id, lapl_id); /* Check arguments */ if(new_loc_id == H5L_SAME_LOC) @@ -493,7 +493,7 @@ H5Lcreate_soft(const char *target_path, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lcreate_soft, FAIL) - H5TRACE5("e","sisii",target_path,cur_loc_id,new_name,lcpl_id,lapl_id); + H5TRACE5("e", "sisii", target_path, cur_loc_id, new_name, lcpl_id, lapl_id); /* Check arguments */ if(H5G_loc(cur_loc_id, &cur_loc) < 0) @@ -539,7 +539,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lcreate_hard, FAIL) - H5TRACE6("e","isisii",cur_loc_id,cur_name,new_loc_id,new_name,lcpl_id, + H5TRACE6("e", "isisii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id, lapl_id); /* Check arguments */ @@ -608,8 +608,8 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lcreate_ud, FAIL) - H5TRACE7("e","isLlxzii",link_loc_id,link_name,link_type,udata,udata_size, - lcpl_id,lapl_id); + H5TRACE7("e", "isLlxzii", link_loc_id, link_name, link_type, udata, udata_size, + lcpl_id, lapl_id); /* Check arguments */ if(H5G_loc(link_loc_id, &link_loc) < 0) @@ -651,7 +651,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Ldelete, FAIL) - H5TRACE3("e","isi",loc_id,name,lapl_id); + H5TRACE3("e", "isi", loc_id, name, lapl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -695,7 +695,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Ldelete_by_idx, FAIL) - H5TRACE6("e","isLiIohi",loc_id,group_name,idx_type,order,n,lapl_id); + H5TRACE6("e", "isIiIohi", loc_id, group_name, idx_type, order, n, lapl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -748,7 +748,7 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lget_val, FAIL) - H5TRACE5("e","isxzi",loc_id,name,buf,size,lapl_id); + H5TRACE5("e", "isxzi", loc_id, name, buf, size, lapl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc)) @@ -797,7 +797,7 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lget_val_by_idx, FAIL) - H5TRACE8("e","isLiIohxzi",loc_id,group_name,idx_type,order,n,buf,size, + H5TRACE8("e", "isIiIohxzi", loc_id, group_name, idx_type, order, n, buf, size, lapl_id); /* Check arguments */ @@ -846,7 +846,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linkbuf /*out*/, herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Lget_info, FAIL) - H5TRACE4("e","isxi",loc_id,name,linkbuf,lapl_id); + H5TRACE4("e", "isxi", loc_id, name, linkbuf, lapl_id); /* Check arguments */ if(H5G_loc(loc_id, &loc)) @@ -891,7 +891,7 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lget_info_by_idx, FAIL) - H5TRACE7("e","isLiIohxi",loc_id,group_name,idx_type,order,n,linkbuf, + H5TRACE7("e", "isIiIohxi", loc_id, group_name, idx_type, order, n, linkbuf, lapl_id); /* Check arguments */ @@ -943,7 +943,7 @@ H5Lregister(const H5L_class_t *cls) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lregister, FAIL) - H5TRACE1("e","*x",cls); + H5TRACE1("e", "*x", cls); /* Check args */ if(cls == NULL) @@ -990,7 +990,7 @@ H5Lunregister(H5L_type_t id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lunregister, FAIL) - H5TRACE1("e","Ll",id); + H5TRACE1("e", "Ll", id); /* Check args */ if(id < 0 || id > H5L_TYPE_MAX) @@ -1027,7 +1027,7 @@ H5Lis_registered(H5L_type_t id) htri_t ret_value = FALSE; /* Return value */ FUNC_ENTER_API(H5Lis_registered, FAIL) - H5TRACE1("t","Ll",id); + H5TRACE1("t", "Ll", id); /* Check args */ if(id < 0 || id > H5L_TYPE_MAX) @@ -1070,7 +1070,7 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name, ssize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Lget_name_by_idx, FAIL) - H5TRACE8("Zs","isLiIohxzi",loc_id,group_name,idx_type,order,n,name,size, + H5TRACE8("Zs", "isIiIohxzi", loc_id, group_name, idx_type, order, n, name, size, lapl_id); /* Check arguments */ @@ -1130,8 +1130,8 @@ H5Literate(hid_t loc_id, const char *group_name, herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Literate, FAIL) - H5TRACE8("e","isLiIo*hxxi",loc_id,group_name,idx_type,order,idx_p,op, - op_data,lapl_id); + H5TRACE8("e", "isIiIo*hxxi", loc_id, group_name, idx_type, order, idx_p, op, + op_data, lapl_id); /* Check arguments */ if(!group_name || !*group_name) diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index 6594e32..51bbfa0 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -226,7 +226,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lcreate_external, FAIL) - H5TRACE6("e","ssisii",file_name,obj_name,link_loc_id,link_name,lcpl_id, + H5TRACE6("e", "ssisii", file_name, obj_name, link_loc_id, link_name, lcpl_id, lapl_id); /* Check arguments */ @@ -317,7 +317,7 @@ H5Lunpack_elink_val(char *ext_linkval, size_t link_size, char **filename, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lunpack_elink_val, FAIL) - H5TRACE4("e","sz*s*s",ext_linkval,link_size,filename,obj_path); + H5TRACE4("e", "sz*s*s", ext_linkval, link_size, filename, obj_path); if(ext_linkval == NULL ) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an external link linkval buffer") @@ -174,7 +174,7 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Oopen, FAIL) - H5TRACE3("i","isi",loc_id,name,lapl_id); + H5TRACE3("i", "isi", loc_id, name, lapl_id); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -240,7 +240,7 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, hid_t ret_value = FAIL; FUNC_ENTER_API(H5Oopen_by_idx, FAIL) - H5TRACE6("i","isLiIohi",loc_id,group_name,idx_type,order,n,lapl_id); + H5TRACE6("i", "isIiIohi", loc_id, group_name, idx_type, order, n, lapl_id); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -327,7 +327,7 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Oopen_by_addr, FAIL) - H5TRACE2("i","ia",loc_id,addr); + H5TRACE2("i", "ia", loc_id, addr); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -383,7 +383,7 @@ H5Oincr_refcount(hid_t object_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Oincr_refcount, FAIL) - H5TRACE1("e","i",object_id); + H5TRACE1("e", "i", object_id); /* Get the object's oloc so we can adjust its link count */ if((oloc = H5O_get_loc(object_id)) == NULL) @@ -424,7 +424,7 @@ H5Odecr_refcount(hid_t object_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Odecr_refcount, FAIL) - H5TRACE1("e","i",object_id); + H5TRACE1("e", "i", object_id); /* Get the object's oloc so we can adjust its link count */ if((oloc = H5O_get_loc(object_id)) == NULL) @@ -572,7 +572,7 @@ H5Oclose(hid_t object_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Oclose, FAIL) - H5TRACE1("e","i",object_id); + H5TRACE1("e", "i", object_id); /* Get the type of the object and close it in the correct way */ switch(H5I_get_type(object_id)) diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index cce2d6d..df8fe01 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -185,7 +185,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Ocopy, FAIL) - H5TRACE6("e","isisii",src_loc_id,src_name,dst_loc_id,dst_name,ocpypl_id, + H5TRACE6("e", "isisii", src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id, lcpl_id); /* Check arguments */ @@ -856,7 +856,7 @@ H5Pcopy(hid_t id) hid_t ret_value=FALSE; /* return value */ FUNC_ENTER_API(H5Pcopy, FAIL); - H5TRACE1("i","i",id); + H5TRACE1("i", "i", id); if (H5P_DEFAULT==id) HGOTO_DONE(H5P_DEFAULT); @@ -1618,8 +1618,8 @@ H5Pcreate_class(hid_t parent, const char *name, hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Pcreate_class, FAIL); - H5TRACE8("i","isxxxxxx",parent,name,cls_create,create_data,cls_copy, - copy_data,cls_close,close_data); + H5TRACE8("i", "isxxxxxx", parent, name, cls_create, create_data, cls_copy, + copy_data, cls_close, close_data); /* Check arguments. */ if (H5P_DEFAULT!=parent && (H5I_GENPROP_CLS!=H5I_get_type(parent))) @@ -1892,7 +1892,7 @@ H5Pcreate(hid_t cls_id) hid_t ret_value; /* return value */ FUNC_ENTER_API(H5Pcreate, FAIL); - H5TRACE1("i","i",cls_id); + H5TRACE1("i", "i", cls_id); /* Check arguments. */ if (NULL == (pclass = H5I_object_verify(cls_id, H5I_GENPROP_CLS))) @@ -2951,7 +2951,7 @@ H5Pset(hid_t plist_id, const char *name, void *value) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset, FAIL); - H5TRACE3("e","isx",plist_id,name,value); + H5TRACE3("e", "isx", plist_id, name, value); /* Check arguments. */ if (NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -3101,7 +3101,7 @@ H5Pexist(hid_t id, const char *name) htri_t ret_value; /* return value */ FUNC_ENTER_API(H5Pexist, FAIL); - H5TRACE2("t","is",id,name); + H5TRACE2("t", "is", id, name); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -3254,7 +3254,7 @@ H5Pget_size(hid_t id, const char *name, size_t *size) herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Pget_size, FAIL); - H5TRACE3("e","is*z",id,name,size); + H5TRACE3("e", "is*z", id, name, size); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -3352,7 +3352,7 @@ H5Pget_class(hid_t plist_id) hid_t ret_value=FAIL; /* return value */ FUNC_ENTER_API(H5Pget_class, FAIL); - H5TRACE1("i","i",plist_id); + H5TRACE1("i", "i", plist_id); /* Check arguments. */ if (NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -3490,7 +3490,7 @@ H5Pget_nprops(hid_t id, size_t *nprops) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_nprops, FAIL); - H5TRACE2("e","i*z",id,nprops); + H5TRACE2("e", "i*z", id, nprops); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -3849,7 +3849,7 @@ H5Pequal(hid_t id1, hid_t id2) htri_t ret_value=FALSE; /* return value */ FUNC_ENTER_API(H5Pequal, FAIL); - H5TRACE2("t","ii",id1,id2); + H5TRACE2("t", "ii", id1, id2); /* Check arguments. */ if ((H5I_GENPROP_LST != H5I_get_type(id1) && H5I_GENPROP_CLS != H5I_get_type(id1)) @@ -4003,7 +4003,7 @@ H5Pisa_class(hid_t plist_id, hid_t pclass_id) htri_t ret_value; /* return value */ FUNC_ENTER_API(H5Pisa_class, FAIL); - H5TRACE2("t","ii",plist_id,pclass_id); + H5TRACE2("t", "ii", plist_id, pclass_id); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id)) @@ -4386,7 +4386,7 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data) int ret_value; /* return value */ FUNC_ENTER_API(H5Piterate, FAIL); - H5TRACE4("Is","i*Isxx",id,idx,iter_func,iter_data); + H5TRACE4("Is", "i*Isxx", id, idx, iter_func, iter_data); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -4776,7 +4776,7 @@ H5Pget(hid_t plist_id, const char *name, void *value) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget, FAIL); - H5TRACE3("e","isx",plist_id,name,value); + H5TRACE3("e", "isx", plist_id, name, value); /* Check arguments. */ if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -4959,7 +4959,7 @@ H5Premove(hid_t plist_id, const char *name) herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Premove, FAIL); - H5TRACE2("e","is",plist_id,name); + H5TRACE2("e", "is", plist_id, name); /* Check arguments. */ if (NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -5193,7 +5193,7 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pcopy_prop, FAIL); - H5TRACE3("e","iis",dst_id,src_id,name); + H5TRACE3("e", "iis", dst_id, src_id, name); /* Check arguments. */ if ((H5I_GENPROP_LST != H5I_get_type(src_id) && H5I_GENPROP_CLS != H5I_get_type(src_id)) @@ -5304,7 +5304,7 @@ H5Punregister(hid_t pclass_id, const char *name) herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Punregister, FAIL); - H5TRACE2("e","is",pclass_id,name); + H5TRACE2("e", "is", pclass_id, name); /* Check arguments. */ if (NULL == (pclass = H5I_object_verify(pclass_id, H5I_GENPROP_CLS))) @@ -5510,7 +5510,7 @@ H5Pclose(hid_t plist_id) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pclose, FAIL); - H5TRACE1("e","i",plist_id); + H5TRACE1("e", "i", plist_id); if (plist_id==H5P_DEFAULT) HGOTO_DONE(SUCCEED); @@ -5813,7 +5813,7 @@ H5Pget_class_parent(hid_t pclass_id) hid_t ret_value; /* return value */ FUNC_ENTER_API(H5Pget_class_parent, FAIL); - H5TRACE1("i","i",pclass_id); + H5TRACE1("i", "i", pclass_id); /* Check arguments. */ if (NULL == (pclass = H5I_object_verify(pclass_id, H5I_GENPROP_CLS))) @@ -5899,7 +5899,7 @@ H5Pclose_class(hid_t cls_id) hid_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pclose_class, FAIL); - H5TRACE1("e","i",cls_id); + H5TRACE1("e", "i", cls_id); /* Check arguments */ if (H5I_GENPROP_CLS != H5I_get_type(cls_id)) diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 6df13c0..898700b 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -636,7 +636,7 @@ H5Pset_layout(hid_t plist_id, H5D_layout_t layout) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_layout, FAIL); - H5TRACE2("e","iDl",plist_id,layout); + H5TRACE2("e", "iDl", plist_id, layout); /* Check arguments */ if (layout < 0 || layout >= H5D_NLAYOUTS) @@ -683,7 +683,7 @@ H5Pget_layout(hid_t plist_id) H5D_layout_t ret_value=H5D_LAYOUT_ERROR; FUNC_ENTER_API(H5Pget_layout, H5D_LAYOUT_ERROR); - H5TRACE1("Dl","i",plist_id); + H5TRACE1("Dl", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -731,7 +731,7 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_chunk, FAIL); - H5TRACE3("e","iIs*[a1]h",plist_id,ndims,dim); + H5TRACE3("e", "iIs*[a1]h", plist_id, ndims, dim); /* Check arguments */ if (ndims <= 0) @@ -800,7 +800,7 @@ H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/) int ret_value; FUNC_ENTER_API(H5Pget_chunk, FAIL); - H5TRACE3("Is","iIsx",plist_id,max_ndims,dim); + H5TRACE3("Is", "iIsx", plist_id, max_ndims, dim); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -874,7 +874,7 @@ H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_external, FAIL); - H5TRACE4("e","isoh",plist_id,name,offset,size); + H5TRACE4("e", "isoh", plist_id, name, offset, size); /* Check arguments */ if (!name || !*name) @@ -956,7 +956,7 @@ H5Pget_external_count(hid_t plist_id) int ret_value; /* return value */ FUNC_ENTER_API(H5Pget_external_count, FAIL); - H5TRACE1("Is","i",plist_id); + H5TRACE1("Is", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -1014,7 +1014,7 @@ H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name/*out* herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_external, FAIL); - H5TRACE6("e","iIuzxxx",plist_id,idx,name_size,name,offset,size); + H5TRACE6("e", "iIuzxxx", plist_id, idx, name_size, name, offset, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -1087,7 +1087,7 @@ H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pmodify_filter, FAIL); - H5TRACE5("e","iZfIuz*[a3]Iu",plist_id,filter,flags,cd_nelmts,cd_values); + H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values); /* Check args */ if (filter<0 || filter>H5Z_FILTER_MAX) @@ -1170,7 +1170,7 @@ H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_filter, FAIL); - H5TRACE5("e","iZfIuz*[a3]Iu",plist_id,filter,flags,cd_nelmts,cd_values); + H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values); /* Check args */ if (filter<0 || filter>H5Z_FILTER_MAX) @@ -1233,7 +1233,7 @@ H5Pget_nfilters(hid_t plist_id) int ret_value; /* return value */ FUNC_ENTER_API(H5Pget_nfilters, FAIL); - H5TRACE1("Is","i",plist_id); + H5TRACE1("Is", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -1553,7 +1553,7 @@ H5Pall_filters_avail(hid_t plist_id) hbool_t ret_value = TRUE; /* return value */ FUNC_ENTER_API(H5Pall_filters_avail, UFAIL) - H5TRACE1("t","i",plist_id); + H5TRACE1("t", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -1595,7 +1595,7 @@ H5Premove_filter(hid_t plist_id, H5Z_filter_t filter) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Premove_filter, FAIL) - H5TRACE2("e","iZf",plist_id,filter); + H5TRACE2("e", "iZf", plist_id, filter); /* Get the property list structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -1654,7 +1654,7 @@ H5Pset_deflate(hid_t plist_id, unsigned level) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_deflate, FAIL) - H5TRACE2("e","iIu",plist_id,level); + H5TRACE2("e", "iIu", plist_id, level); /* Check arguments */ if(level>9) @@ -1710,7 +1710,7 @@ H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_szip, FAIL); - H5TRACE3("e","iIuIu",plist_id,options_mask,pixels_per_block); + H5TRACE3("e", "iIuIu", plist_id, options_mask, pixels_per_block); if(H5Zget_filter_info(H5Z_FILTER_SZIP, &config_flags) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't get filter info") @@ -1780,7 +1780,7 @@ H5Pset_shuffle(hid_t plist_id) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_shuffle, FAIL); - H5TRACE1("e","i",plist_id); + H5TRACE1("e", "i", plist_id); /* Check arguments */ if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -1826,7 +1826,7 @@ H5Pset_nbit(hid_t plist_id) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_nbit, FAIL); - H5TRACE1("e","i",plist_id); + H5TRACE1("e", "i", plist_id); /* Check arguments */ if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -1889,7 +1889,7 @@ H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_fac herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_scaleoffset, FAIL); - H5TRACE3("e","iZaIs",plist_id,scale_type,scale_factor); + H5TRACE3("e", "iZaIs", plist_id, scale_type, scale_factor); /* Check arguments */ if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -1949,7 +1949,7 @@ H5Pset_fletcher32(hid_t plist_id) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_fletcher32, FAIL); - H5TRACE1("e","i",plist_id); + H5TRACE1("e", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -2001,7 +2001,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_fill_value, FAIL); - H5TRACE3("e","iix",plist_id,type_id,value); + H5TRACE3("e", "iix", plist_id, type_id, value); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -2075,7 +2075,7 @@ H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/) H5P_genplist_t *plist; /* Property list pointer */ FUNC_ENTER_API(H5Pget_fill_value, FAIL); - H5TRACE3("e","iix",plist_id,type_id,value); + H5TRACE3("e", "iix", plist_id, type_id, value); /* Check arguments */ if (NULL==(type=H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2212,7 +2212,7 @@ H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status) herr_t ret_value = SUCCEED; FUNC_ENTER_API(H5Pfill_value_defined, FAIL); - H5TRACE2("e","i*DF",plist_id,status); + H5TRACE2("e", "i*DF", plist_id, status); assert(status); @@ -2258,7 +2258,7 @@ H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_alloc_time, FAIL); - H5TRACE2("e","iDa",plist_id,alloc_time); + H5TRACE2("e", "iDa", plist_id, alloc_time); /* Get the property list structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -2332,7 +2332,7 @@ H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time/*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_alloc_time, FAIL); - H5TRACE2("e","ix",plist_id,alloc_time); + H5TRACE2("e", "ix", plist_id, alloc_time); /* Get the property list structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) @@ -2370,7 +2370,7 @@ H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_fill_time, FAIL); - H5TRACE2("e","iDf",plist_id,fill_time); + H5TRACE2("e", "iDf", plist_id, fill_time); /* Check arguments */ if(fill_time<H5D_FILL_TIME_ALLOC || fill_time>H5D_FILL_TIME_IFSET) @@ -2412,7 +2412,7 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_fill_time, FAIL); - H5TRACE2("e","ix",plist_id,fill_time); + H5TRACE2("e", "ix", plist_id, fill_time); /* Get the property list structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE))) diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 5296941..393f42d 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -564,7 +564,7 @@ H5Pset_data_transform(hid_t plist_id, const char *expression) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_data_transform, FAIL) - H5TRACE2("e","is",plist_id,expression); + H5TRACE2("e", "is", plist_id, expression); /* Check arguments */ if(expression == NULL) @@ -630,7 +630,7 @@ H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size) ssize_t ret_value; /* return value */ FUNC_ENTER_API(H5Pget_data_transform, FAIL) - H5TRACE3("Zs","ixz",plist_id,expression,size); + H5TRACE3("Zs", "ixz", plist_id, expression, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -698,7 +698,7 @@ H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_buffer, FAIL) - H5TRACE4("e","izxx",plist_id,size,tconv,bkg); + H5TRACE4("e", "izxx", plist_id, size, tconv, bkg); /* Check arguments */ if (size<=0) @@ -745,7 +745,7 @@ H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/) size_t ret_value; /* Return value */ FUNC_ENTER_API(H5Pget_buffer, 0) - H5TRACE3("z","ixx",plist_id,tconv,bkg); + H5TRACE3("z", "ixx", plist_id, tconv, bkg); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -797,7 +797,7 @@ H5Pset_preserve(hid_t plist_id, hbool_t status) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_preserve, FAIL) - H5TRACE2("e","ib",plist_id,status); + H5TRACE2("e", "ib", plist_id, status); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -837,7 +837,7 @@ H5Pget_preserve(hid_t plist_id) int ret_value; /* return value */ FUNC_ENTER_API(H5Pget_preserve, FAIL) - H5TRACE1("Is","i",plist_id); + H5TRACE1("Is", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -879,7 +879,7 @@ H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_edc_check, FAIL) - H5TRACE2("e","iZe",plist_id,check); + H5TRACE2("e", "iZe", plist_id, check); /* Check argument */ if (check != H5Z_ENABLE_EDC && check != H5Z_DISABLE_EDC) @@ -922,7 +922,7 @@ H5Pget_edc_check(hid_t plist_id) H5Z_EDC_t ret_value; /* return value */ FUNC_ENTER_API(H5Pget_edc_check, H5Z_ERROR_EDC) - H5TRACE1("Ze","i",plist_id); + H5TRACE1("Ze", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -965,7 +965,7 @@ H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data) H5Z_cb_t cb_struct; FUNC_ENTER_API(H5Pset_filter_callback, FAIL) - H5TRACE3("e","ixx",plist_id,func,op_data); + H5TRACE3("e", "ixx", plist_id, func, op_data); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -1007,7 +1007,7 @@ H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t op, void *operate_dat H5T_conv_cb_t cb_struct; FUNC_ENTER_API(H5Pset_type_conv_cb, FAIL) - H5TRACE3("e","ixx",plist_id,op,operate_data); + H5TRACE3("e", "ixx", plist_id, op, operate_data); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -1049,7 +1049,7 @@ H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void **operate_d herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_type_conv_cb, FAIL) - H5TRACE3("e","i*xx",plist_id,op,operate_data); + H5TRACE3("e", "i*xx", plist_id, op, operate_data); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -1094,7 +1094,7 @@ H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, double *middle/*out*/, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_btree_ratios, FAIL) - H5TRACE4("e","ixxx",plist_id,left,middle,right); + H5TRACE4("e", "ixxx", plist_id, left, middle, right); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -1148,7 +1148,7 @@ H5Pset_btree_ratios(hid_t plist_id, double left, double middle, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_btree_ratios, FAIL) - H5TRACE4("e","iddd",plist_id,left,middle,right); + H5TRACE4("e", "iddd", plist_id, left, middle, right); /* Check arguments */ if (left<0.0 || left>1.0 || middle<0.0 || middle>1.0 || @@ -1248,7 +1248,7 @@ H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_vlen_mem_manager, FAIL) - H5TRACE5("e","ixxxx",plist_id,alloc_func,alloc_info,free_func,free_info); + H5TRACE5("e", "ixxxx", plist_id, alloc_func, alloc_info, free_func, free_info); /* Check arguments */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -1287,7 +1287,7 @@ H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func/*out*/, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_vlen_mem_manager, FAIL) - H5TRACE5("e","ixxxx",plist_id,alloc_func,alloc_info,free_func,free_info); + H5TRACE5("e", "ixxxx", plist_id, alloc_func, alloc_info, free_func, free_info); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) @@ -1341,7 +1341,7 @@ H5Pset_hyper_vector_size(hid_t plist_id, size_t vector_size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_hyper_vector_size, FAIL) - H5TRACE2("e","iz",plist_id,vector_size); + H5TRACE2("e", "iz", plist_id, vector_size); /* Check arguments */ if (vector_size<1) @@ -1381,7 +1381,7 @@ H5Pget_hyper_vector_size(hid_t plist_id, size_t *vector_size/*out*/) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_hyper_vector_size, FAIL) - H5TRACE2("e","ix",plist_id,vector_size); + H5TRACE2("e", "ix", plist_id, vector_size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 1f88afb..3372905 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -469,7 +469,7 @@ H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_alignment, FAIL); - H5TRACE3("e","ihh",fapl_id,threshold,alignment); + H5TRACE3("e", "ihh", fapl_id, threshold, alignment); /* Check args */ if (alignment<1) @@ -519,7 +519,7 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_alignment, FAIL); - H5TRACE3("e","ixx",fapl_id,threshold,alignment); + H5TRACE3("e", "ixx", fapl_id, threshold, alignment); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) @@ -648,7 +648,7 @@ H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_driver, FAIL); - H5TRACE3("e","iix",plist_id,new_driver_id,new_driver_info); + H5TRACE3("e", "iix", plist_id, new_driver_id, new_driver_info); /* Check arguments */ if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -759,7 +759,7 @@ H5Pget_driver(hid_t plist_id) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Pget_driver, FAIL); - H5TRACE1("i","i",plist_id); + H5TRACE1("i", "i", plist_id); if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list"); @@ -890,7 +890,7 @@ H5Pset_family_offset(hid_t fapl_id, hsize_t offset) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_family_offset, FAIL); - H5TRACE2("e","ih",fapl_id,offset); + H5TRACE2("e", "ih", fapl_id, offset); /* Get the plist structure */ if(H5P_DEFAULT == fapl_id) @@ -967,7 +967,7 @@ H5Pget_family_offset(hid_t fapl_id, hsize_t *offset) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_family_offset, FAIL); - H5TRACE2("e","i*h",fapl_id,offset); + H5TRACE2("e", "i*h", fapl_id, offset); /* Get the plist structure */ if(H5P_DEFAULT == fapl_id) @@ -1044,7 +1044,7 @@ H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_multi_type, FAIL); - H5TRACE2("e","iMt",fapl_id,type); + H5TRACE2("e", "iMt", fapl_id, type); /* Get the plist structure */ if(H5P_DEFAULT == fapl_id) @@ -1121,7 +1121,7 @@ H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_multi_type, FAIL); - H5TRACE2("e","i*Mt",fapl_id,type); + H5TRACE2("e", "i*Mt", fapl_id, type); /* Get the plist structure */ if(H5P_DEFAULT == fapl_id) @@ -1214,7 +1214,8 @@ H5Pset_cache(hid_t plist_id, int UNUSED mdc_nelmts, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_cache, FAIL); - H5TRACE5("e","iIszzd",plist_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0); + H5TRACE5("e", "iIszzd", plist_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, + rdcc_w0); /* Check arguments */ if (rdcc_w0<0.0 || rdcc_w0>1.0) @@ -1273,7 +1274,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_cache, FAIL); - H5TRACE5("e","i*Is*z*z*d",plist_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes, + H5TRACE5("e", "i*Is*z*z*d", plist_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0); /* Get the plist structure */ @@ -1326,7 +1327,7 @@ H5Pset_mdc_config(hid_t plist_id, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_mdc_config, FAIL); - H5TRACE2("e","ix",plist_id,config_ptr); + H5TRACE2("e", "ix", plist_id, config_ptr); /* Get the plist structure */ if( NULL == ( plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS) ) ) { @@ -1390,7 +1391,7 @@ H5Pget_mdc_config(hid_t plist_id, herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_mdc_config, FAIL); - H5TRACE2("e","ix",plist_id,config_ptr); + H5TRACE2("e", "ix", plist_id, config_ptr); /* Get the plist structure */ if ( NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)) ) { @@ -1466,7 +1467,7 @@ H5Pset_gc_references(hid_t plist_id, unsigned gc_ref) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_gc_references, FAIL); - H5TRACE2("e","iIu",plist_id,gc_ref); + H5TRACE2("e", "iIu", plist_id, gc_ref); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1508,7 +1509,7 @@ H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_gc_references, FAIL); - H5TRACE2("e","ix",plist_id,gc_ref); + H5TRACE2("e", "ix", plist_id, gc_ref); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1545,7 +1546,7 @@ H5Pset_fclose_degree(hid_t plist_id, H5F_close_degree_t degree) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_fclose_degree, FAIL) - H5TRACE2("e","iFd",plist_id,degree); + H5TRACE2("e", "iFd", plist_id, degree); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1581,7 +1582,7 @@ H5Pget_fclose_degree(hid_t plist_id, H5F_close_degree_t *degree) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_fclose_degree, FAIL) - H5TRACE2("e","i*Fd",plist_id,degree); + H5TRACE2("e", "i*Fd", plist_id, degree); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -1631,7 +1632,7 @@ H5Pset_meta_block_size(hid_t plist_id, hsize_t size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_meta_block_size, FAIL); - H5TRACE2("e","ih",plist_id,size); + H5TRACE2("e", "ih", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1673,7 +1674,7 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_meta_block_size, FAIL); - H5TRACE2("e","ix",plist_id,size); + H5TRACE2("e", "ix", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1726,7 +1727,7 @@ H5Pset_sieve_buf_size(hid_t plist_id, size_t size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL); - H5TRACE2("e","iz",plist_id,size); + H5TRACE2("e", "iz", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1768,7 +1769,7 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL); - H5TRACE2("e","ix",plist_id,size); + H5TRACE2("e", "ix", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1815,7 +1816,7 @@ H5Pset_small_data_block_size(hid_t plist_id, hsize_t size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_small_data_block_size, FAIL); - H5TRACE2("e","ih",plist_id,size); + H5TRACE2("e", "ih", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1852,7 +1853,7 @@ H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_small_data_block_size, FAIL); - H5TRACE2("e","ix",plist_id,size); + H5TRACE2("e", "ix", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) @@ -1893,7 +1894,7 @@ H5Pset_latest_format(hid_t plist_id, hbool_t latest) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_latest_format, FAIL) - H5TRACE2("e","ib",plist_id,latest); + H5TRACE2("e", "ib", plist_id, latest); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -1928,7 +1929,7 @@ H5Pget_latest_format(hid_t plist_id, hbool_t *latest/*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_latest_format, FAIL) - H5TRACE2("e","ix",plist_id,latest); + H5TRACE2("e", "ix", plist_id, latest); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index 51daa38..4c1db16 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -258,7 +258,7 @@ H5Pget_version(hid_t plist_id, unsigned *super/*out*/, unsigned *freelist/*out*/ herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_version, FAIL); - H5TRACE5("e","ixxxx",plist_id,super,freelist,stab,shhdr); + H5TRACE5("e", "ixxxx", plist_id, super, freelist, stab, shhdr); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -309,7 +309,7 @@ H5Pset_userblock(hid_t plist_id, hsize_t size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_userblock, FAIL); - H5TRACE2("e","ih",plist_id,size); + H5TRACE2("e", "ih", plist_id, size); /* Check that the userblock size is a power of two */ for (i=8; i<8*sizeof(hsize_t); i++) { @@ -361,7 +361,7 @@ H5Pget_userblock(hid_t plist_id, hsize_t *size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_userblock, FAIL); - H5TRACE2("e","i*h",plist_id,size); + H5TRACE2("e", "i*h", plist_id, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -400,7 +400,7 @@ H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_sizes, FAIL); - H5TRACE3("e","izz",plist_id,sizeof_addr,sizeof_size); + H5TRACE3("e", "izz", plist_id, sizeof_addr, sizeof_size); /* Check arguments */ if (sizeof_addr) { @@ -457,7 +457,7 @@ H5Pget_sizes(hid_t plist_id, herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_sizes, FAIL); - H5TRACE3("e","ixx",plist_id,sizeof_addr,sizeof_size); + H5TRACE3("e", "ixx", plist_id, sizeof_addr, sizeof_size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -514,7 +514,7 @@ H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_sym_k, FAIL); - H5TRACE3("e","iIuIu",plist_id,ik,lk); + H5TRACE3("e", "iIuIu", plist_id, ik, lk); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -565,7 +565,7 @@ H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */ , unsigned *lk /*out */ ) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_sym_k, FAIL); - H5TRACE3("e","ixx",plist_id,ik,lk); + H5TRACE3("e", "ixx", plist_id, ik, lk); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -613,7 +613,7 @@ H5Pset_istore_k(hid_t plist_id, unsigned ik) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_istore_k, FAIL); - H5TRACE2("e","iIu",plist_id,ik); + H5TRACE2("e", "iIu", plist_id, ik); /* Check arguments */ if (ik == 0) @@ -664,7 +664,7 @@ H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out */ ) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_istore_k, FAIL) - H5TRACE2("e","ix",plist_id,ik); + H5TRACE2("e", "ix", plist_id, ik); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -719,7 +719,7 @@ H5Pset_shared_mesgs(hid_t plist_id, unsigned nindexes, const unsigned mesg_type_ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_shared_mesgs, FAIL) - H5TRACE3("e","iIu*Iu",plist_id,nindexes,mesg_type_flags); + H5TRACE3("e", "iIu*Iu", plist_id, nindexes, mesg_type_flags); /* Check arguments */ if(nindexes > H5SM_MAX_NUM_INDEXES) @@ -778,7 +778,7 @@ H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_shared_mesg_nindexes, FAIL); - H5TRACE2("e","iIu",plist_id,nindexes); + H5TRACE2("e", "iIu", plist_id, nindexes); /* Check argument */ if (nindexes > H5SM_MAX_NUM_INDEXES) @@ -816,7 +816,7 @@ H5Pget_shared_mesg_nindexes(hid_t plist_id, unsigned *nindexes) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_shared_mesg_nindexes, FAIL) - H5TRACE2("e","i*Iu",plist_id,nindexes); + H5TRACE2("e", "i*Iu", plist_id, nindexes); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) @@ -854,7 +854,7 @@ H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_shared_mesg_index, FAIL) - H5TRACE4("e","iIuIuIu",plist_id,index_num,mesg_type_flags,min_mesg_size); + H5TRACE4("e", "iIuIuIu", plist_id, index_num, mesg_type_flags, min_mesg_size); /* Check arguments */ if(index_num == 0) @@ -919,7 +919,8 @@ H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_shared_mesg_index, FAIL); - H5TRACE4("e","iIu*Iu*Iu",plist_id,index_num,mesg_type_flags,min_mesg_size); + H5TRACE4("e", "iIu*Iu*Iu", plist_id, index_num, mesg_type_flags, + min_mesg_size); /* Check arguments */ if(index_num == 0) @@ -979,7 +980,7 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_ herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_shared_mesg_phase_change, FAIL); - H5TRACE3("e","iIuIu",plist_id,max_list,min_btree); + H5TRACE3("e", "iIuIu", plist_id, max_list, min_btree); /* Check that values are sensible. The min_btree value must be no greater * than the max list plus one. @@ -1033,7 +1034,7 @@ H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list, unsigned *mi herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_shared_mesg_phase_change, FAIL); - H5TRACE3("e","i*Iu*Iu",plist_id,max_list,min_btree); + H5TRACE3("e", "i*Iu*Iu", plist_id, max_list, min_btree); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index b80e8f6..0e8ec9e 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -145,7 +145,7 @@ H5Pset_local_heap_size_hint(hid_t plist_id, size_t size_hint) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_local_heap_size_hint, FAIL) - H5TRACE2("e","iz",plist_id,size_hint); + H5TRACE2("e", "iz", plist_id, size_hint); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE))) @@ -185,7 +185,7 @@ H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_local_heap_size_hint, FAIL) - H5TRACE2("e","ix",plist_id,size_hint); + H5TRACE2("e", "ix", plist_id, size_hint); if(size_hint) { H5P_genplist_t *plist; /* Property list pointer */ @@ -233,7 +233,7 @@ H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_link_phase_change, FAIL) - H5TRACE3("e","iIuIu",plist_id,max_compact,min_dense); + H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense); /* Range check values */ if(max_compact < min_dense) @@ -282,7 +282,7 @@ H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_link_phase_change, FAIL) - H5TRACE3("e","ixx",plist_id,max_compact,min_dense); + H5TRACE3("e", "ixx", plist_id, max_compact, min_dense); /* Get values */ if(max_compact || min_dense) { @@ -335,7 +335,7 @@ H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_est_link_info, FAIL) - H5TRACE3("e","iIuIu",plist_id,est_num_entries,est_name_len); + H5TRACE3("e", "iIuIu", plist_id, est_num_entries, est_name_len); /* Range check values */ if(est_num_entries > 65535) @@ -382,7 +382,7 @@ H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /*out*/, unsigned herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_est_link_info, FAIL) - H5TRACE3("e","ixx",plist_id,est_num_entries,est_name_len); + H5TRACE3("e", "ixx", plist_id, est_num_entries, est_name_len); /* Get values */ if(est_num_entries || est_name_len) { @@ -428,6 +428,7 @@ H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_link_creation_order, FAIL) + H5TRACE2("e", "iIu", plist_id, crt_order_flags); /* Check for bad combination of flags */ if(!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED)) @@ -482,6 +483,7 @@ H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_link_creation_order, FAIL) + H5TRACE2("e", "ix", plist_id, crt_order_flags); /* Get values */ if(crt_order_flags) { diff --git a/src/H5Plapl.c b/src/H5Plapl.c index 737b793..5467b3f 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -249,7 +249,7 @@ H5Pset_nlinks(hid_t plist_id, size_t nlinks) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_nlinks, FAIL) - H5TRACE2("e","iz",plist_id,nlinks); + H5TRACE2("e", "iz", plist_id, nlinks); if(nlinks <= 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "number of links must be positive"); @@ -290,7 +290,7 @@ H5Pget_nlinks(hid_t plist_id, size_t *nlinks) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_nlinks, FAIL) - H5TRACE2("e","i*z",plist_id,nlinks); + H5TRACE2("e", "i*z", plist_id, nlinks); if(!nlinks) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer passed in"); @@ -330,7 +330,7 @@ H5Pset_elink_prefix(hid_t plist_id, const char *prefix) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_elink_prefix, FAIL) - H5TRACE2("e","is",plist_id,prefix); + H5TRACE2("e", "is", plist_id, prefix); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS))) @@ -381,7 +381,7 @@ H5Pget_elink_prefix(hid_t plist_id, char *prefix, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Pget_elink_prefix, FAIL) - H5TRACE3("Zs","isz",plist_id,prefix,size); + H5TRACE3("Zs", "isz", plist_id, prefix, size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS))) diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c index bdbfd84..5a4f5e4 100644 --- a/src/H5Plcpl.c +++ b/src/H5Plcpl.c @@ -148,7 +148,7 @@ H5Pset_create_intermediate_group(hid_t plist_id, unsigned crt_intmd_group) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_create_intermediate_group, FAIL); - H5TRACE2("e","iIu",plist_id,crt_intmd_group); + H5TRACE2("e", "iIu", plist_id, crt_intmd_group); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE))) @@ -183,7 +183,7 @@ H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_intmd_group /*out herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_create_intermediate_group, FAIL); - H5TRACE2("e","ix",plist_id,crt_intmd_group); + H5TRACE2("e", "ix", plist_id, crt_intmd_group); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE))) diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index 671c85c..ee62df1 100755 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -165,7 +165,7 @@ H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_attr_phase_change, FAIL) - H5TRACE3("e","iIuIu",plist_id,max_compact,min_dense); + H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense); /* Range check values */ if(max_compact < min_dense) @@ -209,7 +209,7 @@ H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_de herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pget_attr_phase_change, FAIL) - H5TRACE3("e","i*Iu*Iu",plist_id,max_compact,min_dense); + H5TRACE3("e", "i*Iu*Iu", plist_id, max_compact, min_dense); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c index 2ee5882..05368dd 100755 --- a/src/H5Pocpypl.c +++ b/src/H5Pocpypl.c @@ -154,7 +154,7 @@ H5Pset_copy_object(hid_t plist_id, unsigned cpy_option) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_copy_object, FAIL) - H5TRACE2("e","iIu",plist_id,cpy_option); + H5TRACE2("e", "iIu", plist_id, cpy_option); /* Check parameters */ if(cpy_option & ~H5O_COPY_ALL) @@ -192,7 +192,7 @@ H5Pget_copy_object(hid_t plist_id, unsigned *cpy_option /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_copy_object, FAIL) - H5TRACE2("e","ix",plist_id,cpy_option); + H5TRACE2("e", "ix", plist_id, cpy_option); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY))) diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c index f45c267..dfe8c5d 100644 --- a/src/H5Pstrcpl.c +++ b/src/H5Pstrcpl.c @@ -146,7 +146,7 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding) herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_char_encoding, FAIL); - H5TRACE2("e","iTc",plist_id,encoding); + H5TRACE2("e", "iTc", plist_id, encoding); /* Check arguments */ if (encoding <= H5T_CSET_ERROR || encoding >= H5T_NCSET) @@ -183,7 +183,7 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_char_encoding, FAIL); - H5TRACE2("e","ix",plist_id,encoding); + H5TRACE2("e", "ix", plist_id, encoding); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_STRING_CREATE))) @@ -287,7 +287,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Rcreate, FAIL) - H5TRACE5("e","xisRti",ref,loc_id,name,ref_type,space_id); + H5TRACE5("e", "xisRti", ref, loc_id, name, ref_type, space_id); /* Check args */ if(ref == NULL) @@ -493,7 +493,7 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, const void *_ref) hid_t ret_value; FUNC_ENTER_API(H5Rdereference, FAIL) - H5TRACE3("i","iRtx",id,ref_type,_ref); + H5TRACE3("i", "iRtx", id, ref_type, _ref); /* Check args */ if(H5G_loc(id, &loc) < 0) @@ -616,7 +616,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref) hid_t ret_value; FUNC_ENTER_API(H5Rget_region, FAIL) - H5TRACE3("i","iRtx",id,ref_type,ref); + H5TRACE3("i", "iRtx", id, ref_type, ref); /* Check args */ if(H5G_loc(id, &loc) < 0) @@ -763,7 +763,7 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, const void *ref) H5G_obj_t ret_value; FUNC_ENTER_API(H5Rget_obj_type, H5G_UNKNOWN) - H5TRACE3("Go","iRtx",id,ref_type,ref); + H5TRACE3("Go", "iRtx", id, ref_type, ref); /* Check args */ if(H5G_loc(id, &loc) < 0) @@ -921,7 +921,7 @@ H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name, ssize_t ret_value; /* Return value */ FUNC_ENTER_API(H5Rget_name, FAIL) - H5TRACE5("Zs","iRtxsz",id,ref_type,_ref,name,size); + H5TRACE5("Zs", "iRtxsz", id, ref_type, _ref, name, size); /* Check args */ if(H5G_loc(id, &loc) < 0) @@ -366,7 +366,7 @@ H5Screate(H5S_class_t type) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Screate, FAIL); - H5TRACE1("i","Sc",type); + H5TRACE1("i", "Sc", type); /* Check args */ if(type<=H5S_NO_CLASS || type> H5S_NULL) /* don't allow complex dataspace yet */ @@ -482,7 +482,7 @@ H5Sclose(hid_t space_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Sclose, FAIL); - H5TRACE1("e","i",space_id); + H5TRACE1("e", "i", space_id); /* Check args */ if (NULL == H5I_object_verify(space_id,H5I_DATASPACE)) @@ -521,7 +521,7 @@ H5Scopy(hid_t space_id) hid_t ret_value; FUNC_ENTER_API(H5Scopy, FAIL); - H5TRACE1("i","i",space_id); + H5TRACE1("i", "i", space_id); /* Check args */ if (NULL==(src=H5I_object_verify(space_id, H5I_DATASPACE))) @@ -567,7 +567,7 @@ H5Sextent_copy(hid_t dst_id,hid_t src_id) hid_t ret_value = SUCCEED; FUNC_ENTER_API(H5Sextent_copy, FAIL); - H5TRACE2("e","ii",dst_id,src_id); + H5TRACE2("e", "ii", dst_id, src_id); /* Check args */ if (NULL==(src=H5I_object_verify(src_id, H5I_DATASPACE))) @@ -760,7 +760,7 @@ H5Sget_simple_extent_npoints(hid_t space_id) hssize_t ret_value; FUNC_ENTER_API(H5Sget_simple_extent_npoints, FAIL); - H5TRACE1("Hs","i",space_id); + H5TRACE1("Hs", "i", space_id); /* Check args */ if (NULL == (ds = H5I_object_verify(space_id, H5I_DATASPACE))) @@ -864,7 +864,7 @@ H5Sget_simple_extent_ndims(hid_t space_id) int ret_value; FUNC_ENTER_API(H5Sget_simple_extent_ndims, FAIL); - H5TRACE1("Is","i",space_id); + H5TRACE1("Is", "i", space_id); /* Check args */ if (NULL == (ds = H5I_object_verify(space_id, H5I_DATASPACE))) @@ -955,7 +955,7 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/, int ret_value; FUNC_ENTER_API(H5Sget_simple_extent_dims, FAIL); - H5TRACE3("Is","ixx",space_id,dims,maxdims); + H5TRACE3("Is", "ixx", space_id, dims, maxdims); /* Check args */ if (NULL == (ds = H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1219,7 +1219,7 @@ H5Sis_simple(hid_t space_id) htri_t ret_value; FUNC_ENTER_API(H5Sis_simple, FAIL); - H5TRACE1("t","i",space_id); + H5TRACE1("t", "i", space_id); /* Check args and all the boring stuff. */ if ((space = H5I_object_verify(space_id,H5I_DATASPACE)) == NULL) @@ -1270,7 +1270,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/], herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Sset_extent_simple, FAIL); - H5TRACE4("e","iIs*[a1]h*[a1]h",space_id,rank,dims,max); + H5TRACE4("e", "iIs*[a1]h*[a1]h", space_id, rank, dims, max); /* Check args */ if ((space = H5I_object_verify(space_id,H5I_DATASPACE)) == NULL) @@ -1577,7 +1577,7 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/], int i; FUNC_ENTER_API(H5Screate_simple, FAIL); - H5TRACE3("i","Is*[a0]h*[a0]h",rank,dims,maxdims); + H5TRACE3("i", "Is*[a0]h*[a0]h", rank, dims, maxdims); /* Check arguments */ if (rank<0) @@ -1684,7 +1684,7 @@ H5Sencode(hid_t obj_id, void *buf, size_t *nalloc) herr_t ret_value=SUCCEED; FUNC_ENTER_API (H5Sencode, FAIL); - H5TRACE3("e","ix*z",obj_id,buf,nalloc); + H5TRACE3("e", "ix*z", obj_id, buf, nalloc); /* Check argument and retrieve object */ if (NULL==(dspace=H5I_object_verify(obj_id, H5I_DATASPACE))) @@ -1797,7 +1797,7 @@ H5Sdecode(const void *buf) hid_t ret_value; FUNC_ENTER_API (H5Sdecode, FAIL) - H5TRACE1("i","x",buf); + H5TRACE1("i", "x", buf); if(buf == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer") @@ -1982,7 +1982,7 @@ H5Sget_simple_extent_type(hid_t sid) H5S_t *space; FUNC_ENTER_API(H5Sget_simple_extent_type, H5S_NO_CLASS); - H5TRACE1("Sc","i",sid); + H5TRACE1("Sc", "i", sid); /* Check arguments */ if (NULL == (space = H5I_object_verify(sid, H5I_DATASPACE))) @@ -2016,7 +2016,7 @@ H5Sset_extent_none(hid_t space_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Sset_extent_none, FAIL); - H5TRACE1("e","i",space_id); + H5TRACE1("e", "i", space_id); /* Check args */ if (NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE))) @@ -2056,7 +2056,7 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Soffset_simple, FAIL); - H5TRACE2("e","i*Hs",space_id,offset); + H5TRACE2("e", "i*Hs", space_id, offset); /* Check args */ if (NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE))) @@ -2218,7 +2218,7 @@ H5Sextent_equal(hid_t space1_id, hid_t space2_id) htri_t ret_value; FUNC_ENTER_API(H5Sextent_equal, FAIL) - H5TRACE2("t","ii",space1_id,space2_id); + H5TRACE2("t", "ii", space1_id, space2_id); /* check args */ if(NULL == (ds1 = H5I_object_verify(space1_id, H5I_DATASPACE)) || diff --git a/src/H5Shyper.c b/src/H5Shyper.c index f1b3f37..529d9cb 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -1862,7 +1862,7 @@ H5Sget_select_hyper_nblocks(hid_t spaceid) hssize_t ret_value; /* return value */ FUNC_ENTER_API(H5Sget_select_hyper_nblocks, FAIL); - H5TRACE1("Hs","i",spaceid); + H5TRACE1("Hs", "i", spaceid); /* Check args */ if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -2539,7 +2539,7 @@ H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numbloc herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Sget_select_hyper_blocklist, FAIL); - H5TRACE4("e","ihh*h",spaceid,startblock,numblocks,buf); + H5TRACE4("e", "ihh*h", spaceid, startblock, numblocks, buf); /* Check args */ if(buf==NULL) @@ -6114,7 +6114,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Sselect_hyperslab, FAIL); - H5TRACE6("e","iSs*h*h*h*h",space_id,op,start,stride,count,block); + H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block); /* Check args */ if (NULL == (space=H5I_object_verify(space_id, H5I_DATASPACE))) @@ -6709,7 +6709,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Sselect_hyperslab, FAIL); - H5TRACE6("e","iSs*h*h*h*h",space_id,op,start,stride,count,block); + H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block); /* Check args */ if (NULL == (space=H5I_object_verify(space_id, H5I_DATASPACE))) @@ -6778,7 +6778,7 @@ H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], hid_t ret_value; FUNC_ENTER_API(H5Scombine_hyperslab, FAIL); - H5TRACE6("i","iSs*h*h*h*h",space_id,op,start,stride,count,block); + H5TRACE6("i", "iSs*h*h*h*h", space_id, op, start, stride, count, block); /* Check args */ if (NULL == (space=H5I_object_verify(space_id, H5I_DATASPACE))) @@ -6903,7 +6903,7 @@ H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id) hid_t ret_value; FUNC_ENTER_API(H5Scombine_select, FAIL); - H5TRACE3("i","iSsi",space1_id,op,space2_id); + H5TRACE3("i", "iSsi", space1_id, op, space2_id); /* Check args */ if (NULL == (space1=H5I_object_verify(space1_id, H5I_DATASPACE))) @@ -7028,7 +7028,7 @@ H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Sselect_select, FAIL); - H5TRACE3("e","iSsi",space1_id,op,space2_id); + H5TRACE3("e", "iSsi", space1_id, op, space2_id); /* Check args */ if (NULL == (space1=H5I_object_verify(space1_id, H5I_DATASPACE))) diff --git a/src/H5Spoint.c b/src/H5Spoint.c index a394e20..136436a 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -696,7 +696,7 @@ H5Sget_select_elem_npoints(hid_t spaceid) hssize_t ret_value; /* return value */ FUNC_ENTER_API(H5Sget_select_elem_npoints, FAIL); - H5TRACE1("Hs","i",spaceid); + H5TRACE1("Hs", "i", spaceid); /* Check args */ if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -988,7 +988,7 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoint herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Sget_select_elem_pointlist, FAIL); - H5TRACE4("e","ihh*h",spaceid,startpoint,numpoints,buf); + H5TRACE4("e", "ihh*h", spaceid, startpoint, numpoints, buf); /* Check args */ if(buf==NULL) @@ -1231,7 +1231,7 @@ H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem, herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Sselect_elements, FAIL); - H5TRACE4("e","iSsz**h",spaceid,op,num_elem,coord); + H5TRACE4("e", "iSsz**h", spaceid, op, num_elem, coord); /* Check args */ if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) diff --git a/src/H5Sselect.c b/src/H5Sselect.c index a12339b..a2f5f84 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -292,7 +292,7 @@ H5Sget_select_npoints(hid_t spaceid) hssize_t ret_value; /* return value */ FUNC_ENTER_API(H5Sget_select_npoints, FAIL); - H5TRACE1("Hs","i",spaceid); + H5TRACE1("Hs", "i", spaceid); /* Check args */ if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -364,7 +364,7 @@ H5Sselect_valid(hid_t spaceid) htri_t ret_value; /* return value */ FUNC_ENTER_API(H5Sselect_valid, 0); - H5TRACE1("t","i",spaceid); + H5TRACE1("t", "i", spaceid); /* Check args */ if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -515,7 +515,7 @@ H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end) herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Sget_select_bounds, FAIL); - H5TRACE3("e","i*h*h",spaceid,start,end); + H5TRACE3("e", "i*h*h", spaceid, start, end); /* Check args */ if(start==NULL || end==NULL) @@ -1185,7 +1185,7 @@ H5Sget_select_type(hid_t space_id) H5S_sel_type ret_value; /* Return value */ FUNC_ENTER_API(H5Sget_select_type, H5S_SEL_ERROR); - H5TRACE1("St","i",space_id); + H5TRACE1("St", "i", space_id); /* Check args */ if (NULL == (space = H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1586,7 +1586,7 @@ H5Tcreate(H5T_class_t type, size_t size) hid_t ret_value; FUNC_ENTER_API(H5Tcreate, FAIL); - H5TRACE2("i","Ttz",type,size); + H5TRACE2("i", "Ttz", type, size); /* check args */ if (size == 0) @@ -1638,7 +1638,7 @@ H5Tcopy(hid_t type_id) hid_t ret_value; FUNC_ENTER_API(H5Tcopy, FAIL); - H5TRACE1("i","i",type_id); + H5TRACE1("i", "i", type_id); switch (H5I_get_type (type_id)) { case H5I_DATATYPE: @@ -1698,7 +1698,7 @@ H5Tclose(hid_t type_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tclose, FAIL); - H5TRACE1("e","i",type_id); + H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -1741,7 +1741,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id) htri_t ret_value; FUNC_ENTER_API(H5Tequal, FAIL); - H5TRACE2("t","ii",type1_id,type2_id); + H5TRACE2("t", "ii", type1_id, type2_id); /* check args */ if (NULL == (dt1 = H5I_object_verify(type1_id,H5I_DATATYPE)) || @@ -1786,7 +1786,7 @@ H5Tlock(hid_t type_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tlock, FAIL); - H5TRACE1("e","i",type_id); + H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -1826,7 +1826,7 @@ H5Tget_class(hid_t type_id) H5T_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5Tget_class, H5T_NO_CLASS); - H5TRACE1("Tt","i",type_id); + H5TRACE1("Tt", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -1910,7 +1910,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls) htri_t ret_value; /* Return value */ FUNC_ENTER_API(H5Tdetect_class, FAIL); - H5TRACE2("t","iTt",type,cls); + H5TRACE2("t", "iTt", type, cls); /* Check args */ if (NULL == (dt = H5I_object_verify(type,H5I_DATATYPE))) @@ -2012,7 +2012,7 @@ H5Tis_variable_str(hid_t dtype_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(H5Tis_variable_str, FAIL); - H5TRACE1("t","i",dtype_id); + H5TRACE1("t", "i", dtype_id); /* Check args */ if (NULL == (dt = H5I_object_verify(dtype_id,H5I_DATATYPE))) @@ -2051,7 +2051,7 @@ H5Tget_size(hid_t type_id) size_t ret_value; FUNC_ENTER_API(H5Tget_size, 0); - H5TRACE1("z","i",type_id); + H5TRACE1("z", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -2100,7 +2100,7 @@ H5Tset_size(hid_t type_id, size_t size) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_size, FAIL); - H5TRACE2("e","iz",type_id,size); + H5TRACE2("e", "iz", type_id, size); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -2151,7 +2151,7 @@ H5Tget_super(hid_t type) hid_t ret_value; FUNC_ENTER_API(H5Tget_super, FAIL); - H5TRACE1("i","i",type); + H5TRACE1("i", "i", type); if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type"); @@ -2407,7 +2407,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, herr_t ret_value=SUCCEED; /*return value */ FUNC_ENTER_API(H5Tregister, FAIL); - H5TRACE5("e","Tesiix",pers,name,src_id,dst_id,func); + H5TRACE5("e", "Tesiix", pers, name, src_id, dst_id, func); /* Check args */ if (H5T_PERS_HARD!=pers && H5T_PERS_SOFT!=pers) @@ -2556,7 +2556,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tunregister, FAIL); - H5TRACE5("e","Tesiix",pers,name,src_id,dst_id,func); + H5TRACE5("e", "Tesiix", pers, name, src_id, dst_id, func); /* Check arguments */ if (src_id>0 && (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)))) @@ -2600,7 +2600,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata) H5T_path_t *path = NULL; FUNC_ENTER_API(H5Tfind, NULL); - H5TRACE3("x","iix",src_id,dst_id,pcdata); + H5TRACE3("x", "iix", src_id, dst_id, pcdata); /* Check args */ if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) || @@ -2650,7 +2650,7 @@ H5Tcompiler_conv(hid_t src_id, hid_t dst_id) H5T_t *src = NULL, *dst = NULL; FUNC_ENTER_API(H5Tcompiler_conv, FAIL) - H5TRACE2("t","ii",src_id,dst_id); + H5TRACE2("t", "ii", src_id, dst_id); /* Check args */ if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) || @@ -2702,7 +2702,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tconvert, FAIL); - H5TRACE6("e","iizxxi",src_id,dst_id,nelmts,buf,background,dxpl_id); + H5TRACE6("e", "iizxxi", src_id, dst_id, nelmts, buf, background, dxpl_id); /* Check args */ if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) || @@ -2751,7 +2751,7 @@ H5Tencode(hid_t obj_id, void *buf, size_t *nalloc) herr_t ret_value = SUCCEED; FUNC_ENTER_API (H5Tencode, FAIL) - H5TRACE3("e","ix*z",obj_id,buf,nalloc); + H5TRACE3("e", "ix*z", obj_id, buf, nalloc); /* Check argument and retrieve object */ if(NULL == (dtype = H5I_object_verify(obj_id, H5I_DATATYPE))) @@ -2791,7 +2791,7 @@ H5Tdecode(const void *buf) hid_t ret_value; FUNC_ENTER_API (H5Tdecode, FAIL); - H5TRACE1("i","x",buf); + H5TRACE1("i", "x", buf); if(buf == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer") diff --git a/src/H5Tarray.c b/src/H5Tarray.c index c353264..adc71ee 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -80,7 +80,7 @@ H5Tarray_create(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */], hid_t ret_value; /* return value */ FUNC_ENTER_API(H5Tarray_create, FAIL) - H5TRACE4("i","iIu*h*Is",base_id,ndims,dim,perm); + H5TRACE4("i", "iIu*h*Is", base_id, ndims, dim, perm); /* Check args */ if(ndims < 1 || ndims > H5S_MAX_RANK) @@ -188,7 +188,7 @@ H5Tget_array_ndims(hid_t type_id) int ret_value; /* return value */ FUNC_ENTER_API(H5Tget_array_ndims, FAIL) - H5TRACE1("Is","i",type_id); + H5TRACE1("Is", "i", type_id); /* Check args */ if(NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -251,7 +251,7 @@ H5Tget_array_dims(hid_t type_id, hsize_t dims[], int UNUSED perm[]) int ret_value; /* return value */ FUNC_ENTER_API(H5Tget_array_dims, FAIL) - H5TRACE3("Is","i*h*Is",type_id,dims,perm); + H5TRACE3("Is", "i*h*Is", type_id, dims, perm); /* Check args */ if(NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 58d274c..7415342 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -90,7 +90,7 @@ H5Tcommit(hid_t loc_id, const char *name, hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tcommit, FAIL) - H5TRACE3("e","isi",loc_id,name,type_id); + H5TRACE3("e", "isi", loc_id, name, type_id); /* Check arguments */ if(H5G_loc(loc_id, &loc) < 0) @@ -183,7 +183,7 @@ H5Tcommit_expand(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tcommit_expand, FAIL) - H5TRACE4("e","iiii",loc_id,type_id,tcpl_id,tapl_id); + H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id); /* Check arguments */ if(H5G_loc (loc_id, &loc) < 0) @@ -348,7 +348,7 @@ H5Tcommitted(hid_t type_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(H5Tcommitted, FAIL) - H5TRACE1("t","i",type_id); + H5TRACE1("t", "i", type_id); /* Check arguments */ if(NULL == (type = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -449,7 +449,7 @@ H5Topen(hid_t loc_id, const char *name) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Topen, FAIL) - H5TRACE2("i","is",loc_id,name); + H5TRACE2("i", "is", loc_id, name); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -526,7 +526,7 @@ H5Topen_expand(hid_t loc_id, const char *name, hid_t tapl_id) hid_t ret_value = FAIL; FUNC_ENTER_API(H5Topen_expand, FAIL) - H5TRACE3("i","isi",loc_id,name,tapl_id); + H5TRACE3("i", "isi", loc_id, name, tapl_id); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) @@ -608,7 +608,7 @@ H5Tget_create_plist(hid_t dtype_id) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Tget_create_plist, FAIL) - H5TRACE1("i","i",dtype_id); + H5TRACE1("i", "i", dtype_id); /* Check arguments */ if(NULL == (type = H5I_object_verify(dtype_id, H5I_DATATYPE))) diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index 62681ce..f69fc3f 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -85,7 +85,7 @@ H5Tget_member_offset(hid_t type_id, unsigned membno) size_t ret_value; FUNC_ENTER_API(H5Tget_member_offset, 0) - H5TRACE2("z","iIu",type_id,membno); + H5TRACE2("z", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type) @@ -162,7 +162,7 @@ H5Tget_member_class(hid_t type_id, unsigned membno) H5T_class_t ret_value; FUNC_ENTER_API(H5Tget_member_class, H5T_NO_CLASS) - H5TRACE2("Tt","iIu",type_id,membno); + H5TRACE2("Tt", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type) @@ -210,7 +210,7 @@ H5Tget_member_type(hid_t type_id, unsigned membno) hid_t ret_value; FUNC_ENTER_API(H5Tget_member_type, FAIL) - H5TRACE2("i","iIu",type_id,membno); + H5TRACE2("i", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type) @@ -336,7 +336,7 @@ H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tinsert, FAIL) - H5TRACE4("e","iszi",parent_id,name,offset,member_id); + H5TRACE4("e", "iszi", parent_id, name, offset, member_id); /* Check args */ if (parent_id==member_id) @@ -381,7 +381,7 @@ H5Tpack(hid_t type_id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tpack, FAIL) - H5TRACE1("e","i",type_id); + H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)) || H5T_detect_class(dt,H5T_COMPOUND)<=0) diff --git a/src/H5Tcset.c b/src/H5Tcset.c index bc687ac..13a3118 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -78,7 +78,7 @@ H5Tget_cset(hid_t type_id) H5T_cset_t ret_value; FUNC_ENTER_API(H5Tget_cset, H5T_CSET_ERROR) - H5TRACE1("Tc","i",type_id); + H5TRACE1("Tc", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -124,7 +124,7 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_cset, FAIL) - H5TRACE2("e","iTc",type_id,cset); + H5TRACE2("e", "iTc", type_id, cset); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tenum.c b/src/H5Tenum.c index 6d45e57..94dc82f 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -83,7 +83,7 @@ H5Tenum_create(hid_t parent_id) hid_t ret_value; /*return value */ FUNC_ENTER_API(H5Tenum_create, FAIL) - H5TRACE1("i","i",parent_id); + H5TRACE1("i", "i", parent_id); /* Check args */ if (NULL==(parent=H5I_object_verify(parent_id,H5I_DATATYPE)) || H5T_INTEGER!=parent->shared->type) @@ -169,7 +169,7 @@ H5Tenum_insert(hid_t type, const char *name, const void *value) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tenum_insert, FAIL) - H5TRACE3("e","isx",type,name,value); + H5TRACE3("e", "isx", type, name, value); /* Check args */ if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE))) @@ -279,7 +279,7 @@ H5Tget_member_value(hid_t type, unsigned membno, void *value/*out*/) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tget_member_value, FAIL) - H5TRACE3("e","iIux",type,membno,value); + H5TRACE3("e", "iIux", type, membno, value); if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type") @@ -362,7 +362,7 @@ H5Tenum_nameof(hid_t type, const void *value, char *name/*out*/, size_t size) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tenum_nameof, FAIL) - H5TRACE4("e","ixxz",type,value,name,size); + H5TRACE4("e", "ixxz", type, value, name, size); /* Check args */ if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE))) @@ -502,7 +502,7 @@ H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tenum_valueof, FAIL) - H5TRACE3("e","isx",type,name,value); + H5TRACE3("e", "isx", type, name, value); /* Check args */ if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE))) diff --git a/src/H5Tfields.c b/src/H5Tfields.c index a453e57..4001f25 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -79,7 +79,7 @@ H5Tget_nmembers(hid_t type_id) int ret_value; FUNC_ENTER_API(H5Tget_nmembers, FAIL) - H5TRACE1("Is","i",type_id); + H5TRACE1("Is", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -251,7 +251,7 @@ H5Tget_member_index(hid_t type_id, const char *name) unsigned i; FUNC_ENTER_API(H5Tget_member_index, FAIL) - H5TRACE2("Is","is",type_id,name); + H5TRACE2("Is", "is", type_id, name); /* Check arguments */ assert(name); diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c index 1d0817e..b43ea39 100644 --- a/src/H5Tfixed.c +++ b/src/H5Tfixed.c @@ -75,7 +75,7 @@ H5Tget_sign(hid_t type_id) H5T_sign_t ret_value; FUNC_ENTER_API(H5Tget_sign, H5T_SGN_ERROR) - H5TRACE1("Ts","i",type_id); + H5TRACE1("Ts", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -154,7 +154,7 @@ H5Tset_sign(hid_t type_id, H5T_sign_t sign) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_sign, FAIL) - H5TRACE2("e","iTs",type_id,sign); + H5TRACE2("e", "iTs", type_id, sign); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c index e216606..429c272 100644 --- a/src/H5Tfloat.c +++ b/src/H5Tfloat.c @@ -83,7 +83,7 @@ H5Tget_fields(hid_t type_id, size_t *spos/*out*/, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tget_fields, FAIL) - H5TRACE6("e","ixxxxx",type_id,spos,epos,esize,mpos,msize); + H5TRACE6("e", "ixxxxx", type_id, spos, epos, esize, mpos, msize); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -135,7 +135,7 @@ H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_fields, FAIL) - H5TRACE6("e","izzzzz",type_id,spos,epos,esize,mpos,msize); + H5TRACE6("e", "izzzzz", type_id, spos, epos, esize, mpos, msize); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -198,7 +198,7 @@ H5Tget_ebias(hid_t type_id) size_t ret_value; FUNC_ENTER_API(H5Tget_ebias, 0) - H5TRACE1("z","i",type_id); + H5TRACE1("z", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -239,7 +239,7 @@ H5Tset_ebias(hid_t type_id, size_t ebias) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_ebias, FAIL) - H5TRACE2("e","iz",type_id,ebias); + H5TRACE2("e", "iz", type_id, ebias); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -285,7 +285,7 @@ H5Tget_norm(hid_t type_id) H5T_norm_t ret_value; FUNC_ENTER_API(H5Tget_norm, H5T_NORM_ERROR) - H5TRACE1("Tn","i",type_id); + H5TRACE1("Tn", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -327,7 +327,7 @@ H5Tset_norm(hid_t type_id, H5T_norm_t norm) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_norm, FAIL) - H5TRACE2("e","iTn",type_id,norm); + H5TRACE2("e", "iTn", type_id, norm); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -377,7 +377,7 @@ H5Tget_inpad(hid_t type_id) H5T_pad_t ret_value; FUNC_ENTER_API(H5Tget_inpad, H5T_PAD_ERROR) - H5TRACE1("Tp","i",type_id); + H5TRACE1("Tp", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -421,7 +421,7 @@ H5Tset_inpad(hid_t type_id, H5T_pad_t pad) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_inpad, FAIL) - H5TRACE2("e","iTp",type_id,pad); + H5TRACE2("e", "iTp", type_id, pad); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 13dbae1..f70a076 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -104,7 +104,7 @@ H5Tget_native_type(hid_t type_id, H5T_direction_t direction) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5Tget_native_type, FAIL) - H5TRACE2("i","iTd",type_id,direction); + H5TRACE2("i", "iTd", type_id, direction); /* check argument */ if(NULL==(dt=H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Toffset.c b/src/H5Toffset.c index 8cf278f..af6f140 100644 --- a/src/H5Toffset.c +++ b/src/H5Toffset.c @@ -95,7 +95,7 @@ H5Tget_offset(hid_t type_id) int ret_value; FUNC_ENTER_API(H5Tget_offset, -1) - H5TRACE1("Is","i",type_id); + H5TRACE1("Is", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -159,7 +159,7 @@ H5Tset_offset(hid_t type_id, size_t offset) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_offset, FAIL) - H5TRACE2("e","iz",type_id,offset); + H5TRACE2("e", "iz", type_id, offset); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Topaque.c b/src/H5Topaque.c index eb14d58..0a3d4d9 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -73,7 +73,7 @@ H5Tset_tag(hid_t type_id, const char *tag) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_tag, FAIL) - H5TRACE2("e","is",type_id,tag); + H5TRACE2("e", "is", type_id, tag); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Torder.c b/src/H5Torder.c index 0628609..3ec11ad 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -76,7 +76,7 @@ H5Tget_order(hid_t type_id) H5T_order_t ret_value; FUNC_ENTER_API(H5Tget_order, H5T_ORDER_ERROR) - H5TRACE1("To","i",type_id); + H5TRACE1("To", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -117,7 +117,7 @@ H5Tset_order(hid_t type_id, H5T_order_t order) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_order, FAIL) - H5TRACE2("e","iTo",type_id,order); + H5TRACE2("e", "iTo", type_id, order); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tpad.c b/src/H5Tpad.c index 96d456a..3a6ee3c 100644 --- a/src/H5Tpad.c +++ b/src/H5Tpad.c @@ -76,7 +76,7 @@ H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tget_pad, FAIL) - H5TRACE3("e","ixx",type_id,lsb,msb); + H5TRACE3("e", "ixx", type_id, lsb, msb); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -120,7 +120,7 @@ H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_pad, FAIL) - H5TRACE3("e","iTpTp",type_id,lsb,msb); + H5TRACE3("e", "iTpTp", type_id, lsb, msb); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c index 0a132c0..09dcc81 100644 --- a/src/H5Tprecis.c +++ b/src/H5Tprecis.c @@ -83,7 +83,7 @@ H5Tget_precision(hid_t type_id) size_t ret_value; FUNC_ENTER_API(H5Tget_precision, 0) - H5TRACE1("z","i",type_id); + H5TRACE1("z", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -137,7 +137,7 @@ H5Tset_precision(hid_t type_id, size_t prec) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_precision, FAIL) - H5TRACE2("e","iz",type_id,prec); + H5TRACE2("e", "iz", type_id, prec); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c index 2c9b7d6..fff8c45 100644 --- a/src/H5Tstrpad.c +++ b/src/H5Tstrpad.c @@ -79,7 +79,7 @@ H5Tget_strpad(hid_t type_id) H5T_str_t ret_value; FUNC_ENTER_API(H5Tget_strpad, H5T_STR_ERROR) - H5TRACE1("Tz","i",type_id); + H5TRACE1("Tz", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) @@ -136,7 +136,7 @@ H5Tset_strpad(hid_t type_id, H5T_str_t strpad) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Tset_strpad, FAIL) - H5TRACE2("e","iTz",type_id,strpad); + H5TRACE2("e", "iTz", type_id, strpad); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 95d0e21..4ad454e 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -111,7 +111,7 @@ H5Tvlen_create(hid_t base_id) hid_t ret_value; /*return value */ FUNC_ENTER_API(H5Tvlen_create, FAIL) - H5TRACE1("i","i",base_id); + H5TRACE1("i", "i", base_id); /* Check args */ if (NULL==(base=H5I_object_verify(base_id,H5I_DATATYPE))) @@ -223,7 +223,7 @@ H5Zregister(const H5Z_class_t *cls) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Zregister, FAIL) - H5TRACE1("e","Zc",cls); + H5TRACE1("e", "Zc", cls); /* Check args */ if (cls==NULL) @@ -341,7 +341,7 @@ H5Zunregister(H5Z_filter_t id) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5Zunregister, FAIL) - H5TRACE1("e","Zf",id); + H5TRACE1("e", "Zf", id); /* Check args */ if (id<0 || id>H5Z_FILTER_MAX) @@ -426,7 +426,7 @@ H5Zfilter_avail(H5Z_filter_t id) htri_t ret_value=FALSE; /* Return value */ FUNC_ENTER_API(H5Zfilter_avail, FAIL) - H5TRACE1("t","Zf",id); + H5TRACE1("t", "Zf", id); /* Check args */ if(id<0 || id>H5Z_FILTER_MAX) diff --git a/src/Makefile.in b/src/Makefile.in index d6910be..9221d38 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -81,30 +81,31 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libhdf5_la_LIBADD = am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \ - H5timer.lo H5trace.lo H5A.lo H5Abtree2.lo H5Adense.lo H5Adeprec.lo H5AC.lo H5B.lo H5Bcache.lo \ - H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo H5B2stat.lo \ - H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dcompact.lo H5Dcontig.lo \ - H5Defl.lo H5Dio.lo H5Distore.lo H5Dmpio.lo H5Doh.lo \ - H5Dselect.lo H5Dtest.lo H5E.lo H5F.lo H5Fdbg.lo H5Ffake.lo \ - H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5FD.lo H5FDcore.lo \ - H5FDdirect.lo H5FDfamily.lo H5FDlog.lo H5FDmpi.lo H5FDmpio.lo \ - H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDstdio.lo \ - H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo \ - H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo H5Gdense.lo \ - H5Gdeprec.lo H5Gent.lo H5Glink.lo H5Gloc.lo H5Gname.lo \ - H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo H5Gtest.lo \ - H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo H5HFdbg.lo \ - H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \ + H5timer.lo H5trace.lo H5A.lo H5Abtree2.lo H5Adense.lo \ + H5Adeprec.lo H5AC.lo H5B.lo H5Bcache.lo H5B2.lo H5B2cache.lo \ + H5B2dbg.lo H5B2int.lo H5B2stat.lo H5B2test.lo H5C.lo H5CS.lo \ + H5D.lo H5Dcompact.lo H5Dcontig.lo H5Defl.lo H5Dio.lo \ + H5Distore.lo H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo \ + H5E.lo H5F.lo H5Fdbg.lo H5Ffake.lo H5Fmount.lo H5Fsfile.lo \ + H5Fsuper.lo H5FD.lo H5FDcore.lo H5FDdirect.lo H5FDfamily.lo \ + H5FDlog.lo H5FDmpi.lo H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo \ + H5FDsec2.lo H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo \ + H5FScache.lo H5FSdbg.lo H5FSsection.lo H5G.lo H5Gbtree2.lo \ + H5Gcompact.lo H5Gdense.lo H5Gdeprec.lo H5Gent.lo H5Glink.lo \ + H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo \ + H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo \ + H5HFdbg.lo H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \ H5HFiblock.lo H5HFiter.lo H5HFman.lo H5HFsection.lo \ H5HFspace.lo H5HFstat.lo H5HFtest.lo H5HFtiny.lo H5HG.lo \ H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5MF.lo H5MM.lo \ H5MP.lo H5MPtest.lo H5L.lo H5Lexternal.lo H5O.lo H5Oalloc.lo \ - H5Oattr.lo H5Oattribute.lo H5Obogus.lo H5Ocache.lo H5Ocont.lo H5Ocopy.lo \ - H5Odbg.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo \ - H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omessage.lo H5Omtime.lo H5Oname.lo \ - H5Onull.lo H5Opline.lo H5Osdspace.lo H5Oshared.lo H5Ostab.lo H5Otest.lo \ - H5P.lo H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \ - H5Pfmpl.lo H5Pgcpl.lo H5Plapl.lo H5Plcpl.lo H5Pocpl.lo H5Pocpypl.lo \ + H5Oattr.lo H5Oattribute.lo H5Obogus.lo H5Ocache.lo H5Ocont.lo \ + H5Ocopy.lo H5Odbg.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo \ + H5Oginfo.lo H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omessage.lo \ + H5Omtime.lo H5Oname.lo H5Onull.lo H5Opline.lo H5Osdspace.lo \ + H5Oshared.lo H5Ostab.lo H5Otest.lo H5P.lo H5Pacpl.lo \ + H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo H5Pfmpl.lo \ + H5Pgcpl.lo H5Plapl.lo H5Plcpl.lo H5Pocpl.lo H5Pocpypl.lo \ H5Pstrcpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo H5S.lo \ H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo \ H5Sselect.lo H5Stest.lo H5SL.lo H5SM.lo H5SMbtree2.lo \ @@ -418,10 +419,12 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ H5Ocont.c H5Ocopy.c H5Odbg.c H5Odtype.c H5Oefl.c H5Ofill.c H5Oginfo.c \ H5Olayout.c \ H5Olinfo.c H5Olink.c H5Omessage.c H5Omtime.c \ - H5Oname.c H5Onull.c H5Opline.c H5Osdspace.c H5Oshared.c H5Ostab.c H5Otest.c \ + H5Oname.c H5Onull.c H5Opline.c H5Osdspace.c H5Oshared.c H5Ostab.c \ + H5Otest.c \ H5P.c H5Pacpl.c H5Pdcpl.c H5Pdxpl.c H5Pfapl.c H5Pfcpl.c H5Pfmpl.c \ H5Pgcpl.c \ - H5Plapl.c H5Plcpl.c H5Pocpl.c H5Pocpypl.c H5Pstrcpl.c H5Ptest.c H5R.c H5RC.c \ + H5Plapl.c H5Plcpl.c H5Pocpl.c H5Pocpypl.c H5Pstrcpl.c H5Ptest.c \ + H5R.c H5RC.c \ H5RS.c H5S.c H5Sall.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c \ H5Sselect.c H5Stest.c H5SL.c H5SM.c H5SMbtree2.c \ H5SMcache.c H5ST.c H5T.c H5Tarray.c H5Tbit.c H5Tcommit.c \ @@ -565,10 +568,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5A.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Abtree2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adense.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adeprec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2cache.Plo@am__quote@ |