Skip to content

Commit 13d1213

Browse files
imikejacksonimikejackson
committed
Fix shadowed variables
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent a0e24c8 commit 13d1213

File tree

2 files changed

+43
-64
lines changed

2 files changed

+43
-64
lines changed

‎Source/H5Support/H5Lite.h‎

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -556,13 +556,8 @@ inline herr_t findAttribute(hid_t locationID, const std::string& attributeName)
556556
{
557557
H5SUPPORT_MUTEX_LOCK()
558558

559-
hsize_t attributeNum;
560-
herr_t returnError = 0;
561-
562-
attributeNum = 0;
563-
returnError = H5Aiterate(locationID, H5_INDEX_NAME, H5_ITER_INC, &attributeNum, find_attr, const_cast<char*>(attributeName.c_str()));
564-
565-
return returnError;
559+
hsize_t attributeNum = 0;
560+
return H5Aiterate(locationID, H5_INDEX_NAME, H5_ITER_INC, &attributeNum, find_attr, const_cast<char*>(attributeName.c_str()));
566561
}
567562

568563
/**
@@ -595,10 +590,6 @@ template <typename T>
595590
inline herr_t writePointerDataset(hid_t locationID, const std::string& datasetName, int32_t rank, const hsize_t* dims, const T* data)
596591
{
597592
H5SUPPORT_MUTEX_LOCK()
598-
599-
herr_t error = -1;
600-
hid_t datasetID = -1;
601-
hid_t dataspaceID = -1;
602593
herr_t returnError = 0;
603594

604595
if(nullptr == data)
@@ -611,17 +602,17 @@ inline herr_t writePointerDataset(hid_t locationID, const std::string& datasetNa
611602
return -1;
612603
}
613604
// Create the DataSpace
614-
dataspaceID = H5Screate_simple(rank, dims, nullptr);
605+
hid_t dataspaceID = H5Screate_simple(rank, dims, nullptr);
615606
if(dataspaceID < 0)
616607
{
617608
return static_cast<herr_t>(dataspaceID);
618609
}
619610
// Create the Dataset
620611
// This will fail if datasetName contains a "/"!
621-
datasetID = H5Dcreate(locationID, datasetName.c_str(), dataType, dataspaceID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
612+
hid_t datasetID = H5Dcreate(locationID, datasetName.c_str(), dataType, dataspaceID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
622613
if(datasetID >= 0)
623614
{
624-
error = H5Dwrite(datasetID, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
615+
herr_t error = H5Dwrite(datasetID, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
625616
if(error < 0)
626617
{
627618
std::cout << "Error Writing Data '" << datasetName << "'" << std::endl;
@@ -649,7 +640,7 @@ inline herr_t writePointerDataset(hid_t locationID, const std::string& datasetNa
649640
returnError = static_cast<herr_t>(datasetID);
650641
}
651642
/* Terminate access to the data space. */
652-
error = H5Sclose(dataspaceID);
643+
herr_t error = H5Sclose(dataspaceID);
653644
if(error < 0)
654645
{
655646
std::cout << "Error Closing Dataspace" << std::endl;
@@ -672,9 +663,6 @@ inline herr_t replacePointerDataset(hid_t locationID, const std::string& dataset
672663
{
673664
H5SUPPORT_MUTEX_LOCK()
674665

675-
herr_t error = -1;
676-
hid_t datasetID = -1;
677-
hid_t dataspaceID = -1;
678666
herr_t returnError = 0;
679667

680668
if(data == nullptr)
@@ -688,22 +676,22 @@ inline herr_t replacePointerDataset(hid_t locationID, const std::string& dataset
688676
return -1;
689677
}
690678
// Create the DataSpace
691-
dataspaceID = H5Screate_simple(rank, dims, nullptr);
679+
hid_t dataspaceID = H5Screate_simple(rank, dims, nullptr);
692680
if(dataspaceID < 0)
693681
{
694682
return dataspaceID;
695683
}
696684

697685
HDF_ERROR_HANDLER_OFF
698-
datasetID = H5Dopen(locationID, datasetName.c_str(), H5P_DEFAULT);
686+
hid_t datasetID = H5Dopen(locationID, datasetName.c_str(), H5P_DEFAULT);
699687
HDF_ERROR_HANDLER_ON
700688
if(datasetID < 0) // dataset does not exist so create it
701689
{
702690
datasetID = H5Dcreate(locationID, datasetName.c_str(), dataType, dataspaceID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
703691
}
704692
if(datasetID >= 0)
705693
{
706-
error = H5Dwrite(datasetID, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
694+
herr_t error = H5Dwrite(datasetID, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
707695
if(error < 0)
708696
{
709697
std::cout << "Error Writing Data" << std::endl;
@@ -721,7 +709,7 @@ inline herr_t replacePointerDataset(hid_t locationID, const std::string& dataset
721709
returnError = static_cast<herr_t>(datasetID);
722710
}
723711
/* Terminate access to the data space. */
724-
error = H5Sclose(dataspaceID);
712+
herr_t error = H5Sclose(dataspaceID);
725713
if(error < 0)
726714
{
727715
std::cout << "Error Closing Dataspace" << std::endl;
@@ -789,19 +777,16 @@ inline std::vector<hsize_t> guessChunkSize(const std::vector<hsize_t>& dims, siz
789777
hsize_t chunkBytes = product * typeSize;
790778
if(chunkBytes < targetSize)
791779
{
792-
foundChunkSize = true;
793780
break;
794781
}
795782

796783
if(chunkBytes < detail::k_ChunkMax && static_cast<double>(chunkBytes - targetSize) / static_cast<double>(targetSize) < 0.5)
797784
{
798-
foundChunkSize = true;
799785
break;
800786
}
801787

802788
if(product == 1)
803789
{
804-
foundChunkSize = true;
805790
break;
806791
}
807792

@@ -1007,9 +992,6 @@ inline herr_t writeScalarDataset(hid_t locationID, const std::string& datasetNam
1007992
{
1008993
H5SUPPORT_MUTEX_LOCK()
1009994

1010-
herr_t error = -1;
1011-
hid_t datasetID = -1;
1012-
hid_t dataspaceID = -1;
1013995
herr_t returnError = 0;
1014996
hsize_t dims = 1;
1015997
hid_t rank = 1;
@@ -1019,16 +1001,16 @@ inline herr_t writeScalarDataset(hid_t locationID, const std::string& datasetNam
10191001
return -1;
10201002
}
10211003
// Create the DataSpace
1022-
dataspaceID = H5Screate_simple(static_cast<int>(rank), &(dims), nullptr);
1004+
hid_t dataspaceID = H5Screate_simple(static_cast<int>(rank), &(dims), nullptr);
10231005
if(dataspaceID < 0)
10241006
{
10251007
return static_cast<herr_t>(dataspaceID);
10261008
}
10271009
// Create the Dataset
1028-
datasetID = H5Dcreate(locationID, datasetName.c_str(), dataType, dataspaceID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
1010+
hid_t datasetID = H5Dcreate(locationID, datasetName.c_str(), dataType, dataspaceID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
10291011
if(datasetID >= 0)
10301012
{
1031-
error = H5Dwrite(datasetID, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
1013+
herr_t error = H5Dwrite(datasetID, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value);
10321014
if(error < 0)
10331015
{
10341016
std::cout << "Error Writing Data" << std::endl;
@@ -1046,7 +1028,7 @@ inline herr_t writeScalarDataset(hid_t locationID, const std::string& datasetNam
10461028
returnError = static_cast<herr_t>(datasetID);
10471029
}
10481030
/* Terminate access to the data space. */
1049-
error = H5Sclose(dataspaceID);
1031+
herr_t error = H5Sclose(dataspaceID);
10501032
if(error < 0)
10511033
{
10521034
std::cout << "Error Closing Dataspace" << std::endl;
@@ -1066,27 +1048,24 @@ inline herr_t writeStringDataset(hid_t locationID, const std::string& datasetNam
10661048
{
10671049
H5SUPPORT_MUTEX_LOCK()
10681050

1069-
hid_t datasetID = -1;
1070-
hid_t dataspaceID = -1;
1071-
hid_t typeID = -1;
1072-
size_t size = 0;
1073-
herr_t error = -1;
10741051
herr_t returnError = 0;
1052+
hid_t typeID = H5Tcopy(H5T_C_S1);
10751053

10761054
/* create a string data type */
1077-
if((typeID = H5Tcopy(H5T_C_S1)) >= 0)
1055+
if(typeID >= 0)
10781056
{
1079-
size = data.size() + 1;
1057+
size_t size = data.size() + 1;
10801058
if(H5Tset_size(typeID, size) >= 0)
10811059
{
10821060
if(H5Tset_strpad(typeID, H5T_STR_NULLTERM) >= 0)
10831061
{
10841062
/* Create the data space for the dataset. */
1085-
if((dataspaceID = H5Screate(H5S_SCALAR)) >= 0)
1063+
hid_t dataspaceID = H5Screate(H5S_SCALAR);
1064+
if(dataspaceID >= 0)
10861065
{
10871066
/* Create or open the dataset. */
10881067
HDF_ERROR_HANDLER_OFF
1089-
datasetID = H5Dopen(locationID, datasetName.c_str(), H5P_DEFAULT);
1068+
hid_t datasetID = H5Dopen(locationID, datasetName.c_str(), H5P_DEFAULT);
10901069
HDF_ERROR_HANDLER_ON
10911070
if(datasetID < 0) // dataset does not exist so create it
10921071
{
@@ -1097,7 +1076,7 @@ inline herr_t writeStringDataset(hid_t locationID, const std::string& datasetNam
10971076
{
10981077
if(!data.empty())
10991078
{
1100-
error = H5Dwrite(datasetID, typeID, H5S_ALL, H5S_ALL, H5P_DEFAULT, data.c_str());
1079+
herr_t error = H5Dwrite(datasetID, typeID, H5S_ALL, H5S_ALL, H5P_DEFAULT, data.c_str());
11011080
if(error < 0)
11021081
{
11031082
std::cout << "Error Writing String Data" << std::endl;
@@ -1224,17 +1203,17 @@ inline herr_t writeVectorOfStringsDataset(hid_t locationID, const std::string& d
12241203
if((datasetID = H5Dcreate(locationID, datasetName.c_str(), datatype, dataspaceID, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0)
12251204
{
12261205
// Select the "memory" to be written out - just 1 record.
1227-
hsize_t offset[] = {0};
1228-
hsize_t count[] = {1};
1229-
H5Sselect_hyperslab(memSpace, H5S_SELECT_SET, offset, nullptr, count, nullptr);
1206+
hsize_t dataset_offset[] = {0};
1207+
hsize_t dataset_count[] = {1};
1208+
H5Sselect_hyperslab(memSpace, H5S_SELECT_SET, dataset_offset, nullptr, dataset_count, nullptr);
12301209
hsize_t pos = 0;
12311210
for(const auto& element : data)
12321211
{
12331212
// Select the file position, 1 record at position 'pos'
1234-
hsize_t count[] = {1};
1235-
hsize_t offset[] = {pos};
1213+
hsize_t element_count[] = {1};
1214+
hsize_t element_offset[] = {pos};
12361215
pos++;
1237-
H5Sselect_hyperslab(dataspaceID, H5S_SELECT_SET, offset, nullptr, count, nullptr);
1216+
H5Sselect_hyperslab(dataspaceID, H5S_SELECT_SET, element_offset, nullptr, element_count, nullptr);
12381217
const char* strPtr = element.c_str();
12391218
error = H5Dwrite(datasetID, datatype, memSpace, dataspaceID, H5P_DEFAULT, &strPtr);
12401219
if(error < 0)

‎Source/H5Support/H5Macros.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,40 @@
4242
#include "H5Support/H5Support.h"
4343

4444
#define CloseH5A(attributeID, error, returnError) \
45-
error = H5Aclose(attributeID); \
46-
if(error < 0) \
45+
{ herr_t close##error = H5Aclose(attributeID); \
46+
if(close##error < 0) \
4747
{ \
4848
std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): " \
4949
<< "Error Closing Attribute." << std::endl; \
50-
returnError = error; \
51-
}
50+
returnError = close##error; \
51+
}}
5252

5353
#define CloseH5D(datasetID, error, returnError, datasetName) \
54-
error = H5Dclose(datasetID); \
55-
if(error < 0) \
54+
{herr_t close##error = H5Dclose(datasetID); \
55+
if(close##error < 0) \
5656
{ \
5757
std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): " \
5858
<< "Error Closing Dataset: " << datasetName << " datasetID=" << datasetID << " retError=" << returnError << std::endl; \
59-
returnError = error; \
60-
}
59+
returnError = close##error; \
60+
}}
6161

6262
#define CloseH5S(dataspaceID, error, returnError) \
63-
error = H5Sclose(dataspaceID); \
64-
if(error < 0) \
63+
{herr_t close##error = H5Sclose(dataspaceID); \
64+
if(close##error < 0) \
6565
{ \
6666
std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): " \
6767
<< "Error closing Dataspace." << std::endl; \
68-
returnError = error; \
69-
}
68+
returnError = close##error; \
69+
}}
7070

7171
#define CloseH5T(typeID, error, returnError) \
72-
error = H5Tclose(typeID); \
73-
if(error < 0) \
72+
{ herr_t close##error = H5Tclose(typeID); \
73+
if(close##error < 0) \
7474
{ \
7575
std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): " \
7676
<< "Error closing DataType" << std::endl; \
77-
returnError = error; \
78-
}
77+
returnError = close##error; \
78+
}}
7979

8080
#define HDF_ERROR_HANDLER_OFF \
8181
herr_t (*_oldHDF_error_func)(hid_t, void*); \

0 commit comments

Comments
 (0)