mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r7967] Purpose:

Browse Source 
Code cleanup for VS.NET

Description:
    Clean up several issues that VS.NET was having problems with.

Platforms tested:
    Eyeballed against Kent's bug reports.
This commit is contained in:
Quincey Koziol 2003-12-17 11:39:17 -05:00
parent cd7b4b8b90
commit 8f62cb43da
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/H5FDmulti.c
View File

@ -1894,9 +1894,9 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
if (HADDR_UNDEF!=file->memb_addr[mt]) {
haddr_t eoa = H5FDget_eoa(file->memb[mt]);
fprintf(stderr, " %6d %20llu %20llu %20llu %s\n",
(int)mt, (unsigned long long)(file->memb_addr[mt]),
(unsigned long long)eoa,
(unsigned long long)(file->memb_next[mt]),
(int)mt, (unsigned long_long)(file->memb_addr[mt]),
(unsigned long_long)eoa,
(unsigned long_long)(file->memb_next[mt]),
file->memb_name[mt]);
}
}

16
test/dtypes.c
View File

@ -4388,15 +4388,15 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst)
switch (src_type) {
case FLT_FLOAT:
memcpy(aligned, saved+j*sizeof(float), sizeof(float));
hw_llong = (long long)(*((float*)aligned));
hw_llong = (long_long)(*((float*)aligned));
break;
case FLT_DOUBLE:
memcpy(aligned, saved+j*sizeof(double), sizeof(double));
hw_llong = (long long)(*((double*)aligned));
hw_llong = (long_long)(*((double*)aligned));
break;
case FLT_LDOUBLE:
memcpy(aligned, saved+j*sizeof(long double), sizeof(double));
hw_llong = (long long)(*((long double*)aligned));
hw_llong = (long_long)(*((long double*)aligned));
break;
default:
break;
@ -4406,15 +4406,15 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst)
switch (src_type) {
case FLT_FLOAT:
memcpy(aligned, saved+j*sizeof(float), sizeof(float));
hw_ullong = (unsigned long long)(*((float*)aligned));
hw_ullong = (unsigned long_long)(*((float*)aligned));
break;
case FLT_DOUBLE:
memcpy(aligned, saved+j*sizeof(double), sizeof(double));
hw_ullong = (unsigned long long)(*((double*)aligned));
hw_ullong = (unsigned long_long)(*((double*)aligned));
break;
case FLT_LDOUBLE:
memcpy(aligned, saved+j*sizeof(long double), sizeof(double));
hw_ullong = (unsigned long long)(*((long double*)aligned));
hw_ullong = (unsigned long_long)(*((long double*)aligned));
break;
default:
break;
@ -4675,10 +4675,10 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)hw));
break;
case INT_LLONG:
printf(" %29ld\n", *((long long*)hw));
printf(" %29ld\n", *((long_long*)hw));
break;
case INT_ULLONG:
printf(" %29ld\n", *((unsigned long long*)hw));
printf(" %29ld\n", *((unsigned long_long*)hw));
break;
case FLT_FLOAT:
printf(" %29f\n", *((float*)hw));

6
test/tfile.c
View File

@ -53,7 +53,7 @@
#define F3_SYM_INTERN_K F2_SYM_INTERN_K
#define FILE3 "tfile3.h5"
#define GROUP_NAME "/group"
#define GRP_NAME "/group"
#define DSET_NAME "dataset"
#define ATTR_NAME "attr"
#define TYPE_NAME "type"
@ -848,7 +848,7 @@ test_get_file_id(void)
/* Create a group in the file. Make a duplicated file ID from the group.
* And close this duplicated ID
*/
group_id = H5Gcreate(fid, GROUP_NAME, 0);
group_id = H5Gcreate(fid, GRP_NAME, 0);
CHECK(group_id, FAIL, "H5Gcreate");
/* Test H5Iget_file_id() */
@ -868,7 +868,7 @@ test_get_file_id(void)
fid = H5Fopen(FILE4, H5F_ACC_RDWR, H5P_DEFAULT);
CHECK(fid, FAIL, "H5Fcreate");
group_id = H5Gopen(fid, GROUP_NAME);
group_id = H5Gopen(fid, GRP_NAME);
CHECK(group_id, FAIL, "H5Gcreate");
/* Test H5Iget_file_id() */