diff options
author | Steve Block | 2012-01-04 13:19:03 -0600 |
---|---|---|
committer | Steve Block | 2012-01-04 13:23:34 -0600 |
commit | fe71a61e5b0cb666675900d206251a7c18ed944b (patch) | |
tree | e76dbede05c1e6b92ea4e05878745c6d21ed9d4b /libdiskconfig | |
parent | 8d66c49258ac4f59bd67c23c9c914cca81f85b01 (diff) | |
download | platform-system-core-fe71a61e5b0cb666675900d206251a7c18ed944b.tar.gz platform-system-core-fe71a61e5b0cb666675900d206251a7c18ed944b.tar.xz platform-system-core-fe71a61e5b0cb666675900d206251a7c18ed944b.zip |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I4951baa981f09a84ce483e3d1bd0f9ebe009035f
Diffstat (limited to 'libdiskconfig')
-rw-r--r-- | libdiskconfig/config_mbr.c | 2 | ||||
-rw-r--r-- | libdiskconfig/diskconfig.c | 2 | ||||
-rw-r--r-- | libdiskconfig/diskutils.c | 4 | ||||
-rw-r--r-- | libdiskconfig/write_lst.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c index 825ba6029..07bd6a79d 100644 --- a/libdiskconfig/config_mbr.c +++ b/libdiskconfig/config_mbr.c | |||
@@ -47,7 +47,7 @@ cfg_pentry(struct pc_partition *pentry, uint8_t status, uint8_t type, | |||
47 | pentry->start_lba = start; | 47 | pentry->start_lba = start; |
48 | pentry->len_lba = len; | 48 | pentry->len_lba = len; |
49 | 49 | ||
50 | LOGI("Configuring pentry. status=0x%x type=0x%x start_lba=%u len_lba=%u", | 50 | ALOGI("Configuring pentry. status=0x%x type=0x%x start_lba=%u len_lba=%u", |
51 | pentry->status, pentry->type, pentry->start_lba, pentry->len_lba); | 51 | pentry->status, pentry->type, pentry->start_lba, pentry->len_lba); |
52 | } | 52 | } |
53 | 53 | ||
diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c index aac3e699b..66bd0c39b 100644 --- a/libdiskconfig/diskconfig.c +++ b/libdiskconfig/diskconfig.c | |||
@@ -319,7 +319,7 @@ validate(struct disk_info *dinfo) | |||
319 | } else | 319 | } else |
320 | disk_size = (uint64_t)dinfo->num_lba * (uint64_t)dinfo->sect_size; | 320 | disk_size = (uint64_t)dinfo->num_lba * (uint64_t)dinfo->sect_size; |
321 | } else if (S_ISREG(stat.st_mode)) { | 321 | } else if (S_ISREG(stat.st_mode)) { |
322 | LOGI("Requesting operation on a regular file, not block device."); | 322 | ALOGI("Requesting operation on a regular file, not block device."); |
323 | if (!dinfo->sect_size) { | 323 | if (!dinfo->sect_size) { |
324 | LOGE("Sector size for regular file images cannot be zero"); | 324 | LOGE("Sector size for regular file images cannot be zero"); |
325 | goto fail; | 325 | goto fail; |
diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c index 22767c00e..be35763e8 100644 --- a/libdiskconfig/diskutils.c +++ b/libdiskconfig/diskutils.c | |||
@@ -40,7 +40,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) | |||
40 | int done = 0; | 40 | int done = 0; |
41 | uint64_t total = 0; | 41 | uint64_t total = 0; |
42 | 42 | ||
43 | LOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, offset); | 43 | ALOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, offset); |
44 | if ((src_fd = open(src, O_RDONLY)) < 0) { | 44 | if ((src_fd = open(src, O_RDONLY)) < 0) { |
45 | LOGE("Could not open %s for reading (errno=%d).", src, errno); | 45 | LOGE("Could not open %s for reading (errno=%d).", src, errno); |
46 | goto fail; | 46 | goto fail; |
@@ -101,7 +101,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) | |||
101 | if (dst_fd >= 0) | 101 | if (dst_fd >= 0) |
102 | fsync(dst_fd); | 102 | fsync(dst_fd); |
103 | 103 | ||
104 | LOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset); | 104 | ALOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset); |
105 | 105 | ||
106 | close(src_fd); | 106 | close(src_fd); |
107 | if (dst_fd >= 0) | 107 | if (dst_fd >= 0) |
diff --git a/libdiskconfig/write_lst.c b/libdiskconfig/write_lst.c index 12b7cd775..d99a80774 100644 --- a/libdiskconfig/write_lst.c +++ b/libdiskconfig/write_lst.c | |||
@@ -82,7 +82,7 @@ wlist_commit(int fd, struct write_list *lst, int test) | |||
82 | goto fail; | 82 | goto fail; |
83 | } | 83 | } |
84 | } else | 84 | } else |
85 | LOGI("Would write %d bytes @ offset %lld.", lst->len, lst->offset); | 85 | ALOGI("Would write %d bytes @ offset %lld.", lst->len, lst->offset); |
86 | } | 86 | } |
87 | 87 | ||
88 | return 0; | 88 | return 0; |