mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2128 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop

Browse Source 
* commit '1d5bf068224df9582dfc2280525352967a02367b':
  Fix 2010 compile issues
This commit is contained in:
Allen Byrne 2019-12-11 14:11:48 -06:00
commit 5d94490e38
2 changed files with 621 additions and 621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1168
src/H5Dchunk.c
View File

File diff suppressed because it is too large Load Diff

74
src/H5Rint.c
View File

@ -135,7 +135,7 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
/* Flag indicating "top" of interface has been initialized */
static hbool_t H5R_top_package_initialize_s = FALSE;
/*--------------------------------------------------------------------------
NAME
H5R__init_package -- Initialize interface-specific information
@ -162,7 +162,7 @@ H5R__init_package(void)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5R__init_package() */
/*--------------------------------------------------------------------------
NAME
H5R_top_term_package
@ -184,7 +184,7 @@ H5R__init_package(void)
int
H5R_top_term_package(void)
{
int n = 0;
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOERR
@ -196,7 +196,7 @@ H5R_top_term_package(void)
FUNC_LEAVE_NOAPI(n)
} /* end H5R_top_term_package() */
/*--------------------------------------------------------------------------
NAME
H5R_term_package
@ -220,7 +220,7 @@ H5R_top_term_package(void)
int
H5R_term_package(void)
{
int n = 0;
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOERR
@ -236,7 +236,7 @@ H5R_term_package(void)
FUNC_LEAVE_NOAPI(n)
} /* end H5R_term_package() */
/*-------------------------------------------------------------------------
* Function: H5R__create_object
*
@ -277,7 +277,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__create_object() */
/*-------------------------------------------------------------------------
* Function: H5R__create_region
*
@ -328,7 +328,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5R__create_region */
/*-------------------------------------------------------------------------
* Function: H5R__create_attr
*
@ -379,7 +379,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5R__create_attr */
/*-------------------------------------------------------------------------
* Function: H5R__destroy
*
@ -431,7 +431,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__destroy() */
/*-------------------------------------------------------------------------
* Function: H5R__set_loc_id
*
@ -464,7 +464,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__set_loc_id() */
/*-------------------------------------------------------------------------
* Function: H5R__get_loc_id
*
@ -488,7 +488,7 @@ H5R__get_loc_id(const H5R_ref_priv_t *ref)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__get_loc_id() */
/*-------------------------------------------------------------------------
* Function: H5R__reopen_file
*
@ -552,7 +552,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__reopen_file() */
/*-------------------------------------------------------------------------
* Function: H5R__get_type
*
@ -575,7 +575,7 @@ H5R__get_type(const H5R_ref_priv_t *ref)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__get_type() */
/*-------------------------------------------------------------------------
* Function: H5R__equal
*
@ -640,7 +640,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__equal() */
/*-------------------------------------------------------------------------
* Function: H5R__copy
*
@ -705,7 +705,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__copy() */
/*-------------------------------------------------------------------------
* Function: H5R__get_obj_token
*
@ -738,7 +738,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__get_obj_token() */
/*-------------------------------------------------------------------------
* Function: H5R__set_obj_token
*
@ -767,7 +767,7 @@ H5R__set_obj_token(H5R_ref_priv_t *ref, const H5VL_token_t *obj_token,
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__set_obj_token() */
/*-------------------------------------------------------------------------
* Function: H5R__get_region
*
@ -798,7 +798,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__get_region() */
/*-------------------------------------------------------------------------
* Function: H5R__get_file_name
*
@ -840,7 +840,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__get_file_name() */
/*-------------------------------------------------------------------------
* Function: H5R__get_attr_name
*
@ -878,7 +878,7 @@ H5R__get_attr_name(const H5R_ref_priv_t *ref, char *buf, size_t size)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__get_attr_name() */
/*-------------------------------------------------------------------------
* Function: H5R__encode
*
@ -973,7 +973,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__encode() */
/*-------------------------------------------------------------------------
* Function: H5R__decode
*
@ -1065,7 +1065,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__decode() */
/*-------------------------------------------------------------------------
* Function: H5R__encode_obj_token
*
@ -1100,7 +1100,7 @@ H5R__encode_obj_token(const H5VL_token_t *obj_token, size_t token_size,
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__encode_obj_token() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_obj_token
*
@ -1142,7 +1142,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__decode_obj_token() */
/*-------------------------------------------------------------------------
* Function: H5R__encode_region
*
@ -1170,8 +1170,8 @@ H5R__encode_region(H5S_t *space, unsigned char *buf, size_t *nalloc)
/* Don't encode if buffer size isn't big enough or buffer is empty */
if(buf && *nalloc >= ((size_t)buf_size + 2 * H5_SIZEOF_UINT32_T)) {
p = (uint8_t *)buf;
int rank;
p = (uint8_t *)buf;
/* Encode the size for safety check */
UINT32ENCODE(p, (uint32_t)buf_size);
@ -1191,7 +1191,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__encode_region() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_region
*
@ -1247,7 +1247,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__decode_region() */
/*-------------------------------------------------------------------------
* Function: H5R__encode_string
*
@ -1289,7 +1289,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__encode_string() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_string
*
@ -1336,7 +1336,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__decode_string() */
/*-------------------------------------------------------------------------
* Function: H5R__encode_heap
*
@ -1377,7 +1377,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__encode_heap() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_heap
*
@ -1424,7 +1424,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__decode_heap() */
/*-------------------------------------------------------------------------
* Function: H5R__free_heap
*
@ -1469,7 +1469,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__free_heap() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_token_compat
*
@ -1527,7 +1527,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__decode_token_compat() */
/*-------------------------------------------------------------------------
* Function: H5R__encode_token_obj_compat
*
@ -1558,7 +1558,7 @@ H5R__encode_token_obj_compat(const H5VL_token_t *obj_token, size_t token_size,
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5R__encode_token_obj_compat() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_token_obj_compat
*
@ -1593,7 +1593,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5R__decode_token_obj_compat() */
/*-------------------------------------------------------------------------
* Function: H5R__encode_token_region_compat
*
@ -1668,7 +1668,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5R__encode_token_region_compat() */
/*-------------------------------------------------------------------------
* Function: H5R__decode_token_region_compat
*