[svn-r10736] Purpose:

    Code cleanup

Description:
    Clean up some compiler warnings

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    h5committest

1 files changed, 16 insertions, 24 deletions

diff --git a/test/dt_atomic.c b/test/dt_atomic.c
index 7348a9f..31a7c76 100644
--- a/test/dt_atomic.c
+++ b/test/dt_atomic.c
@@ -275,7 +275,7 @@ static int without_hardware_g = 0;
 #define INIT_FP_SPECIAL(SRC_SIZE, SRC_PREC, SRC_ORDR, SRC_MANT_DIG, DST_SIZE,                   \
             BUF, SAVED, NELMTS)                                                                 \
 {                                                                                               \
-    unsigned char *buf_p, *saved_p;                                                             \
+    unsigned char *buf_p;                                                                       \
     unsigned char *value;                                                                       \
     int n;                                                                                      \
                                                                                                 \
@@ -291,7 +291,6 @@ static int without_hardware_g = 0;
     value = (unsigned char*)calloc(SRC_SIZE, sizeof(unsigned char));                            \
                                                                                                 \
     buf_p = BUF;                                                                                \
-    saved_p = SAVED;                                                                            \
                                                                                                 \
     /* +0 */                                                                                    \
     H5T_bit_set(value, 0, SRC_PREC, FALSE);                                                     \
@@ -562,8 +561,7 @@ test_derived_flt(void)
     hid_t       file=-1, tid1=-1, tid2=-1;
     hid_t       dxpl_id=-1;
     char        filename[1024];
-    size_t      precision, spos, epos, esize, mpos, msize, size, ebias;
-    int         offset;
+    size_t      spos, epos, esize, mpos, msize, size;
     size_t      src_size, dst_size;
     unsigned char        *buf=NULL, *saved_buf=NULL;
     int         *aligned=NULL;
@@ -679,12 +677,12 @@ test_derived_flt(void)
         goto error;
     }
 
-    if((precision = H5Tget_precision(tid1))!=42) {
+    if(H5Tget_precision(tid1)!=42) {
         H5_FAILED();
         printf("Can't get precision or wrong precision\n");
         goto error; 
     }
-    if((offset = H5Tget_offset(tid1))!=3) {
+    if(H5Tget_offset(tid1)!=3) {
         H5_FAILED();
         printf("Can't get offset or wrong offset\n");
         goto error; 
@@ -694,7 +692,7 @@ test_derived_flt(void)
         printf("Can't get size or wrong size\n");
         goto error;
     }
-    if((ebias = H5Tget_ebias(tid1))!=511) {
+    if(H5Tget_ebias(tid1)!=511) {
         H5_FAILED();
         printf("Can't get exponent bias or wrong bias\n");
         goto error; 
@@ -841,12 +839,12 @@ test_derived_flt(void)
         goto error;
     }
 
-    if((precision = H5Tget_precision(tid2))!=24) {
+    if(H5Tget_precision(tid2)!=24) {
         H5_FAILED();
         printf("Can't get precision or wrong precision\n");
         goto error; 
     }
-    if((offset = H5Tget_offset(tid2))!=0) {
+    if(H5Tget_offset(tid2)!=0) {
         H5_FAILED();
         printf("Can't get offset or wrong offset\n");
         goto error; 
@@ -856,7 +854,7 @@ test_derived_flt(void)
         printf("Can't get size or wrong size\n");
         goto error;
     }
-    if((ebias = H5Tget_ebias(tid2))!=63) {
+    if(H5Tget_ebias(tid2)!=63) {
         H5_FAILED();
         printf("Can't get exponent bias or wrong bias\n");
         goto error; 
@@ -1003,10 +1001,6 @@ test_derived_integer(void)
     hid_t       file=-1, tid1=-1, tid2=-1;
     hid_t       dxpl_id=-1;
     char        filename[1024];
-    size_t      precision, size;
-    int         offset;
-    H5T_order_t order;
-    H5T_sign_t  sign;
     size_t      src_size, dst_size;
     unsigned char        *buf=NULL, *saved_buf=NULL;
     int         *aligned=NULL;
@@ -1099,22 +1093,22 @@ test_derived_integer(void)
         goto error;
     }
 
-    if((precision = H5Tget_precision(tid1))!=24) {
+    if(H5Tget_precision(tid1)!=24) {
         H5_FAILED();
         printf("Can't get precision or wrong precision\n");
         goto error; 
     }
-    if((offset = H5Tget_offset(tid1))!=0) {
+    if(H5Tget_offset(tid1)!=0) {
         H5_FAILED();
         printf("Can't get offset or wrong offset\n");
         goto error; 
     }
-    if((size = H5Tget_size(tid1))!=3) {
+    if(H5Tget_size(tid1)!=3) {
         H5_FAILED();
         printf("Can't get size or wrong size\n");
         goto error;
     }
-    if((order = H5Tget_order(tid1))!=H5T_ORDER_BE) {
+    if(H5Tget_order(tid1)!=H5T_ORDER_BE) {
         H5_FAILED();
         printf("Can't get order or wrong order\n");
         goto error;
@@ -1164,22 +1158,22 @@ test_derived_integer(void)
         goto error;
     }
   
-    if((precision = H5Tget_precision(tid2))!=48) {
+    if(H5Tget_precision(tid2)!=48) {
         H5_FAILED();
         printf("Can't get precision or wrong precision\n");
         goto error; 
     }
-    if((offset = H5Tget_offset(tid2))!=10) {
+    if(H5Tget_offset(tid2)!=10) {
         H5_FAILED();
         printf("Can't get offset or wrong offset\n");
         goto error; 
     }
-    if((size = H5Tget_size(tid2))!=8) {
+    if(H5Tget_size(tid2)!=8) {
         H5_FAILED();
         printf("Can't get size or wrong size\n");
         goto error;
     }
-    if((sign = H5Tget_sign(tid2))!=H5T_SGN_2) {
+    if(H5Tget_sign(tid2)!=H5T_SGN_2) {
         H5_FAILED();
         printf("Can't get sign or wrong sign\n");
         goto error;
@@ -4476,13 +4470,11 @@ int
 main(void)
 {
     unsigned long	nerrors = 0;
-    hid_t		fapl=-1;
 
     /* Set the random # seed */
     HDsrandom((unsigned long)HDtime(NULL));
 
     reset_hdf5();
-    fapl = h5_fileaccess();
 
     if (ALIGNMENT)
 	printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);