diff options
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/test/ptableTest.cpp | 24 | ||||
| -rw-r--r-- | hl/examples/ex_image1.c | 2 | ||||
| -rw-r--r-- | hl/examples/ex_image2.c | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 1807be6..a77a8e1 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -81,7 +81,7 @@ BasicTest() int error; printf("Testing %-62s", "basic functionality"); - HDfflush(stdout); + fflush(stdout); FL_PacketTable wrapper(fileID, H5P_DEFAULT, BASICTEST_PT, H5T_NATIVE_INT, 1); if (!wrapper.IsValid()) @@ -139,7 +139,7 @@ TestCompoundDatatype() int error; printf("Testing %-62s", "compound datatypes"); - HDfflush(stdout); + fflush(stdout); /* Create compound datatype */ typedef struct { @@ -194,7 +194,7 @@ error: { H5Tclose(dtypeID); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -210,7 +210,7 @@ TestGetNext() int i; printf("Testing %-62s", "GetNextPacket"); - HDfflush(stdout); + fflush(stdout); /* Create a dataset */ FL_PacketTable wrapper(fileID, H5P_DEFAULT, GETNEXT_PT, H5T_NATIVE_INT, 500); @@ -277,7 +277,7 @@ TestCompress() size_t cd_nelemts = 0; printf("Testing %-62s", "compression"); - HDfflush(stdout); + fflush(stdout); try { /* Prepare property list to set compression, randomly use deflate */ DSetCreatPropList dscreatplist; @@ -326,7 +326,7 @@ TestGetPacket() int theRecs[3]; int i; printf("Testing %-62s", "GetPacket"); - HDfflush(stdout); + fflush(stdout); /* Create a dataset. Does not need to specify property list because there is no compression. */ @@ -365,7 +365,7 @@ int TestErrors() { printf("Testing %-62s", "error conditions"); - HDfflush(stdout); + fflush(stdout); /* Create a dataset */ FL_PacketTable wrapper(fileID, PT_TESTERROR, H5T_NATIVE_INT, 1); @@ -484,7 +484,7 @@ int SystemTest() { printf("Testing %-62s", "multiple datatypes"); - HDfflush(stdout); + fflush(stdout); hid_t dtypeID1, dtypeID2; hsize_t count; @@ -576,7 +576,7 @@ error: H5Tclose(dtypeID1); H5Tclose(dtypeID2); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; @@ -626,7 +626,7 @@ TestHDFFV_9758() } printf("Testing %-62s", "data corruption in packed structs (HDFFV-9758)"); - HDfflush(stdout); + fflush(stdout); // Build a compound datatype compound_type = H5Tcreate(H5T_COMPOUND, sizeof(s1_t)); @@ -685,7 +685,7 @@ TestHDFFV_9758() ptable.ResetIndex(); for (size_t i = 0; i < NUM_PACKETS; i++) { s1_t s2; - HDmemset(&s2, 0, sizeof(s1_t)); + memset(&s2, 0, sizeof(s1_t)); err = ptable.GetNextPacket(&s2); if (err < 0) goto error; @@ -708,7 +708,7 @@ error: H5Tclose(compound_type); H5Fclose(fileID); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c index d9080cb..49a9093 100644 --- a/hl/examples/ex_image1.c +++ b/hl/examples/ex_image1.c @@ -16,7 +16,7 @@ #define WIDTH 400 #define HEIGHT 200 #define PAL_ENTRIES 9 -unsigned char buf[WIDTH * HEIGHT]; +static unsigned char buf[WIDTH * HEIGHT]; int main(void) diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c index 579b126..9ce1746 100644 --- a/hl/examples/ex_image2.c +++ b/hl/examples/ex_image2.c @@ -22,8 +22,8 @@ #define PAL_NAME "palette" #define PAL_ENTRIES 256 -static int read_data(const char *file_name, hsize_t *width, hsize_t *height); -unsigned char *gbuf = NULL; /* global buffer for image data */ +static int read_data(const char *file_name, hsize_t *width, hsize_t *height); +static unsigned char *gbuf = NULL; /* global buffer for image data */ int main(void) |