Removed all void functions from tst programs. Thanks to solaris C compiler for being sensitive enough to notice this sort of thing.

This commit is contained in:
Ed Hartnett 2011-01-03 15:41:20 +00:00
parent 7f554f08ce
commit 659fd84edb
3 changed files with 10 additions and 5 deletions

View File

@ -36,7 +36,7 @@
#define DIM3 2000 /* DIM1*DIM2*DIM3 > 2**32 */ #define DIM3 2000 /* DIM1*DIM2*DIM3 > 2**32 */
static void static int
test_big_var(const char *testfile) test_big_var(const char *testfile)
{ {
int ncid, varid, dimids[NUMDIMS]; int ncid, varid, dimids[NUMDIMS];
@ -105,6 +105,7 @@ test_big_var(const char *testfile)
} }
} }
if (nc_close(ncid)) ERR; if (nc_close(ncid)) ERR;
return 0;
} }
int int

View File

@ -34,7 +34,7 @@
* when creating a byte variable for which the product of dimensions * when creating a byte variable for which the product of dimensions
* is greater than 2**32. Check that this bug has been fixed. * is greater than 2**32. Check that this bug has been fixed.
*/ */
static void static int
test_big_var(const char *testfile) test_big_var(const char *testfile)
{ {
int ncid, varid, dimids[NUMDIMS]; int ncid, varid, dimids[NUMDIMS];
@ -60,6 +60,7 @@ test_big_var(const char *testfile)
if (nc_get_var1_int(ncid, varid, index, &nval_in)) ERR; if (nc_get_var1_int(ncid, varid, index, &nval_in)) ERR;
if (nval != nval_in) ERR; if (nval != nval_in) ERR;
if (nc_close(ncid)) ERR; if (nc_close(ncid)) ERR;
return 0;
} }
int int

View File

@ -33,7 +33,7 @@
* creating a variable for which the product of dimensions is exactly * creating a variable for which the product of dimensions is exactly
* 2**32. Check that this bug has been fixed. * 2**32. Check that this bug has been fixed.
*/ */
static void static int
test_big_var(const char *testfile) { test_big_var(const char *testfile) {
int ncid, varid, dimids[NUMDIMS]; int ncid, varid, dimids[NUMDIMS];
int cflag = NC_CLOBBER; int cflag = NC_CLOBBER;
@ -63,9 +63,10 @@ test_big_var(const char *testfile) {
if (nval != nval_in) if (nval != nval_in)
ERR; ERR;
if (nc_close(ncid)) ERR; if (nc_close(ncid)) ERR;
return 0;
} }
static void static int
test_large_byte_var(const char *testfile) { test_large_byte_var(const char *testfile) {
int ncid, varid, dimids[NUMDIMS]; int ncid, varid, dimids[NUMDIMS];
size_t index[NUMDIMS] = {0, 0}; size_t index[NUMDIMS] = {0, 0};
@ -102,9 +103,10 @@ test_large_byte_var(const char *testfile) {
if (char_val_in != 99) /* see above, the value written when start[0]==0, j==0 */ if (char_val_in != 99) /* see above, the value written when start[0]==0, j==0 */
ERR; ERR;
if (nc_close(ncid)) ERR; if (nc_close(ncid)) ERR;
return 0;
} }
static void static int
test_large_short_var(const char *testfile) { test_large_short_var(const char *testfile) {
int ncid, varid, dimids[NUMDIMS]; int ncid, varid, dimids[NUMDIMS];
int int_val_in, int_val_out = 99; int int_val_in, int_val_out = 99;
@ -133,6 +135,7 @@ test_large_short_var(const char *testfile) {
ERR; ERR;
#endif #endif
if (nc_close(ncid)) ERR; if (nc_close(ncid)) ERR;
return 0;
} }
#define FILE_NAME "tst_large.nc" #define FILE_NAME "tst_large.nc"