From 659fd84edbb33b7c78cf6fc3c11231b6496043fc Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Mon, 3 Jan 2011 15:41:20 +0000 Subject: [PATCH] Removed all void functions from tst programs. Thanks to solaris C compiler for being sensitive enough to notice this sort of thing. --- nc_test/tst_big_rvar.c | 3 ++- nc_test/tst_big_var.c | 3 ++- nc_test/tst_large.c | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nc_test/tst_big_rvar.c b/nc_test/tst_big_rvar.c index b1e19fbd2..8f8db0da5 100644 --- a/nc_test/tst_big_rvar.c +++ b/nc_test/tst_big_rvar.c @@ -36,7 +36,7 @@ #define DIM3 2000 /* DIM1*DIM2*DIM3 > 2**32 */ -static void +static int test_big_var(const char *testfile) { int ncid, varid, dimids[NUMDIMS]; @@ -105,6 +105,7 @@ test_big_var(const char *testfile) } } if (nc_close(ncid)) ERR; + return 0; } int diff --git a/nc_test/tst_big_var.c b/nc_test/tst_big_var.c index 346ce341b..6ba5f197e 100644 --- a/nc_test/tst_big_var.c +++ b/nc_test/tst_big_var.c @@ -34,7 +34,7 @@ * when creating a byte variable for which the product of dimensions * is greater than 2**32. Check that this bug has been fixed. */ -static void +static int test_big_var(const char *testfile) { 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 (nval != nval_in) ERR; if (nc_close(ncid)) ERR; + return 0; } int diff --git a/nc_test/tst_large.c b/nc_test/tst_large.c index cd46a7750..8e0ce595c 100644 --- a/nc_test/tst_large.c +++ b/nc_test/tst_large.c @@ -33,7 +33,7 @@ * creating a variable for which the product of dimensions is exactly * 2**32. Check that this bug has been fixed. */ -static void +static int test_big_var(const char *testfile) { int ncid, varid, dimids[NUMDIMS]; int cflag = NC_CLOBBER; @@ -63,9 +63,10 @@ test_big_var(const char *testfile) { if (nval != nval_in) ERR; if (nc_close(ncid)) ERR; + return 0; } -static void +static int test_large_byte_var(const char *testfile) { int ncid, varid, dimids[NUMDIMS]; 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 */ ERR; if (nc_close(ncid)) ERR; + return 0; } -static void +static int test_large_short_var(const char *testfile) { int ncid, varid, dimids[NUMDIMS]; int int_val_in, int_val_out = 99; @@ -133,6 +135,7 @@ test_large_short_var(const char *testfile) { ERR; #endif if (nc_close(ncid)) ERR; + return 0; } #define FILE_NAME "tst_large.nc"