mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r25450] Description:

Browse Source 
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)
This commit is contained in:
Quincey Koziol 2014-07-21 11:05:04 -05:00
parent 4344c1d70b
commit 61a411b02f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/trace
View File

@ -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",

7
src/H5Fefc.c
View File

@ -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;

4
src/H5Ipublic.h
View File

@ -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 */

1
test/links.c
View File

@ -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;