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.
This commit is contained in:
Rob Landley 2006-05-28 01:56:08 +00:00
parent 0fbe7ddbdd
commit 81dab2cf83
4 changed files with 5 additions and 6 deletions

View File

@ -9,7 +9,6 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h>
#include "busybox.h" #include "busybox.h"
int cksum_main(int argc, char **argv) { int cksum_main(int argc, char **argv) {

View File

@ -1,5 +1,4 @@
#include <sys/types.h> #include <sys/types.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

View File

@ -24,6 +24,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <inttypes.h>
#include <sys/time.h> #include <sys/time.h>
#include "bb_config.h" #include "bb_config.h"

View File

@ -825,17 +825,17 @@ static void identify(uint16_t *id_supplied)
(uint64_t)val[LBA_48_MSB] << 32 | (uint64_t)val[LBA_48_MSB] << 32 |
(uint64_t)val[LBA_MID] << 16 | (uint64_t)val[LBA_MID] << 16 |
val[LBA_LSB] ; 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) if (!bbbig)
bbbig = (uint64_t)(ll>mm ? ll : mm); /* # 512 byte blocks */ 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; 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) if (bbbig > 1000)
printf("(%llu GB)\n", (long long unsigned int)bbbig/1000); printf("(%"PRIu64" GB)\n", bbbig/1000);
else else
printf("\n"); printf("\n");
} }