From 9af4e3c3b2ddcf5ead6d26179c142386244d1458 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Wed, 21 Oct 2009 14:04:25 -0500
Subject: [svn-r17719] Cosmetic change to use exit(EXIT_FAILURE) instead of
 exit(1). Also a lot of reformating that do not change code.

Tested: jam-pp.
---
 perform/pio_engine.c | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 6124bce..27606d0 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -107,12 +107,7 @@ static int  clean_file_g = -1;  /*whether to cleanup temporary test     */
  * is about the best guess.
  */
 #ifndef HDF5_PARAPREFIX
-#  ifdef __PUMAGON__
-/* For the PFS of TFLOPS */
-#    define HDF5_PARAPREFIX     "pfs:/pfs_grande/multi/tmp_1"
-#  else
 #    define HDF5_PARAPREFIX     ""
-#  endif    /* __PUMAGON__ */
 #endif  /* !HDF5_PARAPREFIX */
 
 #ifndef MIN
@@ -248,26 +243,26 @@ do_pio(parameters param)
     /* Validate transfer buffer size & block size*/
     if(blk_size<=0) {
     HDfprintf(stderr,
-        "Transfer block size (%Hd) must be > 0\n", (long_long)blk_size);
+        "Transfer block size (%Hd) must be > 0\n", (long long)blk_size);
     GOTOERROR(FAIL);
     }
     if(buf_size<=0) {
     HDfprintf(stderr,
-        "Transfer buffer size (%Hd) must be > 0\n", (long_long)buf_size);
+        "Transfer buffer size (%Hd) must be > 0\n", (long long)buf_size);
     GOTOERROR(FAIL);
     }
     if ((buf_size % blk_size) != 0){
     HDfprintf(stderr,
         "Transfer buffer size (%Hd) must be a multiple of the "
         "interleaved I/O block size (%Hd)\n",
-        (long_long)buf_size, (long_long)blk_size);
+        (long long)buf_size, (long long)blk_size);
     GOTOERROR(FAIL);
     }
     if((snbytes%pio_mpi_nprocs_g)!=0) {
     HDfprintf(stderr,
         "Dataset size (%Hd) must be a multiple of the "
         "number of processes (%d)\n",
-        (long_long)snbytes, pio_mpi_nprocs_g);
+        (long long)snbytes, pio_mpi_nprocs_g);
     GOTOERROR(FAIL);
     }
 
@@ -276,7 +271,7 @@ do_pio(parameters param)
         HDfprintf(stderr,
             "Dataset size/process (%Hd) must be a multiple of the "
             "trasfer buffer size (%Hd)\n",
-            (long_long)(snbytes/pio_mpi_nprocs_g), (long_long)buf_size);
+            (long long)(snbytes/pio_mpi_nprocs_g), (long long)buf_size);
         GOTOERROR(FAIL);
         }
     }
@@ -285,7 +280,7 @@ do_pio(parameters param)
         HDfprintf(stderr,
             "Dataset side size (%Hd) must be a multiple of the "
             "trasfer buffer size (%Hd)\n",
-            (long_long)snbytes, (long_long)buf_size);
+            (long long)snbytes, (long long)buf_size);
         GOTOERROR(FAIL);
         }
     }
@@ -293,7 +288,7 @@ do_pio(parameters param)
     /* Allocate transfer buffer */
     if ((buffer = malloc(bsize)) == NULL){
     HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
-        (long_long)(bsize));
+        (long long)(bsize));
     GOTOERROR(FAIL);
     }
 
@@ -651,13 +646,13 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         if (!parms->dim2d) {
         HDfprintf(output, "Debug(do_write): "
             "buf_size=%Hd, bytes_begin=%Hd, bytes_count=%Hd\n",
-            (long_long)buf_size, (long_long)bytes_begin[0],
-            (long_long)bytes_count);
+            (long long)buf_size, (long long)bytes_begin[0],
+            (long long)bytes_count);
         } else {
         HDfprintf(output, "Debug(do_write): "
             "linear buf_size=%Hd, bytes_begin=(%Hd,%Hd), bytes_count=%Hd\n",
-            (long_long)buf_size*blk_size, (long_long)bytes_begin[0],
-            (long_long)bytes_begin[1], (long_long)bytes_count);
+            (long long)buf_size*blk_size, (long long)bytes_begin[0],
+            (long long)bytes_begin[1], (long long)bytes_count);
         }
     }
 
@@ -1625,13 +1620,13 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         if (!parms->dim2d) {
         HDfprintf(output, "Debug(do_write): "
             "buf_size=%Hd, bytes_begin=%Hd, bytes_count=%Hd\n",
-            (long_long)buf_size, (long_long)bytes_begin[0],
-            (long_long)bytes_count);
+            (long long)buf_size, (long long)bytes_begin[0],
+            (long long)bytes_count);
         } else {
         HDfprintf(output, "Debug(do_write): "
             "linear buf_size=%Hd, bytes_begin=(%Hd,%Hd), bytes_count=%Hd\n",
-            (long_long)buf_size*blk_size, (long_long)bytes_begin[0],
-            (long_long)bytes_begin[1], (long_long)bytes_count);
+            (long long)buf_size*blk_size, (long long)bytes_begin[0],
+            (long long)bytes_begin[1], (long long)bytes_count);
         }
     }
 
@@ -2337,8 +2332,8 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                 HDprint_rank(output);
                 HDfprintf(output, "read data error, expected (%Hd), "
                     "got (%Hd)\n",
-                    (long_long)pio_mpi_rank_g+1,
-                    (long_long)*(ucharptr-1));
+                    (long long)pio_mpi_rank_g+1,
+                    (long long)*(ucharptr-1));
             } /* end if */
             } /* end if */
         } /* end for */
@@ -3033,7 +3028,7 @@ gpfs_invalidate_file_cache(const char *filename)
         filename);
     fprintf(stderr, " errno=%d errorOffset=%d\n",
         errno, inv_cache_hint.hdr.errorOffset);
-    exit(1);
+    exit(EXIT_FAILURE);
     }
 
     /* Close the file */
@@ -3042,7 +3037,7 @@ gpfs_invalidate_file_cache(const char *filename)
         "could not close file '%s' after flushing file cache, ",
         filename);
     fprintf(stderr, "errno=%d\n", errno);
-    exit(1);
+    exit(EXIT_FAILURE);
     }
 }
 
-- 
cgit v0.12