diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-30 04:11:10 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-30 04:11:10 (GMT) |
commit | 49d1722c303c7aed3b02052448111a0d1241df7a (patch) | |
tree | 848ea2afd8fa4cb38d60f97ab3cb43b11d5a579b /tools/h5import | |
parent | 855dd92b0e72771df86ec81f5334ffd2add1bfb7 (diff) | |
download | hdf5-49d1722c303c7aed3b02052448111a0d1241df7a.zip hdf5-49d1722c303c7aed3b02052448111a0d1241df7a.tar.gz hdf5-49d1722c303c7aed3b02052448111a0d1241df7a.tar.bz2 |
[svn-r18195] Description:
Remove trailing whitespace from source code files.
Tested on:
None - just eyeballed
Diffstat (limited to 'tools/h5import')
-rwxr-xr-x | tools/h5import/h5import.c | 34 | ||||
-rwxr-xr-x | tools/h5import/h5importtest.c | 50 |
2 files changed, 42 insertions, 42 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index d1b15bb..6352c52 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) { print_version("h5import"); exit(EXIT_SUCCESS); - + } /* @@ -292,19 +292,19 @@ processDataFile(char *infile, struct Input *in, FILE **strm, hid_t file_id) /*------------------------------------------------------------------------- * special case for opening binary classes in WIN32 * "FP" denotes a floating point binary file, - * "IN" denotes a signed integer binary file, + * "IN" denotes a signed integer binary file, * "UIN" denotes an unsigned integer binary file, *------------------------------------------------------------------------- */ if ( in->inputClass == 4 /* "IN" */ || in->inputClass == 3 /* "FP" */ || - in->inputClass == 7 /* "UIN" */ - + in->inputClass == 7 /* "UIN" */ + ) { #ifdef WIN32 - + if ((*strm = fopen(infile, "rb")) == NULL) { (void) fprintf(stderr, err1, infile); @@ -852,20 +852,20 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id) char str[1024]; char c; int i = 0, j, nlines = 0, line; - + /*------------------------------------------------------------------------- * get number of lines in the input file *------------------------------------------------------------------------- */ - while ( !feof( *strm ) ) + while ( !feof( *strm ) ) { c = fgetc( *strm ); - + if ( c == 10 ) /* eol */ { nlines++; - + } } @@ -890,9 +890,9 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id) goto out; /* disable error reporting */ - H5E_BEGIN_TRY + H5E_BEGIN_TRY { - + /* create parent groups */ if(in->path.count > 1) { j = 0; @@ -913,7 +913,7 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id) handle = file_id; j = 0; } - + /*enable error reporting */ } H5E_END_TRY; @@ -930,11 +930,11 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id) while(!feof(*strm)) { c = fgetc(*strm); - + str[i] = c; - + i++; - + if(c == 10) /* eol */ { char *str2 = str; @@ -960,11 +960,11 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id) i = 0; str[ 0 ] = '\0'; - + } } - + /* close */ H5Dclose(dset_id); H5Sclose(space_id); diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c index 9272632..0b0ba9c 100755 --- a/tools/h5import/h5importtest.c +++ b/tools/h5import/h5importtest.c @@ -32,40 +32,40 @@ main(void) int nrow = 3, ncol = 4, npln = 5; int i, j, k; FILE *sp; - + float b32r3[5][3][4]; float row4[3], col4[4], pln4[5]; float rowo4 = (float)11.0e0, colo4 = (float)21.0e0, plno4 = (float)51.0e0; float rowi4 = (float)1.0e0, coli4 = (float)2.0e0, plni4 = (float)5.0e0; - + int b32i3[5][3][4]; int row4i[3], col4i[4], pln4i[5]; int rowo4i = (int)11 , colo4i = (int)21 , plno4i = (int)51 ; int rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ; - + #ifndef WIN32 long_long b64i2[3][4], b64i3[5][3][4]; long_long row4i64[3], col4i64[4], pln4i64[5]; long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ; long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ; #endif - + short b16i3[5][3][4]; short row4i16[3], col4i16[4], pln4i16[5]; short rowo4i16 = (short)11 , colo4i16 = (short)21 , plno4i16 = (short)51 ; short rowi4i16 = (short)1 , coli4i16 = (short)2 , plni4i16 = (short)5 ; - + char b8i3[5][3][4]; char row4i8[3], col4i8[4], pln4i8[5]; char rowo4i8 = (char)11 , colo4i8 = (char)21 , plno4i8 = (char)51 ; char rowi4i8 = (char)1 , coli4i8 = (char)2 , plni4i8 = (char)5 ; - + double b64r3[5][3][4]; double row8[3], col8[4], pln8[5]; double rowo8 = 11.0e0, colo8 = 21.0e0, plno8 = 51.0e0; double rowi8 = 1.0e0, coli8 = 2.0e0, plni8 = 5.0e0; - - + + /* * initialize the row, column, and plane vectors * @@ -73,40 +73,40 @@ main(void) * column values start at 21 and increment by 2 => 21, 23, 25, 27 * plane values start at 51 and increment by 5 => 51, 56, 61, 66, 71 */ - - + + /* * build array elements - rank 2 * * element value = sum of row value and col values */ - + row4[0] = rowo4; col4[0] = colo4; pln4[0] = plno4; - + row8[0] = rowo8; col8[0] = colo8; pln8[0] = plno8; - + row4i[0] = rowo4i; col4i[0] = colo4i; pln4i[0] = plno4i; - + #ifndef WIN32 row4i64[0] = rowo4i64; col4i64[0] = colo4i64; pln4i64[0] = plno4i64; #endif - + row4i16[0] = rowo4i16; col4i16[0] = colo4i16; pln4i16[0] = plno4i16; - + row4i8[0] = rowo4i8; col4i8[0] = colo4i8; pln4i8[0] = plno4i8; - + for (i = 1; i < nrow; i++) { row4[i] = row4[i - 1] + rowi4; @@ -157,7 +157,7 @@ main(void) * * element value = sum of row value, col, and plane values */ - + for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) @@ -176,7 +176,7 @@ main(void) } } - + #ifndef UNICOS @@ -222,7 +222,7 @@ main(void) *------------------------------------------------------------------------- */ -#ifdef WIN32 +#ifdef WIN32 sp = fopen("binin32.bin", "wb"); #else sp = fopen("binin32.bin", "w"); @@ -244,7 +244,7 @@ main(void) *------------------------------------------------------------------------- */ -#ifdef WIN32 +#ifdef WIN32 sp = fopen("binuin32.bin", "wb"); #else sp = fopen("binuin32.bin", "w"); @@ -269,7 +269,7 @@ main(void) *------------------------------------------------------------------------- */ -#ifdef WIN32 +#ifdef WIN32 sp = fopen("binin16.bin", "wb"); #else sp = fopen("binin16.bin", "w"); @@ -372,7 +372,7 @@ main(void) { /* test CR+LF (13,10) and EOF (26) in windows */ char bin8w[4] = {13,10,26,0}; - + #ifdef WIN32 sp = fopen("binin8w.bin", "wb"); #else @@ -385,8 +385,8 @@ main(void) printf("error writing file\n"); } fclose(sp); - - + + } |