[svn-r28599] Normalization of tools with revise_chunks.

Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
           serial only, autotools and CMake (3.3.2)

1 files changed, 84 insertions, 115 deletions

diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index ab38f65..4509734 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -21,9 +21,6 @@
 /* Name of tool */
 #define PROGRAMNAME "h5jam"
 
-#define TRUE 1
-#define FALSE 0
-
 hsize_t write_pad (int, hsize_t);
 hsize_t compute_user_block_size (hsize_t);
 hsize_t copy_some_to_file (int, int, hsize_t, hsize_t, ssize_t);
@@ -421,109 +418,88 @@ main (int argc, const char *argv[])
  * Return:      Success:    last byte written in the output.
  *              Failure:    Exits program with EXIT_FAILURE value.
  *
- * Programmer:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hsize_t
-copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout,
+copy_some_to_file(int infid, int outfid, hsize_t startin, hsize_t startout,
        ssize_t limit)
 {
-  char buf[1024];
-  h5_stat_t sbuf;
-  int res;
-  ssize_t tot = 0;
-  ssize_t howmuch = 0;
-  ssize_t nchars = -1;
-/* used in assertion check
-  ssize_t ncw = -1;
-*/
-  ssize_t to;
-  ssize_t from;
-  ssize_t toend;
-  ssize_t fromend;
-
-  if(startin > startout) {
-      /* this case is prohibited */
-      error_msg("copy_some_to_file: panic: startin > startout?\n");
-      exit (EXIT_FAILURE);
-    }
-
-  if(limit < 0) {
-      res = HDfstat(infid, &sbuf);
-      if(res < 0) {
-    error_msg("Can't stat file \n");
-    exit (EXIT_FAILURE);
-  }
-
-      howmuch = (ssize_t)sbuf.st_size;
-    }
-  else
-      howmuch = limit;
-
-  if(howmuch == 0)
-      return 0;
-
-  /* assert (howmuch > 0) */
-
-  toend = (ssize_t) startout + howmuch;
-  fromend = (ssize_t) startin + howmuch;
-
-  if (howmuch > 512)
-    {
-      to = toend - 512;
-      from = fromend - 512;
-    }
-  else
-    {
-      to = toend - howmuch;
-      from = fromend - howmuch;
-    }
-
-  while (howmuch > 0)
-    {
-      HDlseek (outfid, (off_t) to, SEEK_SET);
-      HDlseek (infid, (off_t) from, SEEK_SET);
-
-      if (howmuch > 512)
-  {
-    nchars = HDread (infid, buf, (unsigned) 512);
-  }
-      else
-  {
-    nchars = HDread (infid, buf, (unsigned)howmuch);
-  }
-
-      if (nchars <= 0)
-  {
-    printf ("huh? \n");
-    exit (EXIT_FAILURE);
-  }
-      /*ncw = */ HDwrite (outfid, buf, (unsigned) nchars);
-
-      /* assert (ncw == nchars) */
-
-      tot += nchars;
-      howmuch -= nchars;
-      if (howmuch > 512)
-  {
-    to -= nchars;
-    from -= nchars;
-  }
-      else
-  {
-    to -= howmuch;
-    from -= howmuch;
-  }
-    }
+    char buf[1024];
+    h5_stat_t sbuf;
+    int res;
+    ssize_t tot = 0;
+    ssize_t howmuch = 0;
+    ssize_t nchars = -1;
+    ssize_t to;
+    ssize_t from;
+    ssize_t toend;
+    ssize_t fromend;
+
+    if(startin > startout) {
+        /* this case is prohibited */
+        error_msg("copy_some_to_file: panic: startin > startout?\n");
+        exit (EXIT_FAILURE);
+    } /* end if */
+
+    if(limit < 0) {
+        res = HDfstat(infid, &sbuf);
+        if(res < 0) {
+            error_msg("Can't stat file \n");
+            HDexit(EXIT_FAILURE);
+        } /* end if */
+
+        howmuch = (ssize_t)sbuf.st_size;
+    } else {
+        howmuch = limit;
+    } /* end if */
+
+    if(0 == howmuch)
+        return 0;
+
+    toend = (ssize_t) startout + howmuch;
+    fromend = (ssize_t) startin + howmuch;
+
+    if (howmuch > 512) {
+        to = toend - 512;
+        from = fromend - 512;
+    } else {
+        to = toend - howmuch;
+        from = fromend - howmuch;
+    } /* end if */
+
+    while (howmuch > 0) {
+        HDlseek(outfid, (off_t) to, SEEK_SET);
+        HDlseek(infid, (off_t) from, SEEK_SET);
+
+        if (howmuch > 512) {
+            nchars = HDread(infid, buf, (unsigned) 512);
+        } else {
+            nchars = HDread(infid, buf, (unsigned)howmuch);
+        } /* end if */
+
+        if (nchars <= 0) {
+            error_msg("Read error \n");
+            HDexit(EXIT_FAILURE);
+        } /* end if */
+
+        if(HDwrite (outfid, buf, (unsigned) nchars) < 0) {
+            error_msg("Write error \n");
+            HDexit(EXIT_FAILURE);
+        }
 
-  /* assert howmuch == 0 */
-  /* assert tot == limit */
+        tot += nchars;
+        howmuch -= nchars;
+        if(howmuch > 512) {
+            to -= nchars;
+            from -= nchars;
+        } else {
+            to -= howmuch;
+            from -= howmuch;
+        } /* end if */
+    } /* end while */
 
-  return ((hsize_t) tot + (hsize_t) startout);
-}
+    return (hsize_t)tot + (hsize_t)startout;
+} /* end copy_some_to_file() */
 
 
 /*-------------------------------------------------------------------------
@@ -539,28 +515,21 @@ copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout,
  *
  * Return:      Success:    last byte written in the output.
  *              Failure:    Exits program with EXIT_FAILURE value.
- *
- * Programmer:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-hsize_t
-compute_user_block_size (hsize_t ublock_size)
+H5_ATTR_CONST hsize_t
+compute_user_block_size(hsize_t ublock_size)
 {
-  hsize_t where = 512;
+    hsize_t where = 512;
 
-  if (ublock_size == 0)
-    return 0;
+    if(0 == ublock_size)
+        return 0;
 
-  while (where < ublock_size)
-    {
-      where *= 2;
-    }
+    while(where < ublock_size)
+        where *= 2;
 
-  return (where);
-}
+    return where;
+} /* end compute_user_block_size() */
 
 /*
  *  Write zeroes to fill the file from 'where' to 512, 1024, etc. bytes.