[svn-r27038] Merge of r26393-27031 from the trunk.

Tested on 64-bit linux VM w/ C++ and Fortran 2003

1 files changed, 31 insertions, 35 deletions

diff --git a/tools/h5dump/binread.c b/tools/h5dump/binread.c
index 5abb9af..74db92c 100644
--- a/tools/h5dump/binread.c
+++ b/tools/h5dump/binread.c
@@ -49,8 +49,7 @@
 static void
 usage (void)
 {
- fprintf(stderr, "\
- usage: binread FILE_NAME\n");
+    fprintf(stderr, "usage: binread FILE_NAME\n");
 }
 
 /*-------------------------------------------------------------------------
@@ -64,38 +63,35 @@ usage (void)
 int
 main (int argc, const char *argv[])
 {
- FILE  *stream;
- int    numread;
- TYPE   buf[NELMTS];
- size_t i, nelmts = NELMTS;
- char  *fname=NULL;
-
- if (argc != 2)
- {
-  usage();
-  exit(1);
- }
-
- fname = strdup(argv[1]);
-
- if( (stream = fopen(fname, "rb" )) != NULL )
- {
-  numread = fread( buf, sizeof( TYPE ), nelmts, stream );
-  printf( "Number of items read = %d\n", numread );
-
-  for (i = 0; i < nelmts; i++)
-  {
-   printf(FORMAT,buf[i]);
-  }
-  printf("\n");
-
-  fclose( stream );
- }
- else
-  printf( "File %s could not be opened\n",fname );
-
- free(fname);
-
- return 0;
+    FILE  *stream;
+    size_t numread;
+    TYPE   buf[NELMTS];
+    size_t i, nelmts = NELMTS;
+    char  *fname=NULL;
+
+    if (argc != 2) {
+        usage();
+        exit(1);
+    }
+
+    fname = strdup(argv[1]);
+
+    if((stream = fopen(fname, "rb")) != NULL) {
+        numread = fread(buf, sizeof( TYPE ), nelmts, stream);
+        printf("Number of items read = %llu\n", (unsigned long long)numread);
+
+        for (i = 0; i < nelmts; i++) {
+            printf(FORMAT,buf[i]);
+        }
+        printf("\n");
+
+        fclose(stream);
+    }
+    else
+        printf("File %s could not be opened\n", fname);
+
+    free(fname);
+
+    return 0;
 }