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

Develop clang 13 format (#1933)

Browse Source 
* Update format source to clang 13

* More format changes
This commit is contained in:
Allen Byrne 2022-07-26 16:45:46 -05:00 committed by GitHub
parent 213eac2588
commit ae414872f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
685 changed files with 6988 additions and 6963 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/clang-format-check.yml vendored
View File

@ -8,11 +8,11 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip-ci')"
steps:
- uses: actions/checkout@v2
- name: Run clang-format style check for C and java programs.
uses: DoozyX/clang-format-lint-action@v0.11
- name: Run clang-format style check for C and Java programs.
uses: DoozyX/clang-format-lint-action@v0.13
with:
source: '.'
extensions: 'c,h,cpp,hpp,java'
clangFormatVersion: 10
clangFormatVersion: 13
style: file
exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h'

4
.github/workflows/clang-format-fix.yml vendored
View File

@ -10,11 +10,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run clang-format style check for C and Java programs.
uses: DoozyX/clang-format-lint-action@v0.11
uses: DoozyX/clang-format-lint-action@v0.13
with:
source: '.'
extensions: 'c,h,cpp,hpp,java'
clangFormatVersion: 10
clangFormatVersion: 13
inplace: True
style: file
exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h'

2
c++/examples/h5group.cpp
View File

@ -70,7 +70,7 @@ main(void)
dims[1] = 20;
cdims[0] = 20;
cdims[1] = 20;
DataSpace * dataspace = new DataSpace(RANK, dims); // create new dspace
DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
DSetCreatPropList ds_creatplist; // create dataset creation prop list
ds_creatplist.setChunk(2, cdims); // then modify it for compression
ds_creatplist.setDeflate(6);

2
c++/src/H5Attribute.cpp
View File

@ -517,7 +517,7 @@ Attribute::p_read_fixed_len(const DataType &mem_type, H5std_string &strg) const
// If there is data, allocate buffer and read it.
if (attr_size > 0) {
char * strg_C = new char[attr_size + 1];
char *strg_C = new char[attr_size + 1];
herr_t ret_value = H5Aread(id, mem_type.getId(), strg_C);
if (ret_value < 0) {
delete[] strg_C; // de-allocate for fixed-len string

8
c++/src/H5DataSet.h
View File

@ -78,20 +78,20 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
// The memory and file dataspaces and the transferring property list
// can be defaults.
void read(void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
const DataSpace & file_space = DataSpace::ALL,
const DataSpace &file_space = DataSpace::ALL,
const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
void read(H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
const DataSpace & file_space = DataSpace::ALL,
const DataSpace &file_space = DataSpace::ALL,
const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
// Writes the buffered data to this dataset.
// The memory and file dataspaces and the transferring property list
// can be defaults.
void write(const void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
const DataSpace & file_space = DataSpace::ALL,
const DataSpace &file_space = DataSpace::ALL,
const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
void write(const H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL,
const DataSpace & file_space = DataSpace::ALL,
const DataSpace &file_space = DataSpace::ALL,
const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const;
// Iterates the selected elements in the specified dataspace - not implemented in C++ style yet

4
c++/src/H5Exception.h
View File

@ -41,9 +41,9 @@ class H5_DLLCPP Exception {
// Returns the detailed message set at the time the exception is thrown
H5std_string getDetailMsg() const;
const char * getCDetailMsg() const; // C string of detailed message
const char *getCDetailMsg() const; // C string of detailed message
H5std_string getFuncName() const; // function name as a string object
const char * getCFuncName() const; // function name as a char string
const char *getCFuncName() const; // function name as a char string
// Turns on the automatic error printing.
static void setAutoPrint(H5E_auto2_t &func, void *client_data);

8
c++/src/H5File.h
View File

@ -27,10 +27,10 @@ class H5_DLLCPP H5File : public Group {
// Creates or opens an HDF5 file.
H5File(const char *name, unsigned int flags,
const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT,
const FileAccPropList & access_plist = FileAccPropList::DEFAULT);
const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
H5File(const H5std_string &name, unsigned int flags,
const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT,
const FileAccPropList & access_plist = FileAccPropList::DEFAULT);
const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
// Open the file
void openFile(const H5std_string &name, unsigned int flags,
@ -77,9 +77,9 @@ class H5_DLLCPP H5File : public Group {
static bool isHdf5(const H5std_string &name);
// Determines if a file, specified by its name, can be accessed as HDF5
static bool isAccessible(const char * name,
static bool isAccessible(const char *name,
const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
static bool isAccessible(const H5std_string & name,
static bool isAccessible(const H5std_string &name,
const FileAccPropList &access_plist = FileAccPropList::DEFAULT);
// Reopens this file.

2
c++/src/H5Location.cpp
View File

@ -1817,7 +1817,7 @@ H5std_string
H5Location::getLinkval(const char *name, size_t size) const
{
H5L_info2_t linkinfo;
char * value_C; // value in C string
char *value_C; // value in C string
size_t val_size = size;
H5std_string value;
herr_t ret_value;

38
c++/src/H5Location.h
View File

@ -108,11 +108,11 @@ class H5_DLLCPP H5Location : public IdComponent {
// Creates a new dataset in this location.
DataSet createDataSet(const char *name, const DataType &data_type, const DataSpace &data_space,
const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT,
const DSetAccPropList & dapl = DSetAccPropList::DEFAULT,
const DSetAccPropList &dapl = DSetAccPropList::DEFAULT,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT) const;
DataSet createDataSet(const H5std_string &name, const DataType &data_type, const DataSpace &data_space,
const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT,
const DSetAccPropList & dapl = DSetAccPropList::DEFAULT,
const DSetAccPropList &dapl = DSetAccPropList::DEFAULT,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT) const;
// Deprecated to add LinkCreatPropList and DSetAccPropList - 1.10.3
@ -124,12 +124,12 @@ class H5_DLLCPP H5Location : public IdComponent {
// Opens an existing dataset at this location.
// DSetAccPropList is added - 1.10.3
DataSet openDataSet(const char *name, const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const;
DataSet openDataSet(const H5std_string & name,
DataSet openDataSet(const H5std_string &name,
const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const;
H5L_info2_t getLinkInfo(const char * link_name,
H5L_info2_t getLinkInfo(const char *link_name,
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
H5L_info2_t getLinkInfo(const H5std_string & link_name,
H5L_info2_t getLinkInfo(const H5std_string &link_name,
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Returns the value of a symbolic link.
@ -216,26 +216,26 @@ class H5_DLLCPP H5Location : public IdComponent {
// Creates a soft link from link_name to target_name.
void link(const char *target_name, const char *link_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void link(const H5std_string &target_name, const H5std_string &link_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Creates a hard link from new_name to curr_name.
void link(const char *curr_name, const Group &new_loc, const char *new_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void link(const H5std_string &curr_name, const Group &new_loc, const H5std_string &new_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Creates a hard link from new_name to curr_name in same location.
void link(const char *curr_name, const hid_t same_loc, const char *new_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void link(const H5std_string &curr_name, const hid_t same_loc, const H5std_string &new_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Creates a link of the specified type from new_name to current_name;
// both names are interpreted relative to the specified location id.
@ -258,34 +258,34 @@ class H5_DLLCPP H5Location : public IdComponent {
// Copies a link from a group to another.
void copyLink(const char *src_name, const Group &dst, const char *dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void copyLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Makes a copy of a link in the same group.
void copyLink(const char *src_name, const char *dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void copyLink(const H5std_string &src_name, const H5std_string &dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Renames a link in this group and moves to a new location.
void moveLink(const char *src_name, const Group &dst, const char *dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void moveLink(const H5std_string &src_name, const Group &dst, const H5std_string &dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Renames a link in this group.
void moveLink(const char *src_name, const char *dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
void moveLink(const H5std_string &src_name, const H5std_string &dst_name,
const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const;
const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const;
// Renames an object at this location.
// Deprecated due to inadequate functionality.

8
c++/src/H5Object.h
View File

@ -50,16 +50,16 @@ typedef int (*visit_operator_t)(H5Object &obj, const H5std_string attr_name, con
class UserData4Aiterate {
public:
attr_operator_t op;
void * opData;
H5Object * location; // Consider changing to H5Location
void *opData;
H5Object *location; // Consider changing to H5Location
};
// User data for visit iteration
class UserData4Visit {
public:
visit_operator_t op;
void * opData;
H5Object * obj;
void *opData;
H5Object *obj;
};
class H5_DLLCPP H5Object : public H5Location {

2
c++/test/dsets.cpp
View File

@ -455,7 +455,7 @@ test_compression(H5File &file)
}
}
char * tconv_buf = new char[1000];
char *tconv_buf = new char[1000];
DataSet *dataset = NULL;
try {
const hsize_t size[2] = {100, 200};

4
c++/test/tattr.cpp
View File

@ -297,7 +297,7 @@ test_attr_getname()
// 1. With arbitrary buf_size that is larger than the name size
size_t buf_size = FATTR1_NAME.length() + 10;
char * fattr1_name = new char[buf_size + 1];
char *fattr1_name = new char[buf_size + 1];
HDmemset(fattr1_name, 0, buf_size + 1);
ssize_t name_size = 0; // actual length of attribute name
name_size = fattr1.getName(fattr1_name, buf_size + 1);
@ -1585,7 +1585,7 @@ test_string_attr()
// Read and verify the attribute string as a string of chars; buffer
// is dynamically allocated.
size_t attr_size = gr_flattr1.getInMemDataSize();
char * fl_dyn_string_att_check;
char *fl_dyn_string_att_check;
fl_dyn_string_att_check = new char[attr_size + 1];
gr_flattr1.read(fls_type, fl_dyn_string_att_check);
if (HDstrcmp(fl_dyn_string_att_check, ATTRSTR_DATA.c_str()) != 0)

26
c++/test/tcompound.cpp
View File

@ -89,13 +89,13 @@ test_compound_2()
int e, d, c[4], b, a;
} dst_typ_t;
src_typ_t * s_ptr;
dst_typ_t * d_ptr;
src_typ_t *s_ptr;
dst_typ_t *d_ptr;
const int nelmts = NTESTELEM;
const hsize_t four = 4;
int i;
unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
ArrayType * array_dt = NULL;
ArrayType *array_dt = NULL;
// Output message about test being performed
SUBTEST("Compound Element Reordering");
@ -202,13 +202,13 @@ test_compound_3()
int a, c[4], e;
} dst_typ_t;
src_typ_t * s_ptr;
dst_typ_t * d_ptr;
src_typ_t *s_ptr;
dst_typ_t *d_ptr;
int i;
const int nelmts = NTESTELEM;
const hsize_t four = 4;
unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
ArrayType * array_dt = NULL;
ArrayType *array_dt = NULL;
// Output message about test being performed
SUBTEST("Compound Datatype Subset Conversions");
@ -317,13 +317,13 @@ test_compound_4()
int e;
} dst_typ_t;
src_typ_t * s_ptr;
dst_typ_t * d_ptr;
src_typ_t *s_ptr;
dst_typ_t *d_ptr;
int i;
const int nelmts = NTESTELEM;
const hsize_t four = 4;
unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;
ArrayType * array_dt = NULL;
ArrayType *array_dt = NULL;
// Output message about test being performed
SUBTEST("Compound Element Shrinking & Reordering");
@ -440,8 +440,8 @@ test_compound_5()
hsize_t dims[1] = {4};
src_typ_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}};
dst_typ_t *dst;
void * buf = HDcalloc(2, sizeof(dst_typ_t));
void * bkg = HDcalloc(2, sizeof(dst_typ_t));
void *buf = HDcalloc(2, sizeof(dst_typ_t));
void *bkg = HDcalloc(2, sizeof(dst_typ_t));
ArrayType *array_dt = NULL;
// Output message about test being performed
@ -530,8 +530,8 @@ test_compound_6()
long d;
} dst_typ_t;
src_typ_t * s_ptr;
dst_typ_t * d_ptr;
src_typ_t *s_ptr;
dst_typ_t *d_ptr;
int i;
const int nelmts = NTESTELEM;
unsigned char *buf = NULL, *orig = NULL, *bkg = NULL;

2
c++/test/tdspl.cpp
View File

@ -61,7 +61,7 @@ test_transfplist()
// Find out the length of the transform expression, allocate the buffer
// for it, then read and verify the expression from the copied plist
size_t tran_len = static_cast<size_t>(dxpl_c_to_f_copy.getDataTransform(NULL));
char * c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1));
char *c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1));
HDmemset(c_to_f_read, 0, tran_len + 1);
dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1);
verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f),

2
c++/test/titerate.cpp
View File

@ -136,7 +136,7 @@ test_iter_group(FileAccPropList &fapl)
{
hsize_t idx; /* Index in the group */
char name[NAMELEN]; /* temporary name buffer */
char * lnames[NDATASETS + 2]; /* Names of the links created */
char *lnames[NDATASETS + 2]; /* Names of the links created */
iter_info info; /* Custom iteration information */
herr_t ret; /* Generic return value */

2
c++/test/tlinks.cpp
View File

@ -642,7 +642,7 @@ test_visit(hid_t fapl_id, hbool_t new_format)
dims[1] = 2;
cdims[0] = 2;
cdims[1] = 2;
DataSpace * dataspace = new DataSpace(RANK, dims); // create new dspace
DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
DSetCreatPropList ds_creatplist; // create dataset creation prop list
ds_creatplist.setChunk(2, cdims); // then modify it for compression
ds_creatplist.setDeflate(6);

4
c++/test/ttypes.cpp
View File

@ -644,7 +644,7 @@ test_named()
{
static hsize_t ds_size[2] = {10, 20};
unsigned attr_data[10][20];
DataType * ds_type = NULL;
DataType *ds_type = NULL;
SUBTEST("Named datatypes");
try {
@ -974,7 +974,7 @@ test_encode_decode()
verify_val(inttyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__);
// Create an IntType instance from the decoded pointer and verify it
IntType * decoded_int_ptr(static_cast<IntType *>(inttyp.decode()));
IntType *decoded_int_ptr(static_cast<IntType *>(inttyp.decode()));
H5T_sign_t int_sign = decoded_int_ptr->getSign();
verify_val(static_cast<long>(int_sign), static_cast<long>(H5T_SGN_NONE), "DataType::decode", __LINE__,
__FILE__);

10
c++/test/tvlstr.cpp
View File

@ -285,7 +285,7 @@ test_vlstring_array_dataset()
// Create and write another dataset.
DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space));
char * wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char)));
char *wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char)));
HDmemset(wdata2, 'A', 65533);
dataset2.write(&wdata2, vlst);
@ -334,7 +334,7 @@ test_vlstrings_special()
{
const char *wdata[SPACE1_DIM1] = {"one", "two", "", "four"};
const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL};
char * rdata[SPACE1_DIM1]; // Information read in
char *rdata[SPACE1_DIM1]; // Information read in
// Output message about test being performed.
SUBTEST("Special VL Strings");
@ -396,7 +396,7 @@ test_vlstrings_special()
// Create the property list and set the fill value for the second
// dataset.
DSetCreatPropList dcpl;
char * fill = NULL; // Fill value
char *fill = NULL; // Fill value
dcpl.setFillValue(vlst, &fill);
dataset = file1.createDataSet("Dataset4", vlst, sid1, dcpl);
@ -627,7 +627,7 @@ test_compact_vlstring()
*
*-------------------------------------------------------------------------
*/
static char * string_att_write = NULL;
static char *string_att_write = NULL;
const H5std_string ATTRSTR_NAME("String_attr");
const H5std_string ATTRSTR_DATA("String Attribute");
@ -860,7 +860,7 @@ write_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, ch
static void
read_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, char *data)
{
char * data_read;
char *data_read;
DataSet dset;
try {
dset = file.openDataSet(name);

6
doxygen/examples/H5DO_examples.c
View File

@ -9,7 +9,7 @@
:
size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int);
const Bytef *z_src = (const Bytef *)(direct_buf);
Bytef * z_dst; /* Destination buffer */
Bytef *z_dst; /* Destination buffer */
uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size);
uLong z_src_nbytes = (uLong)buf_size;
int aggression = 9; /* Compression aggression setting */
@ -103,14 +103,14 @@ size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int);
:
size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int);
const Bytef *z_src = (const Bytef *)(direct_buf);
Bytef * z_dst; /* Destination buffer */
Bytef *z_dst; /* Destination buffer */
uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size);
uLong z_src_nbytes = (uLong)buf_size;
int aggression = 9; /* Compression aggression setting */
uint32_t filter_mask = 0;
size_t buf_size = CHUNK_NX * CHUNK_NY * sizeof(int);
/* For H5DOread_chunk() */
void * readbuf = NULL; /* Buffer for reading data */
void *readbuf = NULL; /* Buffer for reading data */
const Bytef *pt_readbuf; /* Point to the buffer for data read */
hsize_t read_chunk_nbytes; /* Size of chunk on disk */
int read_dst_buf[CHUNK_NX][CHUNK_NY]; /* Buffer to hold un-compressed data */

2
doxygen/examples/H5D_examples.c
View File

@ -20,7 +20,7 @@ herr_t
H5Ovisit_cb(hid_t obj, const char *name, const H5O_info2_t *info, void *op_data)
{
herr_t retval = 0;
char * base_path = (char *)op_data;
char *base_path = (char *)op_data;
if (info->type == H5O_TYPE_DATASET) // current object is a dataset
{

2
doxygen/examples/H5I_examples.c
View File

@ -129,7 +129,7 @@ fail_dcpl:;
{
__label__ fail_id, fail_obj, fail_register;
H5I_type_t type;
int * obj;
int *obj;
hid_t obj_id;
// register a new ID type

2
doxygen/examples/H5Pget_object_flush_cb.c
View File

@ -1,7 +1,7 @@
hid_t fapl_id;
unsigned counter;
H5F_object_flush_t *ret_cb;
unsigned * ret_counter;
unsigned *ret_counter;
/* Create a copy of the file access property list */
fapl_id = H5Pcreate(H5P_FILE_ACCESS);

4
examples/h5_attribute.c
View File

@ -192,7 +192,7 @@ main(void)
ret = H5Oget_info3(dataset, &oinfo, H5O_INFO_NUM_ATTRS);
for (i = 0; i < (unsigned)oinfo.num_attrs; i++) {
attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, H5P_DEFAULT,
H5P_DEFAULT);
H5P_DEFAULT);
atype = H5Aget_type(attr);
type_class = H5Tget_class(atype);
if (type_class == H5T_STRING) {
@ -232,7 +232,7 @@ attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata)
herr_t ret;
int i;
size_t npoints; /* Number of elements in the array attribute. */
float * float_array; /* Pointer to the array attribute. */
float *float_array; /* Pointer to the array attribute. */
/* avoid warnings */
(void)opdata;

2
examples/h5_dtransform.c
View File

@ -72,7 +72,7 @@ main(void)
hid_t dxpl_id_f_to_c, dxpl_id_c_to_f; /* data transform handles */
const char *f_to_c = "(5/9.0)*(x-32)";
const char *c_to_f = "(9/5.0)*x + 32";
char * transform;
char *transform;
float windchillC[ROWS][COLS];
int i, j, transform_size;

2
examples/h5_elink_unix2win.c
View File

@ -43,7 +43,7 @@ elink_unix2win_trav(const char *link_name, hid_t cur_group, const void *udata, s
hid_t fid;
const char *file_name;
const char *obj_name;
char * new_fname = NULL; /* Buffer allocated to hold Unix file path */
char *new_fname = NULL; /* Buffer allocated to hold Unix file path */
ssize_t prefix_len; /* External link prefix length */
size_t fname_len;
size_t start_pos; /* Initial position in new_fname buffer */

2
examples/h5_group.c
View File

@ -82,7 +82,7 @@ main(void)
dims[1] = 20;
dataspace = H5Screate_simple(RANK, dims, NULL);
dataset = H5Dcreate2(file, "/Data/Float_Data", H5T_NATIVE_FLOAT, dataspace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT);
H5P_DEFAULT);
/*
*Close the second dataset and file.

4
examples/h5_vds-eiger.c
View File

@ -48,8 +48,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);

4
examples/h5_vds-exc.c
View File

@ -57,8 +57,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);

4
examples/h5_vds-exclim.c
View File

@ -56,8 +56,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);

4
examples/h5_vds-percival-unlim-maxmin.c
View File

@ -61,8 +61,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
int wdata[DIM0_1 * DIM1 * DIM2];
/*

4
examples/h5_vds-percival-unlim.c
View File

@ -58,8 +58,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
int wdata[DIM0_1 * DIM1 * DIM2];
int rdata[80][10][10];
int a_rdata[20][10][10];

6
examples/h5_vds-percival.c
View File

@ -62,8 +62,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
int wdata[DIM0 * DIM1 * DIM2];
/*
@ -84,7 +84,7 @@ main(void)
file = H5Fcreate(SRC_FILE[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
src_space = H5Screate_simple(RANK, dims, NULL);
dset = H5Dcreate2(file, SRC_DATASET[i], H5T_NATIVE_INT, src_space, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT);
H5P_DEFAULT);
status = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
status = H5Sclose(src_space);
status = H5Dclose(dset);

4
examples/h5_vds-simpleIO.c
View File

@ -50,8 +50,8 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
/*
* Initialize data.
*/

6
examples/h5_vds.c
View File

@ -65,10 +65,10 @@ main(void)
H5D_layout_t layout; /* Storage layout */
size_t num_map; /* Number of mappings */
ssize_t len; /* Length of the string; also a return value */
char * filename;
char * dsetname;
char *filename;
char *dsetname;
hsize_t nblocks;
hsize_t * buf; /* Buffer to hold hyperslab coordinates */
hsize_t *buf; /* Buffer to hold hyperslab coordinates */
/*
* Create source files and datasets. This step is optional.

2
examples/ph5_filtered_writes.c
View File

@ -361,7 +361,7 @@ main(int argc, char **argv)
hid_t file_id = H5I_INVALID_HID;
hid_t fapl_id = H5I_INVALID_HID;
hid_t dxpl_id = H5I_INVALID_HID;
char * par_prefix = NULL;
char *par_prefix = NULL;
char filename[PATH_MAX];
MPI_Init(&argc, &argv);

2
examples/ph5_filtered_writes_no_sel.c
View File

@ -254,7 +254,7 @@ main(int argc, char **argv)
hid_t file_id = H5I_INVALID_HID;
hid_t fapl_id = H5I_INVALID_HID;
hid_t dxpl_id = H5I_INVALID_HID;
char * par_prefix = NULL;
char *par_prefix = NULL;
char filename[PATH_MAX];
MPI_Init(&argc, &argv);

12
fortran/src/H5Af.c
View File

@ -178,7 +178,7 @@ h5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
/******/
{
size_t c_bufsize;
char * c_buf = NULL; /* Buffer to hold C string */
char *c_buf = NULL; /* Buffer to hold C string */
int_f ret_value = 0; /* Return value */
c_bufsize = (size_t)*bufsize + 1;
@ -465,10 +465,10 @@ h5aget_name_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_
hsize_t_f *n, _fcd name, size_t_f *size, hid_t_f *lapl_id)
/******/
{
char * c_obj_name = NULL; /* Buffer to hold C string */
char *c_obj_name = NULL; /* Buffer to hold C string */
ssize_t c_size;
size_t c_buf_size;
char * c_buf = NULL;
char *c_buf = NULL;
int_f ret_value = 0; /* Return value */
/*
@ -668,7 +668,7 @@ h5aget_info_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int_
hsize_t_f *data_size)
/******/
{
char * c_obj_name = NULL; /* Buffer to hold C string */
char *c_obj_name = NULL; /* Buffer to hold C string */
H5A_info_t ainfo;
int_f ret_value = 0; /* Return value */
@ -734,8 +734,8 @@ h5aget_info_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fc
int_f *cset, hsize_t_f *data_size)
/******/
{
char * c_obj_name = NULL; /* Buffer to hold C string */
char * c_attr_name = NULL; /* Buffer to hold C string */
char *c_obj_name = NULL; /* Buffer to hold C string */
char *c_attr_name = NULL; /* Buffer to hold C string */
H5A_info_t ainfo;
int_f ret_value = 0; /* Return value */

18
fortran/src/H5Df.c
View File

@ -532,7 +532,7 @@ h5dvlen_get_max_len_c(hid_t_f *dset_id, hid_t_f *type_id, hid_t_f *space_id, siz
hid_t c_dset_id;
hid_t c_type_id;
hid_t c_space_id;
hvl_t * c_buf;
hvl_t *c_buf;
int i;
hssize_t num_elem;
herr_t status;
@ -605,7 +605,7 @@ h5dwrite_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space
int_f *tmp;
size_t max_len;
hvl_t * c_buf;
hvl_t *c_buf;
hsize_t i;
hsize_t num_elem;
@ -681,7 +681,7 @@ h5dread_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
herr_t status;
size_t max_len;
hvl_t * c_buf;
hvl_t *c_buf;
hsize_t i;
hssize_t num_elem;
@ -753,10 +753,10 @@ h5dwrite_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
hid_t c_file_space_id;
hid_t c_xfer_prp;
herr_t status;
char * tmp, *tmp_p;
char *tmp, *tmp_p;
size_t max_len;
char ** c_buf;
char **c_buf;
hsize_t i;
hsize_t num_elem;
@ -844,10 +844,10 @@ h5dread_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
hid_t c_file_space_id;
hid_t c_xfer_prp;
herr_t status;
char * tmp, *tmp_p;
char *tmp, *tmp_p;
size_t max_len;
char ** c_buf;
char **c_buf;
hsize_t i;
hsize_t num_elem;
@ -935,7 +935,7 @@ h5dwrite_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id
real_f *tmp;
size_t max_len;
hvl_t * c_buf;
hvl_t *c_buf;
hsize_t i;
hsize_t num_elem;
@ -1011,7 +1011,7 @@ h5dread_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
herr_t status;
size_t max_len;
hvl_t * c_buf;
hvl_t *c_buf;
hsize_t i;
hssize_t num_elem;

4
fortran/src/H5Ef.c
View File

@ -160,7 +160,7 @@ int_f
h5eget_major_c(int_f *error_no, _fcd name, size_t_f *namelen)
/******/
{
char * c_name = NULL;
char *c_name = NULL;
size_t c_namelen = (size_t)*namelen;
int_f ret_value = 0;
@ -208,7 +208,7 @@ int_f
h5eget_minor_c(int_f *error_no, _fcd name, size_t_f *namelen)
/******/
{
char * c_name = NULL;
char *c_name = NULL;
size_t c_namelen = (size_t)*namelen;
int_f ret_value = 0;

12
fortran/src/H5Ff.c
View File

@ -48,7 +48,7 @@ h5fcreate_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, hi
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
int_f c_namelen;
hid_t c_file_id;
unsigned c_access_flags;
@ -156,7 +156,7 @@ h5fmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hid
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
int_f c_namelen;
hid_t c_loc_id;
hid_t c_file_id;
@ -214,7 +214,7 @@ h5funmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen)
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
int_f c_namelen;
hid_t c_loc_id;
htri_t status;
@ -265,7 +265,7 @@ h5fopen_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid_
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
int_f c_namelen;
hid_t c_file_id;
unsigned c_access_flags;
@ -506,7 +506,7 @@ h5fget_obj_ids_c(hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f
size_t u;
size_t c_max_objs;
ssize_t c_num_objs;
hid_t * c_obj_ids;
hid_t *c_obj_ids;
c_file_id = (hid_t)*file_id;
c_obj_type = (unsigned)*obj_type;
@ -578,7 +578,7 @@ int_f
h5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen)
/******/
{
char * c_buf = NULL; /* Buffer to hold C string */
char *c_buf = NULL; /* Buffer to hold C string */
ssize_t size_c = -1;
int_f ret_value = 0; /* Return value */

12
fortran/src/H5Gf.c
View File

@ -173,9 +173,9 @@ h5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _f
{
H5O_info2_t oinfo;
hid_t c_loc_id = (hid_t)*loc_id;
char * c_name = NULL;
char *c_name = NULL;
size_t c_obj_namelen;
char * c_obj_name = NULL;
char *c_obj_name = NULL;
hsize_t c_idx = (hsize_t)*idx;
hid_t gid = (-1); /* Temporary group ID */
int ret_value = -1;
@ -251,7 +251,7 @@ int_f
h5gn_members_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers)
/******/
{
char * c_name = NULL;
char *c_name = NULL;
H5G_info_t ginfo;
int ret_value = -1;
@ -750,7 +750,7 @@ int_f
h5gget_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment)
/******/
{
char * c_name = NULL, *c_comment = NULL;
char *c_name = NULL, *c_comment = NULL;
size_t c_bufsize;
int ret_value = -1;
@ -954,7 +954,7 @@ h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
int_f *max_corder, int_f *mounted)
/******/
{
char * c_group_name = NULL; /* Buffer to hold group name C string */
char *c_group_name = NULL; /* Buffer to hold group name C string */
int_f ret_value = 0; /* Return value */
H5G_info_t ginfo;
/*
@ -1024,7 +1024,7 @@ h5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
/******/
{
char * c_group_name = NULL; /* Buffer to hold group name C string */
char *c_group_name = NULL; /* Buffer to hold group name C string */
int_f ret_value = 0; /* Return value */
H5G_info_t ginfo;
/*

2
fortran/src/H5If.c
View File

@ -89,7 +89,7 @@ h5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size
hid_t c_obj_id;
ssize_t c_size;
size_t c_buf_size;
char * c_buf = NULL;
char *c_buf = NULL;
/*
* Allocate buffer to hold name of an object

12
fortran/src/H5Lf.c
View File

@ -342,7 +342,7 @@ h5ldelete_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, in
int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
/******/
{
char * c_group_name = NULL; /* Buffer to hold C string */
char *c_group_name = NULL; /* Buffer to hold C string */
H5_index_t c_index_field;
H5_iter_order_t c_order;
int_f ret_value = 0; /* Return value */
@ -455,7 +455,7 @@ h5lget_info_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, int_
int_f *corder_valid, int_f *link_type, H5O_token_t *token, size_t_f *val_size, hid_t_f *lapl_id)
/******/
{
char * c_link_name = NULL; /* Buffer to hold C string */
char *c_link_name = NULL; /* Buffer to hold C string */
int_f ret_value = 0; /* Return value */
H5L_info2_t link_buff;
@ -524,7 +524,7 @@ h5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
int_f *cset, H5O_token_t *token, size_t_f *val_size, hid_t_f *lapl_id)
/******/
{
char * c_group_name = NULL; /* Buffer to hold C string */
char *c_group_name = NULL; /* Buffer to hold C string */
H5_index_t c_index_field;
H5_iter_order_t c_order;
int_f ret_value = 0; /* Return value */
@ -698,8 +698,8 @@ h5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
int_f *order, hsize_t_f *n, size_t_f *size, _fcd name, hid_t_f *lapl_id)
/******/
{
char * c_group_name = NULL; /* Buffer to hold C string */
char * c_name = NULL; /* Buffer to hold C string */
char *c_group_name = NULL; /* Buffer to hold C string */
char *c_name = NULL; /* Buffer to hold C string */
size_t c_size;
ssize_t c_size_link;
int_f ret_value = 0; /* Return value */
@ -1039,7 +1039,7 @@ h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index
int_f ret_value = -1; /* Return value */
herr_t func_ret_value; /* H5Linterate return value */
hsize_t idx_c = 0;
char * c_name = NULL; /* Buffer to hold C string */
char *c_name = NULL; /* Buffer to hold C string */
/*
* Convert FORTRAN name to C name

14
fortran/src/H5Of.c
View File

@ -308,7 +308,7 @@ h5oget_info_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *la
H5O_info_t_f *object_info, int_f *fields)
/******/
{
char * c_name = NULL; /* Buffer to hold C string */
char *c_name = NULL; /* Buffer to hold C string */
int_f ret_value = 0; /* Return value */
H5O_info2_t Oinfo;
@ -358,7 +358,7 @@ h5oget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *namelen, int_f
hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info, int_f *fields)
/******/
{
char * c_group_name = NULL; /* Buffer to hold C string */
char *c_group_name = NULL; /* Buffer to hold C string */
int_f ret_value = 0; /* Return value */
H5O_info2_t Oinfo;
H5_index_t c_index_field;
@ -512,7 +512,7 @@ h5ovisit_by_name_c(hid_t_f *loc_id, _fcd object_name, size_t_f *namelen, int_f *
{
int_f ret_value = -1; /* Return value */
herr_t func_ret_value; /* H5Linterate return value */
char * c_object_name = NULL; /* Buffer to hold C string */
char *c_object_name = NULL; /* Buffer to hold C string */
/*
* Convert FORTRAN name to C name
@ -758,7 +758,7 @@ h5oopen_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_
hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id)
/******/
{
char * c_group_name = NULL; /* Buffer to hold C string */
char *c_group_name = NULL; /* Buffer to hold C string */
int_f ret_value = 0;
H5_index_t c_index_type;
H5_iter_order_t c_order;
@ -807,7 +807,7 @@ int_f
h5oget_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentsize, hssize_t_f *bufsize)
/******/
{
char * c_comment = NULL; /* Buffer to hold C string */
char *c_comment = NULL; /* Buffer to hold C string */
int_f ret_value = 0; /* Return value */
size_t c_commentsize;
@ -864,8 +864,8 @@ h5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size, _fcd c
size_t_f *bufsize, hid_t_f *lapl_id)
/******/
{
char * c_comment = NULL; /* Buffer to hold C string */
char * c_name = NULL; /* Buffer to hold C string */
char *c_comment = NULL; /* Buffer to hold C string */
char *c_name = NULL; /* Buffer to hold C string */
int_f ret_value = 0; /* Return value */
ssize_t c_bufsize;
size_t c_commentsize;

28
fortran/src/H5Pf.c
View File

@ -1438,8 +1438,8 @@ h5pset_fapl_split_c(hid_t_f *prp_id, int_f *meta_len, _fcd meta_ext, hid_t_f *me
hid_t c_meta_plist;
hid_t c_raw_plist;
herr_t ret = -1;
char * c_meta_ext;
char * c_raw_ext;
char *c_meta_ext;
char *c_raw_ext;
c_meta_ext = (char *)HD5f2cstring(meta_ext, (size_t)*meta_len);
if (c_meta_ext == NULL)
@ -1817,7 +1817,7 @@ h5pget_filter_c(hid_t_f *prp_id, int_f *filter_number, int_f *flags, size_t_f *c
size_t c_cd_nelmts = 0;
H5Z_filter_t c_filter;
unsigned int *c_cd_values = NULL;
char * c_name = NULL;
char *c_name = NULL;
unsigned i;
int ret_value = -1;
@ -1885,7 +1885,7 @@ h5pset_external_c(hid_t_f *prp_id, _fcd name, int_f *namelen, off_t_f *offset, h
hid_t c_prp_id;
herr_t ret;
hsize_t c_bytes;
char * c_name;
char *c_name;
size_t c_namelen = (size_t)*namelen;
off_t c_offset;
c_bytes = (hsize_t)*bytes;
@ -1982,7 +1982,7 @@ h5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f *name_size, _fcd name, o
unsigned c_idx;
herr_t status;
size_t c_namelen;
char * c_name = NULL;
char *c_name = NULL;
off_t c_offset;
hsize_t size;
@ -2859,7 +2859,7 @@ h5pexist_c(hid_t_f *cls, _fcd name, int_f *name_len)
{
int_f ret_value = -1;
hid_t c_class;
char * c_name;
char *c_name;
htri_t status;
c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
@ -2941,7 +2941,7 @@ h5pget_size_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size)
{
int_f ret_value = -1;
hid_t c_plist;
char * c_name;
char *c_name;
size_t c_size;
c_name = (char *)HD5f2cstring(name, (size_t)*name_len);
@ -3537,11 +3537,11 @@ h5pset_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd m
hid_t c_prp_id;
H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES];
hid_t c_memb_fapl[H5FD_MEM_NTYPES];
char * c_memb_name[H5FD_MEM_NTYPES];
char *c_memb_name[H5FD_MEM_NTYPES];
haddr_t c_memb_addr[H5FD_MEM_NTYPES];
hbool_t relax;
herr_t status;
char * tmp, *tmp_p, *tmp_pp;
char *tmp, *tmp_p, *tmp_pp;
int i;
int c_lenmax;
long double tmp_max_addr;
@ -3670,11 +3670,11 @@ h5pget_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd m
hid_t c_prp_id;
H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES];
hid_t c_memb_fapl[H5FD_MEM_NTYPES];
char * c_memb_name[H5FD_MEM_NTYPES];
char *c_memb_name[H5FD_MEM_NTYPES];
haddr_t c_memb_addr[H5FD_MEM_NTYPES];
hbool_t relax;
herr_t status;
char * tmp, *tmp_p;
char *tmp, *tmp_p;
int i;
size_t c_lenmax;
size_t length = 0;
@ -3843,7 +3843,7 @@ h5pget_filter_by_id_c(hid_t_f *prp_id, int_f *filter_id, int_f *flags, size_t_f
size_t c_cd_nelmts = (size_t)*cd_nelmts;
size_t c_cd_nelmts_in = (size_t)*cd_nelmts;
unsigned int *c_cd_values = NULL;
char * c_name = NULL;
char *c_name = NULL;
unsigned i;
int_f ret_value = -1;
@ -4628,7 +4628,7 @@ int_f
h5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size)
/******/
{
char * c_expression = NULL; /* Buffer to hold C string */
char *c_expression = NULL; /* Buffer to hold C string */
size_t c_expression_len = (size_t)*expression_len + 1;
ssize_t ret;
int_f ret_value = 0;
@ -5370,7 +5370,7 @@ h5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len_ptr)
{
int ret_value = -1;
size_t c_buf_len_ptr;
void * c_buf_ptr = NULL;
void *c_buf_ptr = NULL;
c_buf_len_ptr = (size_t)*buf_len_ptr;

4
fortran/src/H5Rf.c
View File

@ -48,7 +48,7 @@ int_f
h5rcreate_region_c(int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id)
/******/
{
char * c_name = NULL;
char *c_name = NULL;
hdset_reg_ref_t ref_c;
int_f ret_value = 0;
@ -311,7 +311,7 @@ h5rget_name_ptr_c(hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t
int_f ret_value = -1;
ssize_t c_size;
size_t c_bufsize;
char * c_buf = NULL; /* Buffer to hold C string */
char *c_buf = NULL; /* Buffer to hold C string */
c_bufsize = (size_t)*name_len + 1;
/*

2
fortran/src/H5Sf.c
View File

@ -1250,7 +1250,7 @@ h5sselect_elements_c(hid_t_f *space_id, int_f *op, size_t_f *nelements, hsize_t_
int rank;
size_t i;
int j;
hsize_t * c_coord;
hsize_t *c_coord;
size_t c_nelements;
c_op = (H5S_seloper_t)*op;

12
fortran/src/H5Tf.c
View File

@ -1297,7 +1297,7 @@ h5tget_member_name_c(hid_t_f *type_id, int_f *idx, _fcd member_name, int_f *name
int ret_value = -1;
hid_t c_type_id;
unsigned c_index;
char * c_name;
char *c_name;
c_type_id = *type_id;
c_index = (unsigned)*idx;
@ -1616,7 +1616,7 @@ h5tinsert_c(hid_t_f *type_id, _fcd name, int_f *namelen, size_t_f *offset, hid_t
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
herr_t error;
c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
@ -1774,7 +1774,7 @@ h5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value)
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
herr_t error;
int_f c_value;
@ -1820,7 +1820,7 @@ h5tenum_nameof_c(hid_t_f *type_id, int_f *value, _fcd name, size_t_f *namelen)
{
int ret_value = -1;
hid_t c_type_id;
char * c_name;
char *c_name;
size_t c_namelen;
herr_t error;
int_f c_value;
@ -1864,7 +1864,7 @@ h5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value)
/******/
{
int ret_value = -1;
char * c_name;
char *c_name;
herr_t error;
c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
@ -1943,7 +1943,7 @@ h5tset_tag_c(hid_t_f *type_id, _fcd tag, int_f *namelen)
{
int ret_value = -1;
herr_t status;
char * c_tag;
char *c_tag;
c_tag = (char *)HD5f2cstring(tag, (size_t)*namelen);

2
hl/c++/test/ptableTest.cpp
View File

@ -599,7 +599,7 @@ error:
*-------------------------------------------------------------------------
*/
#pragma pack() // default alignment
const char * ABHI_PT("/abhiTest");
const char *ABHI_PT("/abhiTest");
const hsize_t NUM_PACKETS = 5;
const int STRING_LENGTH = 19; // including terminating NULL
int

4
hl/examples/ex_image2.c
View File

@ -118,8 +118,8 @@ out:
static int
read_data(const char *fname, /*IN*/
hsize_t * width, /*OUT*/
hsize_t * height /*OUT*/)
hsize_t *width, /*OUT*/
hsize_t *height /*OUT*/)
{
int i, n;
int color_planes;

2
hl/examples/ex_table_01.c
View File

@ -61,7 +61,7 @@ main(void)
hid_t string_type;
hid_t file_id;
hsize_t chunk_size = 10;
int * fill_data = NULL;
int *fill_data = NULL;
int compress = 0;
int i;

2
hl/examples/ex_table_02.c
View File

@ -61,7 +61,7 @@ main(void)
hid_t string_type;
hid_t file_id;
hsize_t chunk_size = 10;
int * fill_data = NULL;
int *fill_data = NULL;
int compress = 0;
int i;

2
hl/examples/ex_table_08.c
View File

@ -63,7 +63,7 @@ main(void)
hid_t file_id;
hsize_t chunk_size = 10;
int compress = 0;
int * fill_data = NULL;
int *fill_data = NULL;
hsize_t start; /* Record to start reading */
hsize_t nrecords; /* Number of records to insert/delete */
hsize_t nfields_out;

2
hl/examples/ex_table_10.c
View File

@ -60,7 +60,7 @@ main(void)
hid_t file_id;
hsize_t chunk_size = 10;
int compress = 0;
int * fill_data = NULL;
int *fill_data = NULL;
hsize_t nfields_out;
hsize_t nrecords_out;
int i;

4
hl/fortran/src/H5DSfc.c
View File

@ -256,7 +256,7 @@ done:
int_f
h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
{
char * c_label = NULL;
char *c_label = NULL;
ssize_t size_c = -1;
int_f ret_value = 0;
@ -306,7 +306,7 @@ done:
int_f
h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
{
char * c_scale_name = NULL;
char *c_scale_name = NULL;
ssize_t size_c = -1;
int_f ret_value = 0;

32
hl/fortran/src/H5IMfc.c
View File

@ -43,7 +43,7 @@ h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
hsize_t w = (hsize_t)*width;
hsize_t h = (hsize_t)*height;
@ -96,7 +96,7 @@ h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf)
{
int ret_value = -1;
herr_t ret;
char * c_name = NULL;
char *c_name = NULL;
/*
* convert FORTRAN name to C name
@ -148,8 +148,8 @@ h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char * c_il = NULL;
char *c_name = NULL;
char *c_il = NULL;
hsize_t w = (hsize_t)*width;
hsize_t h = (hsize_t)*height;
@ -211,12 +211,12 @@ h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *w
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
hsize_t c_width;
hsize_t c_height;
hsize_t c_planes;
hssize_t c_npals;
char * c_buf = NULL; /* buffer to hold C string */
char *c_buf = NULL; /* buffer to hold C string */
/*
* convert FORTRAN name to C name
@ -285,7 +285,7 @@ int_f
h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
{
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
herr_t ret;
/*
@ -330,7 +330,7 @@ h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
int_f
h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf)
{
char * c_name = NULL;
char *c_name = NULL;
hsize_t c_dims[H5S_MAX_RANK];
int i;
int rank = 2;
@ -383,8 +383,8 @@ h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char * c_namepal = NULL;
char *c_name = NULL;
char *c_namepal = NULL;
/*
* convert FORTRAN name to C name
@ -443,8 +443,8 @@ h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *il
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char * c_namepal = NULL;
char *c_name = NULL;
char *c_namepal = NULL;
/*
* convert FORTRAN name to C name
@ -503,7 +503,7 @@ h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *np
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
hssize_t c_npals;
/*
@ -559,7 +559,7 @@ h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
hsize_t c_dims[2];
int i;
@ -618,7 +618,7 @@ h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_numb
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
/*
* convert FORTRAN name to C name
@ -669,7 +669,7 @@ int_f
h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
{
hid_t c_loc_id;
char * c_name;
char *c_name;
herr_t ret;
/*

4
hl/fortran/src/H5LTf90proto.h
View File

@ -169,8 +169,8 @@ int_f h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size
void *fill_data, int_f *compress,
size_t_f *char_len_field_names, /* field_names lengths */
size_t_f *max_char_size_field_names, /* char len of fields */
char * field_names, /* field_names */
void * data);
char *field_names, /* field_names */
void *data);
HDF5_HL_F90CSTUBDLL
int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1,

42
hl/fortran/src/H5LTfc.c
View File

@ -42,7 +42,7 @@ h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, h
{
int ret_value = -1;
herr_t ret;
char * c_name = NULL;
char *c_name = NULL;
hsize_t *c_dims = NULL;
int i;
@ -107,7 +107,7 @@ h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_
herr_t ret;
hid_t c_loc_id;
hid_t c_type_id;
char * c_name = NULL;
char *c_name = NULL;
/*
* convert FORTRAN name to C name
@ -161,8 +161,8 @@ h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char * c_buf = NULL;
char *c_name = NULL;
char *c_buf = NULL;
/*
* convert FORTRAN name to C name
@ -221,7 +221,7 @@ h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *b
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
/*
* convert FORTRAN name to C name
@ -275,9 +275,9 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
int ret_value = -1;
herr_t ret = SUCCEED;
hid_t c_loc_id;
char * c_name = NULL;
char * c_attrname = NULL;
char * c_buf = NULL;
char *c_name = NULL;
char *c_attrname = NULL;
char *c_buf = NULL;
size_t c_size;
/*
@ -375,8 +375,8 @@ h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
int ret_value = -1;
herr_t ret = SUCCEED;
hid_t c_loc_id;
char * c_name = NULL;
char * c_attrname = NULL;
char *c_name = NULL;
char *c_attrname = NULL;
/*
* convert FORTRAN name to C name
@ -456,9 +456,9 @@ h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si
{
int ret_value = -1;
herr_t ret;
char * c_name = NULL;
char * c_attrname = NULL;
char * c_buf = NULL;
char *c_name = NULL;
char *c_attrname = NULL;
char *c_buf = NULL;
/*
* Convert FORTRAN name to C name
@ -526,7 +526,7 @@ h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *ra
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
int c_rank;
/*
@ -579,7 +579,7 @@ int_f
h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
{
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
herr_t ret;
/*
@ -628,7 +628,7 @@ h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char *c_name = NULL;
H5T_class_t c_classtype;
size_t c_type_size;
hsize_t c_dims[32];
@ -701,8 +701,8 @@ h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, siz
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char * c_attrname = NULL;
char *c_name = NULL;
char *c_attrname = NULL;
int c_rank;
/*
@ -764,8 +764,8 @@ h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char * c_name = NULL;
char * c_attrname = NULL;
char *c_name = NULL;
char *c_attrname = NULL;
H5T_class_t c_classtype;
size_t c_type_size;
hsize_t c_dims[32];
@ -841,7 +841,7 @@ int_f
h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c)
{
htri_t ret = -1;
char * c_path = NULL;
char *c_path = NULL;
hbool_t check_object_valid;
/*

44
hl/fortran/src/H5TBfc.c
View File

@ -40,17 +40,17 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name
hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
size_t_f *char_len_field_names, /* field_names lengths */
size_t_f *max_char_size_field_names, /* char len of fields */
char * field_names) /* field_names */
char *field_names) /* field_names */
{
char * c_name = NULL;
char * c_name1 = NULL;
char *c_name = NULL;
char *c_name1 = NULL;
hsize_t num_elem;
hsize_t i;
hsize_t c_nfields = (hsize_t)*nfields;
size_t *c_field_offset = NULL;
hid_t * c_field_types = NULL;
char ** c_field_names = NULL;
char * tmp = NULL, *tmp_p;
hid_t *c_field_types = NULL;
char **c_field_names = NULL;
char *tmp = NULL, *tmp_p;
int_f ret_value = 0;
num_elem = (hsize_t)*nfields;
@ -147,15 +147,15 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *
size_t_f *max_char_size_field_names, /* char len of fields */
char *field_names, void *data) /* field_names */
{
char * c_name = NULL;
char * c_name1 = NULL;
char *c_name = NULL;
char *c_name1 = NULL;
hsize_t num_elem;
hsize_t i;
hsize_t c_nfields = (hsize_t)*nfields;
size_t *c_field_offset = NULL;
hid_t * c_field_types = NULL;
char ** c_field_names = NULL;
char * tmp = NULL, *tmp_p;
hid_t *c_field_types = NULL;
char **c_field_names = NULL;
char *tmp = NULL, *tmp_p;
int_f ret_value = 0;
num_elem = (hsize_t)*nfields;
@ -248,7 +248,7 @@ int_f
h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size,
size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf)
{
char * c_name = NULL;
char *c_name = NULL;
size_t *c_dst_offset = NULL;
size_t *c_dst_sizes = NULL;
hsize_t c_nfields = (hsize_t)*nfields;
@ -308,8 +308,8 @@ int_f
h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
{
char * c_name = NULL;
char * c_name1 = NULL;
char *c_name = NULL;
char *c_name1 = NULL;
size_t c_type_size[1] = {(size_t)*type_size};
int_f ret_value = 0;
@ -356,8 +356,8 @@ int_f
h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name,
hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf)
{
char * c_name = NULL;
char * c_name1 = NULL;
char *c_name = NULL;
char *c_name1 = NULL;
size_t c_type_size[1] = {(size_t)*type_size};
int_f ret_value = 0;
@ -404,7 +404,7 @@ int_f
h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start,
hsize_t_f *nrecords, size_t_f *type_size, void *buf)
{
char * c_name = NULL;
char *c_name = NULL;
size_t c_type_size = *type_size;
int c_field_index = *field_index - 1; /* C zero based index */
int_f ret_value = 0;
@ -448,7 +448,7 @@ int_f
h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start,
hsize_t_f *nrecords, size_t_f *type_size, void *buf)
{
char * c_name = NULL;
char *c_name = NULL;
size_t c_type_size = *type_size;
int c_field_index = *field_index - 1; /* C zero based index */
int_f ret_value = 0;
@ -583,7 +583,7 @@ done:
int_f
h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords)
{
char * c_name = NULL;
char *c_name = NULL;
hsize_t c_nfields;
hsize_t c_nrecords;
int_f ret_value = 0;
@ -634,14 +634,14 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n
size_t_f *maxlen_out)
{
char * c_name = NULL;
char *c_name = NULL;
hsize_t num_elem;
hsize_t c_nfields = *nfields;
size_t *c_field_sizes = NULL;
size_t *c_field_offsets = NULL;
size_t c_type_size;
char ** c_field_names = NULL;
char * tmp = NULL, *tmp_p;
char **c_field_names = NULL;
char *tmp = NULL, *tmp_p;
hsize_t i;
int_f ret_value = 0;
size_t c_lenmax;

4
hl/src/H5DO.c
View File

@ -118,9 +118,9 @@ H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, hid_t
hsize_t stride[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements to move when selecting */
hsize_t block[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements in a block */
hsize_t * boundary = NULL; /* Boundary set in append flush property */
hsize_t *boundary = NULL; /* Boundary set in append flush property */
H5D_append_cb_t append_cb; /* Callback function set in append flush property */
void * udata; /* User data set in append flush property */
void *udata; /* User data set in append flush property */
hbool_t hit = FALSE; /* Boundary is hit or not */
hsize_t k; /* Local index variable */
unsigned u; /* Local index variable */

30
hl/src/H5DS.c
View File

@ -164,7 +164,7 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
H5R_ref_t nref_j;
hbool_t is_new_ref;
hvl_t * buf = NULL; /* VL buffer to store in the attribute */
hvl_t *buf = NULL; /* VL buffer to store in the attribute */
hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */
H5O_info2_t oi1, oi2;
H5I_type_t it1, it2;
@ -740,14 +740,14 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
hid_t ntid = H5I_INVALID_HID; /* attribute native type ID */
hid_t aid = H5I_INVALID_HID; /* attribute ID */
int rank; /* rank of dataset */
nds_list_t * ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
nds_list_t * ndsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/
ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
ds_list_t * dsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/
nds_list_t *ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
nds_list_t *ndsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/
ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
ds_list_t *dsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/
hsize_t dims[1]; /* dimension of the "REFERENCE_LIST" array */
H5R_ref_t nref;
hobj_ref_t ref; /* reference to the DS */
hvl_t * buf = NULL; /* VL buffer to store in the attribute */
hvl_t *buf = NULL; /* VL buffer to store in the attribute */
int i;
size_t j;
hssize_t ii;
@ -1237,10 +1237,10 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
hid_t aid = H5I_INVALID_HID; /* attribute ID */
int rank; /* rank of dataset */
nds_list_t *ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */
H5R_ref_t nref; /* reference to the DS */
hobj_ref_t ref; /* reference to the DS */
hvl_t * buf = NULL; /* VL buffer to store in the attribute */
hvl_t *buf = NULL; /* VL buffer to store in the attribute */
hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */
hid_t did_i; /* dataset ID in REFERENCE_LIST */
H5O_info2_t oi1, oi2, oi3, oi4;
@ -1605,7 +1605,7 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visi
hid_t sid; /* space ID */
hid_t tid = H5I_INVALID_HID; /* attribute type ID */
hid_t aid = H5I_INVALID_HID; /* attribute ID */
hvl_t * buf = NULL; /* VL buffer to store in the attribute */
hvl_t *buf = NULL; /* VL buffer to store in the attribute */
H5I_type_t it; /* ID type */
herr_t ret_value = 0;
int j_idx;
@ -1796,7 +1796,7 @@ H5DSset_label(hid_t did, unsigned int idx, const char *label)
H5I_type_t it; /* ID type */
unsigned int i;
union { /* union is needed to eliminate compiler warnings about */
char ** buf; /* discarding the 'const' qualifier in the free */
char **buf; /* discarding the 'const' qualifier in the free */
char const **const_buf; /* buf calls */
} u;
@ -1995,7 +1995,7 @@ H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size)
hid_t tid = H5I_INVALID_HID; /* attribute type ID */
hid_t aid = H5I_INVALID_HID; /* attribute ID */
int rank; /* rank of dataset */
char ** buf = NULL; /* buffer to store in the attribute */
char **buf = NULL; /* buffer to store in the attribute */
H5I_type_t it; /* ID type */
size_t nbytes = 0;
size_t copy_len;
@ -2145,7 +2145,7 @@ H5DSget_scale_name(hid_t did, char *name, size_t size)
size_t nbytes;
size_t copy_len;
htri_t has_name;
char * buf = NULL;
char *buf = NULL;
/*-------------------------------------------------------------------------
* parameter checking
@ -2259,7 +2259,7 @@ H5DSis_scale(hid_t did)
htri_t attr_class; /* has the "CLASS" attribute */
htri_t is_ds = -1; /* set to "not a dimension scale" */
H5I_type_t it; /* type of identifier */
char * buf = NULL; /* buffer to read name of attribute */
char *buf = NULL; /* buffer to read name of attribute */
size_t string_size; /* size of storage for the attribute */
H5T_class_t type_class;
H5T_str_t strpad;
@ -2372,7 +2372,7 @@ H5DSget_num_scales(hid_t did, unsigned int idx)
hid_t tid = H5I_INVALID_HID; /* attribute type ID */
hid_t aid = H5I_INVALID_HID; /* attribute ID */
int rank; /* rank of dataset */
hvl_t * buf = NULL; /* VL buffer to store in the attribute */
hvl_t *buf = NULL; /* VL buffer to store in the attribute */
H5I_type_t it; /* ID type */
int nscales;
@ -2484,7 +2484,7 @@ H5DS_is_reserved(hid_t did, hbool_t *is_reserved)
htri_t has_class;
hid_t tid = H5I_INVALID_HID;
hid_t aid = H5I_INVALID_HID;
char * buf = NULL; /* Name of attribute */
char *buf = NULL; /* Name of attribute */
size_t string_size; /* Size of storage for attribute */
/* Try to find the attribute "CLASS" on the dataset */

4
hl/src/H5IM.c
View File

@ -1064,7 +1064,7 @@ H5IMis_image(hid_t loc_id, const char *dset_name)
htri_t has_class;
hid_t atid;
hid_t aid = -1;
char * attr_data; /* Name of attribute */
char *attr_data; /* Name of attribute */
hsize_t storage_size; /* Size of storage for attribute */
herr_t ret;
@ -1165,7 +1165,7 @@ H5IMis_palette(hid_t loc_id, const char *dset_name)
htri_t has_class;
hid_t atid;
hid_t aid = -1;
char * attr_data; /* Name of attribute */
char *attr_data; /* Name of attribute */
hsize_t storage_size; /* Size of storage for attribute */
herr_t ret;

12
hl/src/H5LD.c
View File

@ -157,7 +157,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid)
{
int nfields; /* The # of comma-separated fields in "fields" */
hbool_t end_of_fields = FALSE; /* end of "fields" */
char * fields_ptr; /* Pointer to "fields" */
char *fields_ptr; /* Pointer to "fields" */
int ret_value = FAIL; /* Return value */
HDassert(listv);
@ -169,7 +169,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid)
/* Process till end of "fields" */
while (!end_of_fields) {
H5LD_memb_t *memb = NULL; /* Pointer to structure for storing a field's info */
char * cur; /* Pointer to a member in a field */
char *cur; /* Pointer to a member in a field */
size_t len; /* Estimated # of members in a field */
hbool_t gotcomma = FALSE; /* A comma encountered */
hbool_t gotmember = FALSE; /* Getting member in a field */
@ -335,7 +335,7 @@ H5LD_get_dset_type_size(hid_t did, const char *fields)
hid_t dset_tid = -1; /* Dataset's type identifier */
hid_t tid = -1; /* Native Type identifier */
H5LD_memb_t **listv = NULL; /* Vector for storing information in "fields" */
char * dup_fields = NULL; /* A copy of "fields" */
char *dup_fields = NULL; /* A copy of "fields" */
size_t ret_value = 0; /* Return value */
/* Get the datatype of the dataset */
@ -421,8 +421,8 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims
hsize_t start[H5S_MAX_RANK]; /* Starting offset */
hsize_t count[H5S_MAX_RANK]; /* ??offset */
H5LD_memb_t **listv = NULL; /* Vector for storing information in "fields" */
char * dup_fields = NULL; /* A copy of "fields" */
char * sav_buf = NULL; /* Saved pointer temporary buffer */
char *dup_fields = NULL; /* A copy of "fields" */
char *sav_buf = NULL; /* Saved pointer temporary buffer */
unsigned ctr; /* Counter for # of curr_dims > prev_dims */
int ndims; /* Number of dimensions for the dataset */
int i; /* Local index variable */
@ -494,7 +494,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims
} /* end if */
else { /* "fields" is specified */
unsigned char *buf_p = (unsigned char *)buf; /* Pointer to the destination buffer */
char * tmp_buf; /* Temporary buffer for data read */
char *tmp_buf; /* Temporary buffer for data read */
size_t tot_tsize; /* Total datatype size */
size_t len; /* Estimate the number of comma-separated fields in "fields" */

40
hl/src/H5LT.c
View File

@ -20,7 +20,7 @@
#define TMP_LEN 256
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
size_t input_len;
char * myinput;
char *myinput;
size_t indent = 0;
/* File Image operations
@ -57,12 +57,12 @@ size_t indent = 0;
/* Data structure to pass application data to callbacks. */
typedef struct {
void * app_image_ptr; /* Pointer to application buffer */
void *app_image_ptr; /* Pointer to application buffer */
size_t app_image_size; /* Size of application buffer */
void * fapl_image_ptr; /* Pointer to FAPL buffer */
void *fapl_image_ptr; /* Pointer to FAPL buffer */
size_t fapl_image_size; /* Size of FAPL buffer */
int fapl_ref_count; /* Reference counter for FAPL buffer */
void * vfd_image_ptr; /* Pointer to VFD buffer */
void *vfd_image_ptr; /* Pointer to VFD buffer */
size_t vfd_image_size; /* Size of VFD buffer */
int vfd_ref_count; /* Reference counter for VFD buffer */
unsigned flags; /* Flags indicate how the file image will */
@ -71,12 +71,12 @@ typedef struct {
} H5LT_file_image_ud_t;
/* callbacks prototypes for file image ops */
static void * image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *udata);
static void * image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op,
static void *image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *udata);
static void *image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op,
void *udata);
static void * image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata);
static void *image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata);
static herr_t image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *udata);
static void * udata_copy(void *udata);
static void *udata_copy(void *udata);
static herr_t udata_free(void *udata);
/* Definition of callbacks for file image operations. */
@ -102,7 +102,7 @@ static void *
image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
{
H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
void * return_value = NULL;
void *return_value = NULL;
/* callback is only used if the application buffer is not actually copied */
if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
@ -282,7 +282,7 @@ static void *
image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
{
H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata;
void * return_value = NULL;
void *return_value = NULL;
/* callback is only used if the application buffer is not actually copied */
if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY))
@ -2196,7 +2196,7 @@ out:
static char *
print_enum(hid_t type, char *str, size_t *str_len, hbool_t no_ubuf, size_t indt)
{
char ** name = NULL; /*member names */
char **name = NULL; /*member names */
unsigned char *value = NULL; /*value array */
int nmembs; /*number of members */
char tmp_str[TMP_LEN];
@ -2332,7 +2332,7 @@ herr_t
H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type, size_t *len)
{
size_t str_len = INCREMENT;
char * text_str = NULL;
char *text_str = NULL;
herr_t ret = SUCCEED;
if (lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG)
@ -2723,7 +2723,7 @@ next:
case H5T_ENUM: {
hid_t super;
size_t super_len;
char * stmp = NULL;
char *stmp = NULL;
/* Print lead-in */
HDsnprintf(dt_str, *slen, "H5T_ENUM {\n");
@ -2770,7 +2770,7 @@ next:
case H5T_VLEN: {
hid_t super;
size_t super_len;
char * stmp = NULL;
char *stmp = NULL;
/* Print lead-in */
HDsnprintf(dt_str, *slen, "H5T_VLEN {\n");
@ -2813,7 +2813,7 @@ next:
case H5T_ARRAY: {
hid_t super;
size_t super_len;
char * stmp = NULL;
char *stmp = NULL;
hsize_t dims[H5S_MAX_RANK];
int ndims;
@ -2871,12 +2871,12 @@ next:
break;
}
case H5T_COMPOUND: {
char * mname = NULL;
char *mname = NULL;
hid_t mtype;
size_t moffset;
H5T_class_t mclass;
size_t mlen;
char * mtmp = NULL;
char *mtmp = NULL;
int nmembs;
if ((nmembs = H5Tget_nmembers(dtype)) < 0)
@ -3575,9 +3575,9 @@ out:
htri_t
H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid)
{
char * tmp_path = NULL; /* Temporary copy of the path */
char * curr_name; /* Pointer to current component of path name */
char * delimit; /* Pointer to path delimiter during traversal */
char *tmp_path = NULL; /* Temporary copy of the path */
char *curr_name; /* Pointer to current component of path name */
char *delimit; /* Pointer to path delimiter during traversal */
H5I_type_t obj_type;
htri_t link_exists, obj_exists;
size_t path_length;

2
hl/src/H5LTprivate.h
View File

@ -24,7 +24,7 @@ H5_HLDLL herr_t H5LT_get_attribute_disk(hid_t obj_id, const char *attr_name, voi
H5_HLDLL herr_t H5LT_set_attribute_numerical(hid_t loc_id, const char *obj_name, const char *attr_name,
size_t size, hid_t type_id, const void *data);
H5_HLDLL herr_t H5LT_set_attribute_string(hid_t dset_id, const char *name, const char *buf);
H5_HLDLL char * H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen,
H5_HLDLL char *H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen,
hbool_t no_user_buf);
H5_HLDLL hid_t H5LTyyparse(void);

2
hl/src/H5PT.c
View File

@ -858,7 +858,7 @@ herr_t
H5PTis_varlen(hid_t table_id)
{
H5T_class_t type;
htbl_t * table;
htbl_t *table;
/* find the table struct from its ID */
if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)

30
hl/src/H5TB.c
View File

@ -66,7 +66,7 @@ H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsi
hsize_t dims_chunk[1];
hsize_t maxdims[1] = {H5S_UNLIMITED};
char attr_name[255];
char * member_name = NULL;
char *member_name = NULL;
unsigned char *tmp_buf = NULL;
hsize_t i;
herr_t ret_val = -1;
@ -437,7 +437,7 @@ H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_nam
hssize_t i, j;
hsize_t count[1];
hsize_t offset[1];
char * member_name = NULL;
char *member_name = NULL;
size_t size_native;
herr_t ret_val = -1;
@ -595,7 +595,7 @@ H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, con
hsize_t offset[1];
hsize_t i;
size_t size_native;
char * member_name = NULL;
char *member_name = NULL;
herr_t ret_val = -1;
/* check the arguments */
@ -899,7 +899,7 @@ H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_name
hsize_t offset[1];
hsize_t mem_size[1];
size_t size_native;
char * member_name = NULL;
char *member_name = NULL;
hssize_t i, j;
herr_t ret_val = -1;
@ -1056,7 +1056,7 @@ H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, cons
hsize_t mem_size[1];
hsize_t i;
size_t size_native;
char * member_name = NULL;
char *member_name = NULL;
herr_t ret_val = -1;
/* check the arguments */
@ -1212,8 +1212,8 @@ H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nr
hsize_t mem_size[1];
hsize_t dims[1];
size_t src_size;
size_t * src_offset = NULL;
size_t * src_sizes = NULL;
size_t *src_offset = NULL;
size_t *src_sizes = NULL;
unsigned char *tmp_buf = NULL;
herr_t ret_val = -1;
@ -1524,8 +1524,8 @@ H5TBadd_records_from(hid_t loc_id, const char *dset_name1, hsize_t start1, hsize
hsize_t ntotal_records;
size_t type_size1;
size_t src_size;
size_t * src_offset = NULL;
size_t * src_sizes = NULL;
size_t *src_offset = NULL;
size_t *src_sizes = NULL;
unsigned char *tmp_buf = NULL;
herr_t ret_val = -1;
@ -1672,8 +1672,8 @@ H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const c
size_t type_size;
size_t member_offset;
size_t src_size;
size_t * src_offset = NULL;
size_t * src_sizes = NULL;
size_t *src_offset = NULL;
size_t *src_sizes = NULL;
char attr_name[255];
unsigned char *tmp_buf = NULL;
unsigned char *tmp_fill_buf = NULL;
@ -2033,7 +2033,7 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi
hsize_t i;
char table_title[255];
char attr_name[255];
char * member_name = NULL;
char *member_name = NULL;
unsigned char *tmp_buf = NULL;
unsigned char *tmp_fill_buf = NULL;
hbool_t inserted;
@ -2446,7 +2446,7 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
hsize_t i;
char attr_name[255];
char table_title[255];
char * member_name = NULL;
char *member_name = NULL;
unsigned char *tmp_buf = NULL;
unsigned char *tmp_fill_buf = NULL;
htri_t has_fill = FALSE;
@ -3207,7 +3207,7 @@ H5TB_attach_attributes(const char *table_title, hid_t loc_id, const char *dset_n
hid_t tid)
{
char attr_name[255];
char * member_name = NULL;
char *member_name = NULL;
hsize_t i;
herr_t ret_val = -1;
@ -3272,7 +3272,7 @@ H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const si
hid_t nmtype_id = H5I_INVALID_HID;
size_t size_native;
hsize_t nfields = 0;
char ** fnames = NULL;
char **fnames = NULL;
unsigned i;
hid_t ret_val = -1;

2
hl/test/gen_test_ds.c
View File

@ -256,7 +256,7 @@ test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename
herr_t ret_value = FAIL;
hid_t dsid = -1;
ssize_t name_len;
char * name_out = NULL;
char *name_out = NULL;
if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
if (H5DSis_attached(did, dsid, idx) == 1) {

26
hl/test/test_ds.c
View File

@ -1171,7 +1171,7 @@ test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename
herr_t ret_value = FAIL;
hid_t dsid = -1;
ssize_t name_len;
char * name_out = NULL;
char *name_out = NULL;
if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
if (H5DSis_attached(did, dsid, idx) == 1) {
@ -1204,7 +1204,7 @@ test_detachscales(void)
int rank1 = 1;
int rank3 = 3;
hsize_t dims[] = {1, 2, 3}; /*some bogus numbers, not important for the test*/
int * buf = NULL;
int *buf = NULL;
char dname[16];
int i;
@ -2358,8 +2358,8 @@ test_simple(void)
int s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300};
char dim0_label[16];
char dim1_label[16];
char * dim0_labeld;
char * dim1_labeld;
char *dim0_labeld;
char *dim1_labeld;
char dim0_labels[3];
char dim1_labels[3];
ssize_t dim0_label_size;
@ -2368,7 +2368,7 @@ test_simple(void)
int scale_idx;
int nscales;
ssize_t name_len;
char * name_out = NULL;
char *name_out = NULL;
char snames[3];
int i, j;
@ -3602,10 +3602,10 @@ read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
hid_t tid = -1; /* file type ID */
hid_t mtid = -1; /* memory type ID */
hssize_t nelmts; /* number of data elements */
char * buf = NULL; /* data buffer */
char *buf = NULL; /* data buffer */
size_t size;
int i;
char * data = (char *)visitor_data;
char *data = (char *)visitor_data;
/* unused */
(void)dset;
@ -4608,8 +4608,8 @@ test_types(void)
hsize_t s2_dim[1] = {DIM2_SIZE}; /* size of DS 2 dataset */
float s1_float[DIM1_SIZE] = {10, 20, 30}; /* data of DS 1 dataset */
unsigned short s2_ushort[DIM2_SIZE] = {10, 20, 30, 40}; /* data of DS 2 dataset */
const char * s1_str = "ABC";
const char * s2_str = "ABCD";
const char *s1_str = "ABC";
const char *s2_str = "ABCD";
HDprintf("Testing scales with several datatypes\n");
@ -4781,9 +4781,9 @@ test_data(void)
hid_t dsid = -1; /* DS dataset ID */
hid_t dcpl; /* dataset creation property list */
hid_t sid; /* dataspace ID */
float * vals = NULL; /* array to hold data values */
float * latbuf = NULL; /* array to hold the latitude values */
float * lonbuf = NULL; /* array to hold the longitude values */
float *vals = NULL; /* array to hold data values */
float *latbuf = NULL; /* array to hold the latitude values */
float *lonbuf = NULL; /* array to hold the longitude values */
hsize_t dims[2]; /* array to hold dimensions */
hsize_t latdims[1]; /* array to hold dimensions */
hsize_t londims[1]; /* array to hold dimensions */
@ -4953,7 +4953,7 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf)
unsigned j;
char str[20];
size_t nelms;
FILE * f;
FILE *f;
float val;
const char *data_file = H5_get_srcdir_filename(fname);

12
hl/test/test_file_image.c
View File

@ -53,7 +53,7 @@
static int
test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
{
hid_t * file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */
hid_t *file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */
hsize_t dims1[RANK] = {2, 3}; /* original dimension of datasets */
hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED};
int data1[6] = {1, 2, 3, 4, 5, 6}; /* original contents of dataset */
@ -63,13 +63,13 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
hsize_t dims4[RANK] = {3, 5}; /* extended dimensions of datasets */
int data4[15] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
/* extended contents of dataset */
ssize_t * buf_size = NULL; /* pointer to array of buffer sizes */
void ** buf_ptr = NULL; /* pointer to array of pointers to image buffers */
char ** filename = NULL; /* pointer to array of pointers to filenames */
unsigned * input_flags = NULL; /* pointer to array of flag combinations */
ssize_t *buf_size = NULL; /* pointer to array of buffer sizes */
void **buf_ptr = NULL; /* pointer to array of pointers to image buffers */
char **filename = NULL; /* pointer to array of pointers to filenames */
unsigned *input_flags = NULL; /* pointer to array of flag combinations */
size_t i, j, k, nrow, n_values;
herr_t status1;
void * handle_ptr = NULL; /* pointers to driver buffer */
void *handle_ptr = NULL; /* pointers to driver buffer */
unsigned char **core_buf_ptr_ptr = NULL;
VERIFY(open_images > 1, "The number of open images must be greater than 1");

14
hl/test/test_image.c
View File

@ -519,11 +519,11 @@ test_generate(void)
{
hid_t fid;
hsize_t pal_dims[2] = {256, 3};
float * data = NULL;
float *data = NULL;
int imax, jmax, kmax;
int n_elements;
float valex, xmin, xmax, value;
FILE * f = NULL;
FILE *f = NULL;
const char *data_file = H5_get_srcdir_filename(DATA_FILE4);
int i;
int retval = FAIL;
@ -757,13 +757,13 @@ out:
static int
read_data(const char *fname, /*IN*/
hsize_t * width, /*OUT*/
hsize_t * height /*OUT*/)
hsize_t *width, /*OUT*/
hsize_t *height /*OUT*/)
{
int i, n;
int color_planes;
char str[20];
FILE * f = NULL;
FILE *f = NULL;
int w, h;
int n_elements;
const char *data_file = H5_get_srcdir_filename(fname);
@ -876,14 +876,14 @@ out:
static int
read_palette(const char *fname, rgb_t *palette, size_t palette_size)
{
FILE * file;
FILE *file;
char buffer[80];
unsigned u;
unsigned int red;
unsigned int green;
unsigned int blue;
unsigned nentries;
const char * data_file = H5_get_srcdir_filename(fname);
const char *data_file = H5_get_srcdir_filename(fname);
/* ensure the given palette is valid */
if (!palette)

12
hl/test/test_ld.c
View File

@ -130,13 +130,13 @@ char g_tmp_buf[TMP_BUF_SIZE];
} \
else if (type == TWO_CMPD_VALID1) { \
test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf; \
set_t * cb = (set_t *)_buf; \
set_t *cb = (set_t *)_buf; \
\
VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n]) \
} \
else if (type == TWO_CMPD_VALID2) { \
test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf; \
set_t * cb = (set_t *)_buf; \
set_t *cb = (set_t *)_buf; \
\
VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n]) \
} \
@ -211,10 +211,10 @@ typedef struct test_valid_fields2 {
/* Temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */
#define TEST_BUF_SIZE 100
int * iibuf; /* buffer for storing retrieved elements */
int * ibuf; /* buffer for storing retrieved elements (integer) */
set_t * cbuf; /* buffer for storing retrieved elements (compound) */
set_t * ccbuf; /* buffer for storing retrieved elements (compound) */
int *iibuf; /* buffer for storing retrieved elements */
int *ibuf; /* buffer for storing retrieved elements (integer) */
set_t *cbuf; /* buffer for storing retrieved elements (compound) */
set_t *ccbuf; /* buffer for storing retrieved elements (compound) */
test_valid_fields1 *vbuf1; /* buffer for storing retrieved elements (FIELDS1) */
test_valid_fields2 *vbuf2; /* buffer for storing retrieved elements (FIELDS2) */

92
hl/test/test_lite.c
View File

@ -468,7 +468,7 @@ make_attributes(hid_t loc_id, const char *obj_name)
{
int rank_out;
hsize_t * dims_out = 0;
hsize_t *dims_out = 0;
H5T_class_t type_class;
size_t type_size;
int i;
@ -1073,7 +1073,7 @@ static int
test_integers(void)
{
hid_t dtype;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3("\n text for integer types");
@ -1131,7 +1131,7 @@ static int
test_fps(void)
{
hid_t dtype;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3(" text for floating-point types");
@ -1193,7 +1193,7 @@ test_strings(void)
H5T_str_t str_pad;
H5T_cset_t str_cset;
H5T_class_t type_class;
char * dt_str = NULL;
char *dt_str = NULL;
size_t str_len;
HL_TESTING3(" text for string types");
@ -1338,7 +1338,7 @@ test_opaques(void)
hid_t dtype;
size_t opq_size;
H5T_class_t type_class;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3(" text for opaque types");
@ -1400,7 +1400,7 @@ test_enums(void)
const char *name2 = "WHITE";
int value2;
H5T_class_t type_class;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3(" text for enum types");
@ -1476,7 +1476,7 @@ test_variables(void)
{
hid_t dtype;
H5T_class_t type_class;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3(" text for variable types");
@ -1538,7 +1538,7 @@ test_arrays(void)
int ndims;
hsize_t dims[3];
H5T_class_t type_class;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3(" text for array types");
@ -1601,10 +1601,10 @@ test_compounds(void)
{
hid_t dtype;
int nmembs;
char * memb_name = NULL;
char *memb_name = NULL;
H5T_class_t memb_class;
H5T_class_t type_class;
char * dt_str;
char *dt_str;
size_t str_len;
HL_TESTING3(" text for compound types");
@ -1682,41 +1682,41 @@ test_compound_bug(void)
hid_t dtype;
H5T_class_t type_class;
int nmembs;
char * memb_name = NULL;
char * dt_str;
char *memb_name = NULL;
char *dt_str;
size_t str_len;
char text[] = "H5T_COMPOUND { H5T_STD_I32LE "
"\"state_________________________________________________________________________________"
"\"; H5T_STD_I32LE "
"\"desc____________________________________________________________________________________"
"_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; "
"\"TWO\" 2; \"THREE\" 3; } \"type____\"; H5T_STD_I32LE "
"\"sub_____________________________________________________________________________________"
"__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; "
"CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE "
"\"final___________________________________________________________________________________"
"________________\"; } } \"sub\"; }";
char text2[] = "H5T_COMPOUND {\n"
" H5T_STD_I16LE \"state___________________________"
"__________________________________________________"
"____\" : 0;\n"
" H5T_STD_I16LE \"desc____________________________"
"__________________________________________________"
"___________\" : 2;\n"
" H5T_VLEN { H5T_COMPOUND {\n"
" H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" "
"1; \"TWO\" 2; \"THREE\" 3; } \"type____\" : 0;\n"
" H5T_STD_I32LE \"sub___________________________"
"__________________________________________________"
"__________________________________1\" : 4;\n"
" H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_"
"STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;"
" } \"sub_desc\" : 8;\n"
" H5T_STD_I32LE \"final_________________________"
"__________________________________________________"
"________________________\" : 16;\n"
" } } \"sub\" : 8;\n"
"}\n";
char text[] = "H5T_COMPOUND { H5T_STD_I32LE "
"\"state_________________________________________________________________________________"
"\"; H5T_STD_I32LE "
"\"desc____________________________________________________________________________________"
"_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; "
"\"TWO\" 2; \"THREE\" 3; } \"type____\"; H5T_STD_I32LE "
"\"sub_____________________________________________________________________________________"
"__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; "
"CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE "
"\"final___________________________________________________________________________________"
"________________\"; } } \"sub\"; }";
char text2[] = "H5T_COMPOUND {\n"
" H5T_STD_I16LE \"state___________________________"
"__________________________________________________"
"____\" : 0;\n"
" H5T_STD_I16LE \"desc____________________________"
"__________________________________________________"
"___________\" : 2;\n"
" H5T_VLEN { H5T_COMPOUND {\n"
" H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" "
"1; \"TWO\" 2; \"THREE\" 3; } \"type____\" : 0;\n"
" H5T_STD_I32LE \"sub___________________________"
"__________________________________________________"
"__________________________________1\" : 4;\n"
" H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_"
"STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;"
" } \"sub_desc\" : 8;\n"
" H5T_STD_I32LE \"final_________________________"
"__________________________________________________"
"________________________\" : 16;\n"
" } } \"sub\" : 8;\n"
"}\n";
HL_TESTING3(" text for compound type of bug fix");
@ -1806,8 +1806,8 @@ test_complicated_compound(void)
hid_t dtype;
int nmembs;
H5T_class_t type_class;
char * line = NULL;
FILE * fp = NULL;
char *line = NULL;
FILE *fp = NULL;
size_t size = 1024;
const char *filename = H5_get_srcdir_filename(INPUT_FILE);

2
hl/test/test_packet.c
View File

@ -116,7 +116,7 @@ create_hl_table(hid_t fid)
hid_t field_type[NFIELDS];
hid_t string_type;
hsize_t chunk_size = 10;
int * fill_data = NULL;
int *fill_data = NULL;
int compress = 0;
herr_t status;

8
hl/test/test_packet_vlen.c
View File

@ -333,7 +333,7 @@ test_compound_VL_VLtype(void)
hsize_t count; /* Number of records in the table */
compVLVL_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */
compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */
hvl_t * t1, *t2;
hvl_t *t1, *t2;
unsigned uu, vv, ww; /* Loop variables */
char msg[80]; /* For error message */
herr_t ret; /* Returned status from a callee */
@ -516,7 +516,7 @@ test_VLof_VLtype(void)
hid_t vlatomic = H5I_INVALID_HID; /* Variable length datatype */
hid_t vlofvl = H5I_INVALID_HID; /* VL datatype of VL datatypes */
hsize_t count; /* Number of records in the table */
hvl_t * t1; /* pointer to advance */
hvl_t *t1; /* pointer to advance */
unsigned uu, vv, ww; /* Loop variables */
hvl_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */
hvl_t readBuf[NRECORDS]; /* Buffer to hold read data */
@ -1368,7 +1368,7 @@ testfl_compound_VL_VLtype(void)
hsize_t count; /* Number of records in the table */
compVLVL_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */
compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */
hvl_t * t1, *t2;
hvl_t *t1, *t2;
unsigned uu, vv, ww; /* Loop variables */
char msg[80]; /* For error message */
herr_t ret; /* Returned status from a callee */
@ -1551,7 +1551,7 @@ testfl_VLof_VLtype(void)
hid_t vlatomic = H5I_INVALID_HID; /* Variable length datatype */
hid_t vlofvl = H5I_INVALID_HID; /* VL datatype of VL datatypes */
hsize_t count; /* Number of records in the table */
hvl_t * t1; /* pointer to advance */
hvl_t *t1; /* pointer to advance */
unsigned uu, vv, ww; /* Loop variables */
hvl_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */
hvl_t readBuf[NRECORDS]; /* Buffer to hold read data */

2
hl/test/test_table.c
View File

@ -198,7 +198,7 @@ test_table(hid_t fid, int do_write)
hid_t fid2;
hsize_t chunk_size = 10;
int compress = 0;
int * fill = NULL;
int *fill = NULL;
particle_t fill1[1] = {{"no data", -1, -99.0, -99.0, -1}};
int fill1_new[1] = {-100};
hsize_t position;

2
hl/tools/gif2h5/decompress.c
View File

@ -17,7 +17,7 @@
GIFWORD iWIDE, iHIGH, eWIDE, eHIGH, expand, numcols, strip, nostrip;
unsigned long cols[256];
char * cmd;
char *cmd;
FILE *fp;

10
hl/tools/gif2h5/gif.h
View File

@ -133,12 +133,12 @@ typedef struct _GifCommentExtension {
** extension.
*/
typedef struct _GifToMem {
GIFHEAD * GifHeader;
GIFIMAGEDESC ** GifImageDesc;
GIFHEAD *GifHeader;
GIFIMAGEDESC **GifImageDesc;
GIFGRAPHICCONTROL **GifGraphicControlExtension;
GIFPLAINTEXT ** GifPlainTextExtension;
GIFAPPLICATION ** GifApplicationExtension;
GIFCOMMENT ** GifCommentExtension;
GIFPLAINTEXT **GifPlainTextExtension;
GIFAPPLICATION **GifApplicationExtension;
GIFCOMMENT **GifCommentExtension;
} GIFTOMEM;
/*

10
hl/tools/gif2h5/gif2mem.c
View File

@ -42,11 +42,11 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
* The gif structure outline for passing data to memory is given in gif.h.
* These pointers are redundant, should take them out in ver. 2
*/
GIFHEAD * gifHead; /* GIF Header structure */
GIFIMAGEDESC ** gifImageDesc; /* Logical Image Descriptor struct */
GIFPLAINTEXT ** gifPlainText; /* Plain Text Extension structure */
GIFAPPLICATION ** gifApplication; /* Application Extension structure */
GIFCOMMENT ** gifComment; /* Comment Extension structure */
GIFHEAD *gifHead; /* GIF Header structure */
GIFIMAGEDESC **gifImageDesc; /* Logical Image Descriptor struct */
GIFPLAINTEXT **gifPlainText; /* Plain Text Extension structure */
GIFAPPLICATION **gifApplication; /* Application Extension structure */
GIFCOMMENT **gifComment; /* Comment Extension structure */
GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */
GIFWORD i; /* Loop counter */

14
hl/tools/gif2h5/gifread.c
View File

@ -54,7 +54,7 @@ GetByte(const GIFBYTE *MemGif)
* otherwise 0 if no error occurred.
*/
int
ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure */
ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure */
GIFBYTE **MemGif2) /* GIF image file input FILE stream */
{
GIFWORD i; /* Loop counter */
@ -121,7 +121,7 @@ ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure */
*/
int
ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure */
GIFBYTE ** MemGif2 /* GIF image file input FILE stream */
GIFBYTE **MemGif2 /* GIF image file input FILE stream */
)
{
GIFWORD i; /* Loop counter */
@ -210,7 +210,7 @@ ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor
*/
int
ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */
GIFBYTE ** MemGif2 /* GIF image file input FILE stream */
GIFBYTE **MemGif2 /* GIF image file input FILE stream */
)
{
int i;
@ -233,7 +233,7 @@ ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Ext
*/
int
ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */
GIFBYTE ** MemGif2 /* GIF image file input FILE stream */
GIFBYTE **MemGif2 /* GIF image file input FILE stream */
)
{
int i;
@ -270,7 +270,7 @@ ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension
*/
int
ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */
GIFBYTE ** MemGif2 /* GIF image file input FILE stream */
GIFBYTE **MemGif2 /* GIF image file input FILE stream */
)
{
int i;
@ -306,7 +306,7 @@ ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Ext
*/
int
ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */
GIFBYTE ** MemGif2 /* GIF image file input FILE stream */
GIFBYTE **MemGif2 /* GIF image file input FILE stream */
)
{
@ -331,7 +331,7 @@ ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension struc
*/
static GIFBYTE *
ReadDataSubBlocks(GIFBYTE **MemGif2, /* GIF image file input FILE stream */
GIFWORD * DSize)
GIFWORD *DSize)
{
GIFBYTE *ptr1; /* Pointer used to "walk the heap" */
GIFBYTE *ptr2; /* Pointer used to mark the top of the heap */

2
hl/tools/gif2h5/hdfgifwr.c
View File

@ -83,7 +83,7 @@ static int maxbits = XV_BITS; /* user settable max # bits/code */
static int maxcode; /* maximum code, given n_bits */
static int maxmaxcode = 1 << XV_BITS; /* NEVER generate this */
static count_int * htab;
static count_int *htab;
static unsigned short *codetab;
#define HashTabOf(i) htab[i]

8
hl/tools/h5watch/extend_dset.c
View File

@ -82,8 +82,8 @@ extend_dset_two(const char *file, char *dname, int action1, int action2)
hsize_t cur_dims[2]; /* current dimension sizes */
size_t dtype_size; /* size of the dataset's datatype */
unsigned num_elmts; /* number of elements in the dataset */
int * ibuf = NULL; /* buffer for storing retrieved elements (integer) */
set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */
int *ibuf = NULL; /* buffer for storing retrieved elements (integer) */
set_t *cbuf = NULL; /* buffer for storing retrieved elements (compound) */
/* Allocate memory */
if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
@ -236,8 +236,8 @@ extend_dset_one(const char *file, char *dname, int action)
hsize_t offset[1]; /* starting offsets of appended data */
hsize_t count[1]; /* dimension sizes of appended data */
size_t dtype_size; /* size of the dataset's datatype */
int * ibuf = NULL; /* buffer for storing retrieved elements (integer) */
set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */
int *ibuf = NULL; /* buffer for storing retrieved elements (integer) */
set_t *cbuf = NULL; /* buffer for storing retrieved elements (compound) */
/* Allocate memory */
if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))

10
hl/tools/h5watch/h5watch.c
View File

@ -28,9 +28,9 @@
* This tool uses H5LD_memb_t data structure declared in H5LDprivate.h
*/
const char * progname = "h5watch"; /* tool name */
static char * g_list_of_fields = NULL; /* command line input for "list_of_fields" */
static char * g_dup_fields = NULL; /* copy of "list_of_fields" */
const char *progname = "h5watch"; /* tool name */
static char *g_list_of_fields = NULL; /* command line input for "list_of_fields" */
static char *g_dup_fields = NULL; /* copy of "list_of_fields" */
static H5LD_memb_t **g_listv = NULL; /* vector info for "list_of_fields" */
static hbool_t g_monitor_size_only = FALSE; /* monitor changes in dataset dimension sizes */
@ -58,7 +58,7 @@ static void parse_command_line(int argc, const char *const *argv);
* The long-named ones can be partially spelled. When
* adding more, make sure that they don't clash with each other.
*/
static const char * s_opts = "?";
static const char *s_opts = "?";
static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"hel", no_arg, 'h'},
{"dim", no_arg, 'd'}, {"di", no_arg, 'd'},
{"label", no_arg, 'l'}, {"labe", no_arg, 'l'},
@ -498,7 +498,7 @@ check_dataset(hid_t fid, char *dsetname)
hsize_t cur_dims[H5S_MAX_RANK]; /* size of dataspace dimensions */
hsize_t max_dims[H5S_MAX_RANK]; /* maximum size of dataspace dimensions */
hbool_t unlim_max_dims = FALSE; /* whether dataset has unlimited or max. dimension setting */
void * edata;
void *edata;
H5E_auto2_t func;
H5D_layout_t layout;
herr_t ret_value = SUCCEED; /* Return value */

2
java/examples/datasets/H5Ex_D_Shuffle.java
View File

@ -277,7 +277,7 @@ public class H5Ex_D_Shuffle {
int[] filter_config = {0};
int filter_type = -1;
filter_type = H5.H5Pget_filter(dcpl_id, indx, flags, cd_nelmts, cd_values, 120,
filter_name, filter_config);
filter_name, filter_config);
System.out.print("Filter " + indx + ": Type is: ");
switch (H5Z_filter.get(filter_type)) {
case H5Z_FILTER_DEFLATE:

2
java/examples/groups/H5Ex_G_Corder.java
View File

@ -42,7 +42,7 @@ public class H5Ex_G_Corder {
// Create group creation property list and enable link creation order tracking.
gcpl_id = H5.H5Pcreate(HDF5Constants.H5P_GROUP_CREATE);
status = H5.H5Pset_link_creation_order(gcpl_id, HDF5Constants.H5P_CRT_ORDER_TRACKED +
HDF5Constants.H5P_CRT_ORDER_INDEXED);
HDF5Constants.H5P_CRT_ORDER_INDEXED);
// Create primary group using the property list.
if (status >= 0)

4
java/examples/groups/H5Ex_G_Traverse.java
View File

@ -131,8 +131,8 @@ class H5L_iter_callbackT implements H5L_iterate_t {
nextod.obj_token = infobuf.token;
H5L_iterate_t iter_cb2 = new H5L_iter_callbackT();
return_val = H5.H5Literate_by_name(group, name, HDF5Constants.H5_INDEX_NAME,
HDF5Constants.H5_ITER_NATIVE, 0L, iter_cb2, nextod,
HDF5Constants.H5P_DEFAULT);
HDF5Constants.H5_ITER_NATIVE, 0L, iter_cb2, nextod,
HDF5Constants.H5P_DEFAULT);
}
for (int i = 0; i < spaces; i++)
System.out.print(" ");

2
java/src/hdf/hdf5lib/H5.java
View File

@ -5360,7 +5360,7 @@ public class H5 implements java.io.Serializable {
String n[] = new String[1];
n[0] = new String("");
oname[0] = H5Lget_name_by_idx(loc_id, name, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC,
idx, HDF5Constants.H5P_DEFAULT);
idx, HDF5Constants.H5P_DEFAULT);
H5L_info_t info = H5Lget_info_by_idx(loc_id, name, HDF5Constants.H5_INDEX_NAME,
HDF5Constants.H5_ITER_INC, idx, HDF5Constants.H5P_DEFAULT);
type[0] = info.type;

10
java/src/jni/exceptionImp.c
View File

@ -33,7 +33,7 @@ extern "C" {
#include "exceptionImp.h"
extern H5E_auto2_t efunc;
extern void * edata;
extern void *edata;
/*******************/
/* Local Variables */
@ -158,7 +158,7 @@ Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss)
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env, jobject obj, jstring file_name)
{
FILE * stream = NULL;
FILE *stream = NULL;
const char *file = NULL;
UNUSED(obj);
@ -237,7 +237,7 @@ static jboolean
H5JNIErrorClass(JNIEnv *env, const char *message, const char *className)
{
jstring str;
char * args[2];
char *args[2];
jboolean retVal = JNI_FALSE;
if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, message)))
@ -371,8 +371,8 @@ h5libraryError(JNIEnv *env)
hid_t min_num;
hid_t maj_num;
hid_t stk_id = H5I_INVALID_HID;
char * args[2];
char * msg_str = NULL;
char *args[2];
char *msg_str = NULL;
jboolean retVal = JNI_FALSE;
exceptionNumbers.maj_num = 0;

2
java/src/jni/h5Imp.c
View File

@ -106,7 +106,7 @@ JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_H5_H5get_1libversion(JNIEnv *env, jclass clss, jintArray libversion)
{
jboolean libversionArrayIsCopy;
int * libversionArray = NULL;
int *libversionArray = NULL;
herr_t status = FAIL;
UNUSED(clss);

56
java/src/jni/h5aImp.c
View File

@ -157,7 +157,7 @@ Java_hdf_hdf5lib_H5_H5Aread(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_t
jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jbyte * readBuf = NULL;
jbyte *readBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -224,7 +224,7 @@ Java_hdf_hdf5lib_H5_H5Awrite(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_
jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jbyte * writeBuf = NULL;
jbyte *writeBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -286,7 +286,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1short(JNIEnv *env, jclass clss, jlong attr_id, jlon
jshortArray buf, jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jshort * readBuf = NULL;
jshort *readBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -353,7 +353,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1short(JNIEnv *env, jclass clss, jlong attr_id, jlo
jshortArray buf, jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jshort * writeBuf = NULL;
jshort *writeBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -415,7 +415,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong
jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jint * readBuf = NULL;
jint *readBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -482,7 +482,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong
jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jint * writeBuf = NULL;
jint *writeBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -544,7 +544,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1long(JNIEnv *env, jclass clss, jlong attr_id, jlong
jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jlong * readBuf = NULL;
jlong *readBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -611,7 +611,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1long(JNIEnv *env, jclass clss, jlong attr_id, jlon
jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jlong * writeBuf = NULL;
jlong *writeBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -673,7 +673,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1float(JNIEnv *env, jclass clss, jlong attr_id, jlon
jfloatArray buf, jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jfloat * readBuf = NULL;
jfloat *readBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -740,7 +740,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1float(JNIEnv *env, jclass clss, jlong attr_id, jlo
jfloatArray buf, jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jfloat * writeBuf = NULL;
jfloat *writeBuf = NULL;
hsize_t dims[H5S_MAX_RANK];
hid_t sid = H5I_INVALID_HID;
jsize n;
@ -933,8 +933,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1string(JNIEnv *env, jclass clss, jlong attr_id, jlo
size_t str_len;
size_t pos;
jsize i, n;
char * c_buf = NULL;
char * cstr = NULL;
char *c_buf = NULL;
char *cstr = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -999,7 +999,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1string(JNIEnv *env, jclass clss, jlong attr_id, jl
jstring obj;
size_t i, str_len;
jsize n;
char * c_buf = NULL;
char *c_buf = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -1100,11 +1100,11 @@ Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem
hid_t memb = H5I_INVALID_HID;
H5T_class_t vlClass;
size_t vlSize;
void * rawBuf = NULL;
jobject * jList = NULL;
void *rawBuf = NULL;
jobject *jList = NULL;
size_t i, j, x;
char * cp_vp = NULL;
char *cp_vp = NULL;
if (!(typeSize = H5Tget_size(mem_type_id)))
H5_LIBRARY_ERROR(ENVONLY);
@ -1247,7 +1247,7 @@ Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem
}
case H5T_REFERENCE: {
jboolean bb;
jbyte * barray = NULL;
jbyte *barray = NULL;
if (NULL == (jobj = ENVPTR->NewByteArray(ENVONLY, vlSize)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@ -1336,11 +1336,11 @@ Java_hdf_hdf5lib_H5_H5AwriteVL(JNIEnv *env, jclass clss, jlong attr_id, jlong me
hid_t memb = H5I_INVALID_HID;
H5T_class_t vlClass;
size_t vlSize;
void * rawBuf = NULL;
jobject * jList = NULL;
void *rawBuf = NULL;
jobject *jList = NULL;
size_t i, j, x;
char * cp_vp = NULL;
char *cp_vp = NULL;
if (!(typeSize = H5Tget_size(mem_type_id)))
H5_LIBRARY_ERROR(ENVONLY);
@ -1581,7 +1581,7 @@ H5AreadVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
{
jstring jstr;
jsize i, n;
char ** strs = NULL;
char **strs = NULL;
herr_t status = FAIL;
if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) {
@ -1644,7 +1644,7 @@ H5AreadVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
size_t i;
hid_t sid = H5I_INVALID_HID;
jsize n;
void * readBuf = NULL;
void *readBuf = NULL;
herr_t status = FAIL;
HDmemset(&h5str, 0, sizeof(h5str_t));
@ -1786,7 +1786,7 @@ H5AwriteVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
jstring obj;
jsize size;
jint i;
char ** writeBuf = NULL;
char **writeBuf = NULL;
herr_t status = FAIL;
if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) {
@ -1861,7 +1861,7 @@ H5AwriteVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
size_t i;
hid_t sid = H5I_INVALID_HID;
jsize n;
void * writeBuf = NULL;
void *writeBuf = NULL;
herr_t status = FAIL;
if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) {
@ -2040,7 +2040,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1name(JNIEnv *env, jclass clss, jlong attr_id)
{
jstring str = NULL;
ssize_t buf_size;
char * attrName = NULL;
char *attrName = NULL;
UNUSED(clss);
@ -2388,7 +2388,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id
const char *objName = NULL;
jstring str = NULL;
ssize_t status_size = -1;
char * attrName = NULL;
char *attrName = NULL;
UNUSED(clss);
@ -2711,10 +2711,10 @@ H5A_iterate_cb(hid_t g_id, const char *name, const H5A_info_t *info, void *cb_da
jobject cb_info_t = NULL;
jobject visit_callback = wrapper->visit_callback;
jstring str;
JNIEnv * cbenv = NULL;
JNIEnv *cbenv = NULL;
jclass cbcls;
jvalue args[4];
void * op_data = (void *)wrapper->op_data;
void *op_data = (void *)wrapper->op_data;
jint status = -1;
if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {

62
java/src/jni/h5dImp.c
View File

@ -183,7 +183,7 @@ Java_hdf_hdf5lib_H5_H5Dread(JNIEnv *env, jclass clss, jlong dataset_id, jlong me
jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jbyte * readBuf = NULL;
jbyte *readBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -240,7 +240,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite(JNIEnv *env, jclass clss, jlong dataset_id, jlong m
jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jbyte * writeBuf = NULL;
jbyte *writeBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -338,7 +338,7 @@ Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim(JNIEnv *env, jclass clss, jlong type_id, jl
{
#ifndef H5_NO_DEPRECATED_SYMBOLS
jboolean vlenBufIsCopy;
jbyte * vlenBuf = NULL;
jbyte *vlenBuf = NULL;
#endif
herr_t status = FAIL;
@ -380,7 +380,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1short(JNIEnv *env, jclass clss, jlong dataset_id, j
jshortArray buf, jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jshort * readBuf = NULL;
jshort *readBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -437,7 +437,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1short(JNIEnv *env, jclass clss, jlong dataset_id,
jshortArray buf, jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jshort * writeBuf = NULL;
jshort *writeBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -494,7 +494,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1int(JNIEnv *env, jclass clss, jlong dataset_id, jlo
jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jint * readBuf = NULL;
jint *readBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -551,7 +551,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1int(JNIEnv *env, jclass clss, jlong dataset_id, jl
jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jint * writeBuf = NULL;
jint *writeBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -608,7 +608,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1long(JNIEnv *env, jclass clss, jlong dataset_id, jl
jlongArray buf, jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jlong * readBuf = NULL;
jlong *readBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -665,7 +665,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1long(JNIEnv *env, jclass clss, jlong dataset_id, j
jlongArray buf, jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jlong * writeBuf = NULL;
jlong *writeBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -722,7 +722,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1float(JNIEnv *env, jclass clss, jlong dataset_id, j
jfloatArray buf, jboolean isCriticalPinning)
{
jboolean readBufIsCopy;
jfloat * readBuf = NULL;
jfloat *readBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -779,7 +779,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1float(JNIEnv *env, jclass clss, jlong dataset_id,
jfloatArray buf, jboolean isCriticalPinning)
{
jboolean writeBufIsCopy;
jfloat * writeBuf = NULL;
jfloat *writeBuf = NULL;
htri_t vl_data_class;
herr_t status = FAIL;
@ -952,8 +952,8 @@ Java_hdf_hdf5lib_H5_H5Dread_1string(JNIEnv *env, jclass clss, jlong dataset_id,
size_t str_len;
size_t pos;
jsize i, n;
char * c_buf = NULL;
char * cstr = NULL;
char *c_buf = NULL;
char *cstr = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -1020,7 +1020,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1string(JNIEnv *env, jclass clss, jlong dataset_id,
jstring obj;
size_t i, str_len;
jsize n;
char * c_buf = NULL;
char *c_buf = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -1115,11 +1115,11 @@ Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong
hid_t memb = H5I_INVALID_HID;
H5T_class_t vlClass;
size_t vlSize;
void * rawBuf = NULL;
jobject * jList = NULL;
void *rawBuf = NULL;
jobject *jList = NULL;
size_t i, j, x;
char * cp_vp = NULL;
char *cp_vp = NULL;
if (!(typeSize = H5Tget_size(mem_type_id)))
H5_LIBRARY_ERROR(ENVONLY);
@ -1263,7 +1263,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong
}
case H5T_REFERENCE: {
jboolean bb;
jbyte * barray = NULL;
jbyte *barray = NULL;
if (NULL == (jobj = ENVPTR->NewByteArray(ENVONLY, vlSize)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@ -1345,11 +1345,11 @@ Java_hdf_hdf5lib_H5_H5DwriteVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong
hid_t memb = H5I_INVALID_HID;
H5T_class_t vlClass;
size_t vlSize;
void * rawBuf = NULL;
jobject * jList = NULL;
void *rawBuf = NULL;
jobject *jList = NULL;
size_t i, j, x;
char * cp_vp = NULL;
char *cp_vp = NULL;
if (!(typeSize = H5Tget_size(mem_type_id)))
H5_LIBRARY_ERROR(ENVONLY);
@ -1595,7 +1595,7 @@ H5DreadVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid,
{
jstring jstr;
jsize i, n;
char ** strs = NULL;
char **strs = NULL;
herr_t status = FAIL;
if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) {
@ -1660,7 +1660,7 @@ H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid
size_t i;
hid_t mem_space = mem_sid;
jsize n;
void * readBuf = NULL;
void *readBuf = NULL;
herr_t status = FAIL;
HDmemset(&h5str, 0, sizeof(h5str_t));
@ -1821,7 +1821,7 @@ H5DwriteVL_str(JNIEnv *env, hid_t dataset_id, hid_t mem_type_id, hid_t mem_space
jstring obj;
jsize size;
jint i;
char ** writeBuf = NULL;
char **writeBuf = NULL;
herr_t status = FAIL;
if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) {
@ -1898,7 +1898,7 @@ H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_si
size_t i;
hid_t mem_space = mem_sid;
jsize n;
void * writeBuf = NULL;
void *writeBuf = NULL;
herr_t status = FAIL;
if (mem_space == H5S_ALL) {
@ -2206,8 +2206,8 @@ Java_hdf_hdf5lib_H5_H5Dfill(JNIEnv *env, jclass clss, jbyteArray fill, jlong fil
jboolean isCopy1;
jboolean isCopy2;
herr_t status = FAIL;
jbyte * fillP = NULL;
jbyte * buffP = NULL;
jbyte *fillP = NULL;
jbyte *buffP = NULL;
UNUSED(clss);
@ -2248,7 +2248,7 @@ Java_hdf_hdf5lib_H5_H5Dset_1extent(JNIEnv *env, jclass clss, jlong loc_id, jlong
hsize_t *dims = NULL;
herr_t status;
jsize rank;
jlong * dimsBuf = NULL;
jlong *dimsBuf = NULL;
int i = 0;
UNUSED(clss);
@ -2288,10 +2288,10 @@ H5D_iterate_cb(void *elem, hid_t elem_id, unsigned ndim, const hsize_t *point, v
jmethodID mid;
jobject visit_callback = wrapper->visit_callback;
jclass cls;
JNIEnv * cbenv = NULL;
JNIEnv *cbenv = NULL;
jint status = FAIL;
jsize size;
void * op_data = (void *)wrapper->op_data;
void *op_data = (void *)wrapper->op_data;
if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@ -2350,7 +2350,7 @@ Java_hdf_hdf5lib_H5_H5Diterate(JNIEnv *env, jclass clss, jbyteArray buf, jlong b
{
cb_wrapper wrapper = {callback_op, op_data};
jboolean isCopy;
jbyte * iterBuf = NULL;
jbyte *iterBuf = NULL;
herr_t status = FAIL;
UNUSED(clss);

10
java/src/jni/h5eImp.c
View File

@ -284,7 +284,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1class_1name(JNIEnv *env, jclass clss, jlong cls_id)
{
jstring str = NULL;
ssize_t buf_size;
char * namePtr = NULL;
char *namePtr = NULL;
UNUSED(clss);
@ -435,8 +435,8 @@ Java_hdf_hdf5lib_H5_H5Eget_1msg(JNIEnv *env, jclass clss, jlong msg_id, jintArra
H5E_type_t error_msg_type;
jstring str = NULL;
ssize_t buf_size;
jint * theArray = NULL;
char * namePtr = NULL;
jint *theArray = NULL;
char *namePtr = NULL;
UNUSED(clss);
@ -506,9 +506,9 @@ H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data)
jstring str1, str2, str3;
jobject cb_info_t = NULL;
jvalue args[7];
JNIEnv * cbenv = NULL;
JNIEnv *cbenv = NULL;
jclass cbcls;
void * op_data = (void *)wrapper->op_data;
void *op_data = (void *)wrapper->op_data;
jint status = FAIL;
if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {

8
java/src/jni/h5fImp.c
View File

@ -119,7 +119,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *env, jclass clss, jlong file_id)
{
jstring str = NULL;
ssize_t buf_size;
char * namePtr = NULL;
char *namePtr = NULL;
UNUSED(clss);
@ -416,8 +416,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *env, jclass clss, jlong file_id, ji
ssize_t ret_val = -1;
size_t i;
jsize rank;
jlong * obj_id_listP = NULL;
hid_t * id_list = NULL;
jlong *obj_id_listP = NULL;
hid_t *id_list = NULL;
UNUSED(clss);
@ -517,7 +517,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size(JNIEnv *env, jclass clss, jlong file_id, j
{
jboolean isCopy;
size_t max_size = 0, min_clean_size = 0, cur_size = 0;
jlong * metadata_cache_ptr = NULL;
jlong *metadata_cache_ptr = NULL;
jsize size = 0;
int cur_num_entries = -1;

2
java/src/jni/h5gImp.c
View File

@ -276,7 +276,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id
H5_iter_order_t corder = (H5_iter_order_t)order;
H5_index_t cindex_type = (H5_index_t)index_type;
H5G_info_t group_info;
const char * grpName = NULL;
const char *grpName = NULL;
jobject obj = NULL;
herr_t ret_val = FAIL;

4
java/src/jni/h5iImp.c
View File

@ -62,7 +62,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name_1long(JNIEnv *env, jclass clss, jlong obj_id, j
{
ssize_t size = -1;
jstring str;
char * aName = NULL;
char *aName = NULL;
UNUSED(clss);
@ -99,7 +99,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name(JNIEnv *env, jclass clss, jlong obj_id)
{
jstring str = NULL;
ssize_t buf_size = -1;
char * aName = NULL;
char *aName = NULL;
UNUSED(clss);

10
java/src/jni/h5lImp.c
View File

@ -408,7 +408,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id
const char *groupName = NULL;
jstring str = NULL;
ssize_t status_size = -1;
char * linkName = NULL;
char *linkName = NULL;
UNUSED(clss);
@ -460,7 +460,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *env, jclass clss, jlong loc_id, jstrin
const char *linkName = NULL;
jstring str;
herr_t status;
char * linkValue = NULL;
char *linkValue = NULL;
UNUSED(clss);
@ -550,7 +550,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *env, jclass clss, jlong loc_i
const char *grpName = NULL;
jstring str;
herr_t status;
void * linkValue = NULL;
void *linkValue = NULL;
UNUSED(clss);
@ -674,10 +674,10 @@ H5L_iterate_cb(hid_t g_id, const char *name, const H5L_info2_t *info, void *cb_d
jobject cb_info_t = NULL;
jobject visit_callback = wrapper->visit_callback;
jstring str;
JNIEnv * cbenv = NULL;
JNIEnv *cbenv = NULL;
jclass cbcls;
jvalue args[5];
void * op_data = (void *)wrapper->op_data;
void *op_data = (void *)wrapper->op_data;
jint status = -1;
if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {

16
java/src/jni/h5oImp.c
View File

@ -50,7 +50,7 @@ create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, hbool_t is_critical
jbyteArray tokenByteBuf;
jboolean token_buf_is_copy;
jvalue constructor_args[1];
jbyte * token_buf = NULL;
jbyte *token_buf = NULL;
jobject ret_token_obj = NULL;
if (NULL == (tokenByteBuf = (*envptr)->NewByteArray(envptr, H5O_MAX_TOKEN_SIZE)))
@ -386,7 +386,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name(JNIEnv *env, jclass clss, jlo
jint fields, jlong access_id)
{
H5O_native_info_t infobuf;
const char * objName = NULL;
const char *objName = NULL;
jobject hdrinfobuf;
jobject obj_ihinfobuf;
jobject attr_ihinfobuf;
@ -458,7 +458,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx(JNIEnv *env, jclass clss, jlon
jlong access_id)
{
H5O_native_info_t infobuf;
const char * grpName = NULL;
const char *grpName = NULL;
jobject hdrinfobuf;
jobject obj_ihinfobuf;
jobject attr_ihinfobuf;
@ -557,10 +557,10 @@ H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *info, void *cb_d
jobject visit_callback = wrapper->visit_callback;
jobject token;
jstring str;
JNIEnv * cbenv = NULL;
JNIEnv *cbenv = NULL;
jclass cbcls;
jvalue args[12];
void * op_data = (void *)wrapper->op_data;
void *op_data = (void *)wrapper->op_data;
jint status = FAIL;
if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
@ -747,7 +747,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *env, jclass clss, jlong loc_id)
jstring str = NULL;
ssize_t buf_size;
ssize_t status = -1;
char * oComment = NULL;
char *oComment = NULL;
UNUSED(clss);
@ -787,7 +787,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *env, jclass clss, jlong lo
jstring str = NULL;
ssize_t buf_size;
ssize_t status;
char * objComment = NULL;
char *objComment = NULL;
UNUSED(clss);
@ -899,7 +899,7 @@ Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token(JNIEnv *env, jclass clss, jlong loc_id,
jboolean token_buf_is_copy;
jfieldID token_data_field_id;
jclass token_cls;
jbyte * token_buf = NULL;
jbyte *token_buf = NULL;
jobject token_data;
hid_t retVal = H5I_INVALID_HID;

10
java/src/jni/h5pDAPLImp.c
View File

@ -66,8 +66,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache(JNIEnv *env, jclass clss, jlong dapl, j
{
jboolean isCopy;
jdouble *w0Array = NULL;
jlong * rdcc_nslotsArray = NULL;
jlong * nbytesArray = NULL;
jlong *rdcc_nslotsArray = NULL;
jlong *nbytesArray = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -140,7 +140,7 @@ JNIEXPORT jstring JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix(JNIEnv *env, jclass clss, jlong dapl_id)
{
ssize_t prefix_size = -1;
char * pre = NULL;
char *pre = NULL;
jstring str = NULL;
UNUSED(clss);
@ -282,8 +282,8 @@ H5D_append_cb(hid_t dataset_id, hsize_t *cur_dims, void *cb_data)
jmethodID mid;
jobject visit_callback = wrapper->visit_callback;
jclass cls;
JNIEnv * cbenv = NULL;
void * op_data = (void *)wrapper->op_data;
JNIEnv *cbenv = NULL;
void *op_data = (void *)wrapper->op_data;
jint status = -1;
if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {

66
java/src/jni/h5pDCPLImp.c
View File

@ -82,8 +82,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1chunk(JNIEnv *env, jclass clss, jlong plist, jint nd
size_t i;
size_t rank;
jsize arrLen;
jbyte * theArray = NULL;
jlong * jlp = NULL;
jbyte *theArray = NULL;
jlong *jlp = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -136,7 +136,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk(JNIEnv *env, jclass clss, jlong plist, jint ma
{
jboolean isCopy;
hsize_t *da = NULL;
jlong * theArray = NULL;
jlong *theArray = NULL;
jsize arrLen;
int i;
herr_t status = FAIL;
@ -285,7 +285,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id
jbyteArray value)
{
jboolean isCopy;
jbyte * byteP = NULL;
jbyte *byteP = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -319,7 +319,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id
{
jboolean isCopy;
herr_t status = FAIL;
jbyte * byteP = NULL;
jbyte *byteP = NULL;
UNUSED(clss);
@ -348,7 +348,7 @@ Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined(JNIEnv *env, jclass clss, jlong plis
{
H5D_fill_value_t value = H5D_FILL_VALUE_ERROR;
jboolean isCopy;
jint * theArray = NULL;
jint *theArray = NULL;
herr_t retVal = FAIL;
UNUSED(clss);
@ -399,7 +399,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fill_1time(JNIEnv *env, jclass clss, jlong plist, ji
{
H5D_fill_time_t time = H5D_FILL_TIME_ERROR;
jboolean isCopy;
jint * theArray = NULL;
jint *theArray = NULL;
herr_t retVal = FAIL;
UNUSED(clss);
@ -450,7 +450,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time(JNIEnv *env, jclass clss, jlong plist, j
{
H5D_alloc_time_t time = H5D_ALLOC_TIME_ERROR;
jboolean isCopy;
jint * theArray = NULL;
jint *theArray = NULL;
herr_t retVal = FAIL;
UNUSED(clss);
@ -482,7 +482,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1filter(JNIEnv *env, jclass clss, jlong plist, jint f
jlong cd_nelmts, jintArray cd_values)
{
jboolean isCopy;
jint * theArray = NULL;
jint *theArray = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -559,10 +559,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter(JNIEnv *env, jclass clss, jlong plist, jint f
{
jboolean isCopy;
jstring str;
jint * flagsArray = NULL;
jlong * cd_nelmtsArray = NULL;
jint * cd_valuesArray = NULL;
char * filter = NULL;
jint *flagsArray = NULL;
jlong *cd_nelmtsArray = NULL;
jint *cd_valuesArray = NULL;
char *filter = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -633,11 +633,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2(JNIEnv *env, jclass clss, jlong plist, jint
{
jboolean isCopy;
jstring str;
jint * flagsArray = NULL;
jlong * cd_nelmtsArray = NULL;
jint * cd_valuesArray = NULL;
jint * filter_configArray = NULL;
char * filter = NULL;
jint *flagsArray = NULL;
jlong *cd_nelmtsArray = NULL;
jint *cd_valuesArray = NULL;
jint *filter_configArray = NULL;
char *filter = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -731,10 +731,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id(JNIEnv *env, jclass clss, jlong plist
{
jboolean isCopy;
jstring str;
jlong * cd_nelmtsArray = NULL;
jint * cd_valuesArray = NULL;
jint * flagsArray = NULL;
char * aName = NULL;
jlong *cd_nelmtsArray = NULL;
jint *cd_valuesArray = NULL;
jint *flagsArray = NULL;
char *aName = NULL;
long bs;
int rank;
herr_t status = FAIL;
@ -817,12 +817,12 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2(JNIEnv *env, jclass clss, jlong plis
{
jboolean isCopy;
jstring str;
jlong * cd_nelmtsArray = NULL;
jint * cd_valuesArray = NULL;
jint * flagsArray = NULL;
jint * filter_configArray = NULL;
jlong *cd_nelmtsArray = NULL;
jint *cd_valuesArray = NULL;
jint *flagsArray = NULL;
jint *filter_configArray = NULL;
long bs;
char * aName = NULL;
char *aName = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -901,7 +901,7 @@ Java_hdf_hdf5lib_H5_H5Pmodify_1filter(JNIEnv *env, jclass clss, jlong plist, jin
jlong cd_nelmts, jintArray cd_values)
{
jboolean isCopy;
jint * cd_valuesP = NULL;
jint *cd_valuesP = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -1086,8 +1086,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1external(JNIEnv *env, jclass clss, jlong plist, jint
hsize_t s;
off_t o;
jsize arrLen;
jlong * theArray = NULL;
char * file = NULL;
jlong *theArray = NULL;
char *file = NULL;
herr_t status = FAIL;
UNUSED(clss);
@ -1219,7 +1219,7 @@ JNIEXPORT jstring JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
{
ssize_t buf_size;
char * dname = NULL;
char *dname = NULL;
jstring str = NULL;
UNUSED(clss);
@ -1258,7 +1258,7 @@ JNIEXPORT jstring JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
{
ssize_t buf_size;
char * fname = NULL;
char *fname = NULL;
jstring str = NULL;
UNUSED(clss);
@ -1361,7 +1361,7 @@ JNIEXPORT jstring JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix(JNIEnv *env, jclass clss, jlong dapl_id)
{
ssize_t prefix_size = -1;
char * pre = NULL;
char *pre = NULL;
jstring str = NULL;
UNUSED(clss);

12
java/src/jni/h5pDXPLImp.c
View File

@ -41,8 +41,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1buffer(JNIEnv *env, jclass clss, jlong plist, jlong
{
#ifdef notdef
jboolean isCopy;
jbyte * tconvP = NULL;
jbyte * bkgP = NULL;
jbyte *tconvP = NULL;
jbyte *bkgP = NULL;
#endif
herr_t status = FAIL;
@ -88,8 +88,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1buffer(JNIEnv *env, jclass clss, jlong plist, jbyteA
{
#ifdef notdef
jboolean isCopy;
jbyte * tconvP = NULL;
jbyte * bkgP = NULL;
jbyte *tconvP = NULL;
jbyte *bkgP = NULL;
#endif
herr_t status = FAIL;
@ -290,7 +290,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *env, jclass clss, jlong plis
jlong size)
{
jstring str = NULL;
char * express = NULL;
char *express = NULL;
ssize_t express_size = -1;
UNUSED(clss);
@ -361,7 +361,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size(JNIEnv *env, jclass clss, jlong
{
jboolean isCopy;
size_t size;
jlong * theArray = NULL;
jlong *theArray = NULL;
herr_t retVal = FAIL;
UNUSED(clss);

Some files were not shown because too many files have changed in this diff Show More