diff options
Diffstat (limited to 'libdiskconfig')
| -rw-r--r-- | libdiskconfig/Android.mk | 1 | ||||
| -rw-r--r-- | libdiskconfig/diskconfig.c | 4 | ||||
| -rw-r--r-- | libdiskconfig/diskutils.c | 13 | ||||
| -rw-r--r-- | libdiskconfig/write_lst.c | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk index b5d83fa..624e385 100644 --- a/libdiskconfig/Android.mk +++ b/libdiskconfig/Android.mk @@ -12,6 +12,7 @@ LOCAL_SRC_FILES := $(commonSources) LOCAL_MODULE := libdiskconfig LOCAL_MODULE_TAGS := optional LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc +LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) ifeq ($(HOST_OS),linux) diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c index 6fd81b7..1167d4b 100644 --- a/libdiskconfig/diskconfig.c +++ b/libdiskconfig/diskconfig.c @@ -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 diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c index e325735..5d0ee62 100644 --- a/libdiskconfig/diskutils.c +++ b/libdiskconfig/diskutils.c @@ -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,12 +36,12 @@ 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; - ALOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, offset); + ALOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, (unsigned long long)offset); if ((src_fd = open(src, O_RDONLY)) < 0) { ALOGE("Could not open %s for reading (errno=%d).", src, errno); goto fail; @@ -53,7 +54,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) } if (lseek64(dst_fd, offset, SEEK_SET) != offset) { - ALOGE("Could not seek to offset %lld in %s.", offset, dst); + ALOGE("Could not seek to offset %lld in %s.", (long long)offset, dst); goto fail; } } @@ -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, (long long)offset); close(src_fd); if (dst_fd >= 0) diff --git a/libdiskconfig/write_lst.c b/libdiskconfig/write_lst.c index 826ef7a..90b1c82 100644 --- a/libdiskconfig/write_lst.c +++ b/libdiskconfig/write_lst.c @@ -71,18 +71,18 @@ wlist_commit(int fd, struct write_list *lst, int test) { for(; lst; lst = lst->next) { if (lseek64(fd, lst->offset, SEEK_SET) != (loff_t)lst->offset) { - ALOGE("Cannot seek to the specified position (%lld).", lst->offset); + ALOGE("Cannot seek to the specified position (%lld).", (long long)lst->offset); goto fail; } if (!test) { if (write(fd, lst->data, lst->len) != (int)lst->len) { ALOGE("Failed writing %u bytes at position %lld.", lst->len, - lst->offset); + (long long)lst->offset); goto fail; } } else - ALOGI("Would write %d bytes @ offset %lld.", lst->len, lst->offset); + ALOGI("Would write %d bytes @ offset %lld.", lst->len, (long long)lst->offset); } return 0; |