tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

Browse source 
* commit '6ab10a1c17d048e88f929d35293d266b6480f6d6':
  libdiskconfig: 64-bit issues
This commit is contained in:
Mark Salyzyn 2014-03-14 01:08:56 +00:00 committed by Android Git Automerger
commit f37986e26b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdiskconfig/diskconfig.c
View file

@ -30,7 +30,7 @@
#include <linux/fs.h>
#include <cutils/config_utils.h>
#include <cutils/log.h>
#include <log/log.h>
#include <diskconfig/diskconfig.h>
@ -337,7 +337,7 @@ validate(struct disk_info *dinfo)
}
#if 1
ALOGV("Device/file %s: size=%llu bytes, num_lba=%u, sect_size=%d",
ALOGV("Device/file %s: size=%" PRIu64 " bytes, num_lba=%u, sect_size=%d",
dinfo->device, disk_size, dinfo->num_lba, dinfo->sect_size);
#endif

9
libdiskconfig/diskutils.c
View file

@ -19,13 +19,14 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <cutils/log.h>
#include <log/log.h>
#include <diskconfig/diskconfig.h>
@ -35,8 +36,8 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test)
int dst_fd = -1;
int src_fd = -1;
uint8_t buffer[2048];
int nr_bytes;
int tmp;
ssize_t nr_bytes;
ssize_t tmp;
int done = 0;
uint64_t total = 0;
@ -101,7 +102,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test)
if (dst_fd >= 0)
fsync(dst_fd);
ALOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset);
ALOGI("Wrote %" PRIu64 " bytes to %s @ %lld", total, dst, offset);
close(src_fd);
if (dst_fd >= 0)