diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 14:13:42 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 11:03:26 +0000 |
commit | 01dda204cd28fe181691b4a44a51be7e5666d0c8 (patch) | |
tree | 99ef6d14b55ebf4e2752cd182052caad6eddc20a /libdiskconfig/config_mbr.c | |
parent | 36afde3387fff9eac0e6d54854b8d43fe1ebb0cc (diff) | |
download | system_core-01dda204cd28fe181691b4a44a51be7e5666d0c8.zip system_core-01dda204cd28fe181691b4a44a51be7e5666d0c8.tar.gz system_core-01dda204cd28fe181691b4a44a51be7e5666d0c8.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: Ibcffdcf620ebae1c389446ce8e9d908f11ac039c
Diffstat (limited to 'libdiskconfig/config_mbr.c')
-rw-r--r-- | libdiskconfig/config_mbr.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c index 07bd6a7..703484c 100644 --- a/libdiskconfig/config_mbr.c +++ b/libdiskconfig/config_mbr.c @@ -62,7 +62,7 @@ kb_to_lba(uint32_t len_kb, uint32_t sect_size) lba = (lba + (uint64_t)sect_size - 1) & ~((uint64_t)sect_size - 1); lba /= (uint64_t)sect_size; if (lba >= 0xffffffffULL) - LOGE("Error converting kb -> lba. 32bit overflow, expect weirdness"); + ALOGE("Error converting kb -> lba. 32bit overflow, expect weirdness"); return (uint32_t)(lba & 0xffffffffULL); } @@ -75,12 +75,12 @@ mk_pri_pentry(struct disk_info *dinfo, struct part_info *pinfo, int pnum, struct pc_partition *pentry; if (pnum >= PC_NUM_BOOT_RECORD_PARTS) { - LOGE("Maximum number of primary partition exceeded."); + ALOGE("Maximum number of primary partition exceeded."); return NULL; } if (!(item = alloc_wl(sizeof(struct pc_partition)))) { - LOGE("Unable to allocate memory for partition entry."); + ALOGE("Unable to allocate memory for partition entry."); return NULL; } @@ -146,7 +146,7 @@ mk_ext_pentry(struct disk_info *dinfo, struct part_info *pinfo, uint32_t *lba, uint32_t len; /* in lba units */ if (!(item = alloc_wl(sizeof(struct pc_boot_record)))) { - LOGE("Unable to allocate memory for EBR."); + ALOGE("Unable to allocate memory for EBR."); return NULL; } @@ -163,7 +163,7 @@ mk_ext_pentry(struct disk_info *dinfo, struct part_info *pinfo, uint32_t *lba, len = kb_to_lba(pinfo->len_kb, dinfo->sect_size); else { if (pnext) { - LOGE("Only the last partition can be specified to fill the disk " + ALOGE("Only the last partition can be specified to fill the disk " "(name = '%s')", pinfo->name); goto fail; } @@ -233,7 +233,7 @@ config_mbr(struct disk_info *dinfo) if ((temp_wr = mk_pri_pentry(dinfo, NULL, cnt, &cur_lba))) wlist_add(&wr_list, temp_wr); else { - LOGE("Cannot create primary extended partition."); + ALOGE("Cannot create primary extended partition."); goto fail; } } @@ -259,7 +259,7 @@ config_mbr(struct disk_info *dinfo) if (temp_wr) wlist_add(&wr_list, temp_wr); else { - LOGE("Cannot create partition %d (%s).", cnt, pinfo->name); + ALOGE("Cannot create partition %d (%s).", cnt, pinfo->name); goto fail; } } @@ -270,7 +270,7 @@ config_mbr(struct disk_info *dinfo) cur_lba = 0; memset(&blank, 0, sizeof(struct part_info)); if (!(temp_wr = mk_pri_pentry(dinfo, &blank, cnt, &cur_lba))) { - LOGE("Cannot create blank partition %d.", cnt); + ALOGE("Cannot create blank partition %d.", cnt); goto fail; } wlist_add(&wr_list, temp_wr); @@ -279,7 +279,7 @@ config_mbr(struct disk_info *dinfo) return wr_list; nospace: - LOGE("Not enough space to add parttion '%s'.", pinfo->name); + ALOGE("Not enough space to add parttion '%s'.", pinfo->name); fail: wlist_free(wr_list); @@ -310,13 +310,13 @@ find_mbr_part(struct disk_info *dinfo, const char *name) num++; if (!(dev_name = malloc(MAX_NAME_LEN))) { - LOGE("Cannot allocate memory."); + ALOGE("Cannot allocate memory."); return NULL; } num = snprintf(dev_name, MAX_NAME_LEN, "%s%d", dinfo->device, num); if (num >= MAX_NAME_LEN) { - LOGE("Device name is too long?!"); + ALOGE("Device name is too long?!"); free(dev_name); return NULL; } |