Fix hdparm to use PRIu64 instead of typecasting to long long (which is 128 bits

on 64 bit platforms), and move #include <inttypes.h> to libbb.h.


git-svn-id: svn://busybox.net/trunk/busybox@15208 69ca8d6d-28ef-0310-b511-8ec308f3f277

4 files changed, 5 insertions, 6 deletions

diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 194ea7d2a..1396a5d5b 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <inttypes.h>
 #include "busybox.h"
 
 int cksum_main(int argc, char **argv) {
diff --git a/e2fsprogs/e2fsck.h b/e2fsprogs/e2fsck.h
index b480d8fa5..4bfe7600e 100644
--- a/e2fsprogs/e2fsck.h
+++ b/e2fsprogs/e2fsck.h
@@ -1,5 +1,4 @@
 #include <sys/types.h>
-#include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/include/libbb.h b/include/libbb.h
index fdb20227d..5f2309a25 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -24,6 +24,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
+#include <inttypes.h>
 #include <sys/time.h>
 
 #include "bb_config.h"
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 7511f35a3..ea73701c3 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -825,17 +825,17 @@ static void identify(uint16_t *id_supplied)
                                 (uint64_t)val[LBA_48_MSB]       << 32 |
                                 (uint64_t)val[LBA_MID]  << 16 |
                                         val[LBA_LSB] ;
-                        printf("\tLBA48  user addressable sectors:%11llu\n",(long long unsigned int)bbbig);
+                        printf("\tLBA48  user addressable sectors:%11"PRIu64"\n",bbbig);
                 }
 
                 if (!bbbig)
                         bbbig = (uint64_t)(ll>mm ? ll : mm); /* # 512 byte blocks */
-                printf("\tdevice size with M = 1024*1024: %11llu MBytes\n",(long long unsigned int)(bbbig>>11));
+                printf("\tdevice size with M = 1024*1024: %11"PRIu64" MBytes\n",bbbig>>11);
                 bbbig = (bbbig<<9)/1000000;
-                printf("\tdevice size with M = 1000*1000: %11llu MBytes ",(long long unsigned int)bbbig);
+                printf("\tdevice size with M = 1000*1000: %11"PRIu64" MBytes ",bbbig);
 
                 if (bbbig > 1000)
-                        printf("(%llu GB)\n", (long long unsigned int)bbbig/1000);
+                        printf("(%"PRIu64" GB)\n", bbbig/1000);
                 else 
                         printf("\n");
         }