diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-21 16:05:04 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-21 16:05:04 (GMT) |
| commit | 61a411b02f6de8a9cccd573695fb3e5c859874b8 (patch) | |
| tree | 28c820b5c4f2bfb073ef67d0ea4815a7325ecb4f | |
| parent | 4344c1d70b35fec74ca32eaa8c5588e179e86fa5 (diff) | |
| download | hdf5-61a411b02f6de8a9cccd573695fb3e5c859874b8.zip hdf5-61a411b02f6de8a9cccd573695fb3e5c859874b8.tar.gz hdf5-61a411b02f6de8a9cccd573695fb3e5c859874b8.tar.bz2 | |
[svn-r25450] Description:
Initial tweaks to align with VOL branch.
Tested on:
Mac OSX/64 10.9.3 (amazon) w/gcc 4.9
(h5committest not required, too small)
| -rwxr-xr-x | bin/trace | 2 | ||||
| -rw-r--r-- | src/H5Fefc.c | 7 | ||||
| -rw-r--r-- | src/H5Ipublic.h | 4 | ||||
| -rw-r--r-- | test/links.c | 1 |
4 files changed, 7 insertions, 7 deletions
@@ -77,6 +77,7 @@ $Source = ""; "hobj_ref_t" => "r", "H5R_type_t" => "Rt", "char" => "s", + "unsigned char" => "s", "H5S_class_t" => "Sc", "H5S_seloper_t" => "Ss", "H5S_sel_type" => "St", @@ -141,6 +142,7 @@ $Source = ""; "H5T_conv_except_func_t" => "x", "H5Z_func_t" => "x", "H5Z_filter_func_t" => "x", + "va_list" => "x", "size_t" => "z", "H5Z_SO_scale_type_t" => "Za", "H5Z_class_t" => "Zc", diff --git a/src/H5Fefc.c b/src/H5Fefc.c index 08d27a1..9916002 100644 --- a/src/H5Fefc.c +++ b/src/H5Fefc.c @@ -36,7 +36,6 @@ #include "H5MMprivate.h" /* Memory management */ #include "H5Pprivate.h" /* Property lists */ - /* Special values for the "tag" field below */ #define H5F_EFC_TAG_DEFAULT -1 #define H5F_EFC_TAG_LOCK -2 @@ -164,7 +163,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, * on the state of the efc. */ if(!efc) { if(NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id, - dxpl_id))) + dxpl_id))) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file") /* Increment the number of open objects to prevent the file from being @@ -237,7 +236,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, else { /* Cannot cache file, just open file and return */ if(NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id, - dxpl_id))) + dxpl_id))) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file") /* Increment the number of open objects to prevent the file from @@ -259,7 +258,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, /* Open the file */ if(NULL == (ent->file = H5F_open(name, flags, fcpl_id, fapl_id, - dxpl_id))) + dxpl_id))) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file") open_file = TRUE; diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h index d630556..5160434 100644 --- a/src/H5Ipublic.h +++ b/src/H5Ipublic.h @@ -36,8 +36,8 @@ typedef enum H5I_type_t { H5I_UNINIT = (-2), /*uninitialized type */ H5I_BADID = (-1), /*invalid Type */ - H5I_FILE = 1, /*type ID for File objects */ - H5I_GROUP, /*type ID for Group objects */ + H5I_FILE = 1, /*type ID for File objects */ + H5I_GROUP, /*type ID for Group objects */ H5I_DATATYPE, /*type ID for Datatype objects */ H5I_DATASPACE, /*type ID for Dataspace objects */ H5I_DATASET, /*type ID for Dataset objects */ diff --git a/test/links.c b/test/links.c index d3ca5e4..53c62d4 100644 --- a/test/links.c +++ b/test/links.c @@ -6307,7 +6307,6 @@ external_link_strong(hid_t fapl, hbool_t new_format) if(H5Gclose(gid2) < 0) TEST_ERROR if(H5Fclose(fid2) < 0) TEST_ERROR - PASSED(); return 0; |