summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-04-20 00:17:24 (GMT)
committerGitHub <noreply@github.com>2021-04-20 00:17:24 (GMT)
commit168c1245b4aa6fa4779b3df5cc050d0272abdc2e (patch)
tree6e4dc53920a8c2c0bbdb7cfb6f190e6703e80446 /hl
parent100e132a62ae1aaf97f379684d04ed00d6016208 (diff)
downloadhdf5-168c1245b4aa6fa4779b3df5cc050d0272abdc2e.zip
hdf5-168c1245b4aa6fa4779b3df5cc050d0272abdc2e.tar.gz
hdf5-168c1245b4aa6fa4779b3df5cc050d0272abdc2e.tar.bz2
1 8 Merge dev changes for long double and cmake (#548)
* Update supported platforms * Merge PR#3 changes from develop * # WARNING: head commit changed in the meantime Merge gcc 10 diagnostics option from develop Merge CMake changes from develop Merge warnings from develop Merge #318 OSX changes from develop Merge tools changes from develop Merge test macros from develop * Format updates * Fix missing semicolon and format fix * Format update * Correct actions, remove java option * Update autotools build files * Add testfiles * Fix configure issue with make flags * Init fapls to default * Update generated files and fix h5repack id closure * update format * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings header guard underscore cleanup whitespace cleanup tools sync * format alignment * initialize vars * revert H5private change * Merge #380 from develop * Split format source and commit changes on repo push * Change windows TS to use older VS. * HDFFV-11229 merge dev changes for long double display in tools * Committing clang-format changes * Update unsupported types with precision Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/src/H5PacketTable.cpp23
-rw-r--r--hl/c++/src/H5PacketTable.h9
-rw-r--r--hl/c++/test/ptableTest.cpp5
-rw-r--r--hl/src/H5DS.c5
-rw-r--r--hl/src/H5LT.c5
-rw-r--r--hl/test/test_ds.c5
-rw-r--r--hl/test/test_dset_opt.c10
-rw-r--r--hl/test/test_file_image.c5
-rw-r--r--hl/test/test_image.c15
-rw-r--r--hl/tools/gif2h5/gifread.c5
10 files changed, 69 insertions, 18 deletions
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index eca3ed1..0f47b0d 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -32,15 +32,24 @@
* Opens an existing packet table, which can contain either fixed-length or
* variable-length packets.
*/
-PacketTable::PacketTable(hid_t fileID, const char *name) { table_id = H5PTopen(fileID, name); }
+PacketTable::PacketTable(hid_t fileID, const char *name)
+{
+ table_id = H5PTopen(fileID, name);
+}
/* "Open" Constructor - will be deprecated because of char* name */
-PacketTable::PacketTable(hid_t fileID, char *name) { table_id = H5PTopen(fileID, name); }
+PacketTable::PacketTable(hid_t fileID, char *name)
+{
+ table_id = H5PTopen(fileID, name);
+}
/* Destructor
* Cleans up the packet table
*/
-PacketTable::~PacketTable() { H5PTclose(table_id); }
+PacketTable::~PacketTable()
+{
+ H5PTclose(table_id);
+}
/* IsValid
* Returns true if this packet table is valid, false otherwise.
@@ -206,10 +215,14 @@ FL_PacketTable::FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t
* Opens an existing fixed-length packet table.
* Fails if the packet table specified is variable-length.
*/
-FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name) : PacketTable(fileID, name) {}
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name) : PacketTable(fileID, name)
+{
+}
/* "Open" Constructor - will be deprecated because of char* name */
-FL_PacketTable::FL_PacketTable(hid_t fileID, char *name) : PacketTable(fileID, name) {}
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name) : PacketTable(fileID, name)
+{
+}
/* AppendPacket
* Adds a single packet to the packet table. Takes a pointer
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 825caf7..a73b4c9 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -33,7 +33,10 @@ class H5_HLCPPDLL PacketTable {
/* Null constructor
* Sets table_id to "invalid"
*/
- PacketTable() { table_id = H5I_BADID; }
+ PacketTable()
+ {
+ table_id = H5I_BADID;
+ }
/* "Open" Constructor
* Opens an existing packet table, which can contain either fixed-length or
@@ -163,7 +166,9 @@ class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable {
/* Destructor
* Cleans up the packet table
*/
- virtual ~FL_PacketTable() {}
+ virtual ~FL_PacketTable()
+ {
+ }
/* AppendPacket
* Adds a single packet to the packet table. Takes a pointer
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index bf60402..9550a62 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -191,7 +191,10 @@ TestCompoundDatatype()
error:
- H5E_BEGIN_TRY { H5Tclose(dtypeID); }
+ H5E_BEGIN_TRY
+ {
+ H5Tclose(dtypeID);
+ }
H5E_END_TRY;
H5_FAILED();
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index 7ade5d9..16d1217 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -2218,7 +2218,10 @@ H5DS_get_REFLIST_type(void)
return ntid_t;
out:
- H5E_BEGIN_TRY { H5Tclose(ntid_t); }
+ H5E_BEGIN_TRY
+ {
+ H5Tclose(ntid_t);
+ }
H5E_END_TRY;
return FAIL;
}
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 81c547e..5396078 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -907,7 +907,10 @@ H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
return file_id;
out:
- H5E_BEGIN_TRY { H5Pclose(fapl); }
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(fapl);
+ }
H5E_END_TRY;
return -1;
} /* end H5LTopen_file_image() */
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 90110a4..941b44a 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -3740,7 +3740,10 @@ match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor_data)
return ret;
out:
- H5E_BEGIN_TRY { H5Sclose(sid); }
+ H5E_BEGIN_TRY
+ {
+ H5Sclose(sid);
+ }
H5E_END_TRY;
return FAIL;
}
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index d6edbf2..9341d3b 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -2032,7 +2032,10 @@ test_read_unallocated_chunk(hid_t file)
offset[1] = j * CHUNK_NY;
/* Read a non-existant chunk using the direct read function. */
- H5E_BEGIN_TRY { status = H5DOread_chunk(dataset, dxpl, offset, &filter_mask, &direct_buf); }
+ H5E_BEGIN_TRY
+ {
+ status = H5DOread_chunk(dataset, dxpl, offset, &filter_mask, &direct_buf);
+ }
H5E_END_TRY;
/* Check that the chunk read call does not succeed. */
@@ -2041,7 +2044,10 @@ test_read_unallocated_chunk(hid_t file)
/* Query the size of the non-existant chunk */
direct_chunk_nbytes = ULONG_MAX;
- H5E_BEGIN_TRY { status = H5Dget_chunk_storage_size(dataset, offset, &direct_chunk_nbytes); }
+ H5E_BEGIN_TRY
+ {
+ status = H5Dget_chunk_storage_size(dataset, offset, &direct_chunk_nbytes);
+ }
H5E_END_TRY;
/* Check that the chunk storage size call does not succeed. */
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index d56a8b9..545d759 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -303,7 +303,10 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
VERIFY(status1 < 0, "H5Dwrite() should have failed");
/* extend dimensions of dataset */
- H5E_BEGIN_TRY { status1 = H5Dset_extent(dset_id[i], dims4); }
+ H5E_BEGIN_TRY
+ {
+ status1 = H5Dset_extent(dset_id[i], dims4);
+ }
H5E_END_TRY;
VERIFY(status1 < 0, "H5Dset_extent() should have failed");
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index b71531e..0c7d511 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -301,7 +301,10 @@ out:
HDfree(buf1_out);
if (buf2_out)
HDfree(buf2_out);
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
H5_FAILED();
return FAIL;
@@ -488,7 +491,10 @@ out:
if (image_data)
HDfree(image_data);
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
H5_FAILED();
@@ -720,7 +726,10 @@ out:
if (image_data)
HDfree(image_data);
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
if (f)
HDfclose(f);
diff --git a/hl/tools/gif2h5/gifread.c b/hl/tools/gif2h5/gifread.c
index b88264b..6cfcdea 100644
--- a/hl/tools/gif2h5/gifread.c
+++ b/hl/tools/gif2h5/gifread.c
@@ -38,7 +38,10 @@ GetWord(GIFBYTE *MemGif)
}
GIFBYTE
-GetByte(GIFBYTE *MemGif) { return *MemGif; }
+GetByte(GIFBYTE *MemGif)
+{
+ return *MemGif;
+}
/*
* Read a GIF image GIFBYTE Header.