summaryrefslogtreecommitdiff
path: root/cgpt/cmd_find.c
diff options
context:
space:
mode:
authorChris Sosa <sosa@chromium.org>2010-11-19 05:59:53 -0800
committerChris Sosa <sosa@chromium.org>2010-11-19 05:59:53 -0800
commite417185ff654ead6b8c1c6eafe5fc67a89a4210d (patch)
tree41236a552e70e816083eec3ed3c14718b01b57da /cgpt/cmd_find.c
parent6965cbfed3352754f0ff9a270e3b330223b7154c (diff)
downloadvboot-e417185ff654ead6b8c1c6eafe5fc67a89a4210d.tar.gz
Revert "The right implementation of CGPT label conversion between UTF8 and UTF16."
This reverts commit 6965cbfed3352754f0ff9a270e3b330223b7154c. TBR=Change broke tree Change-Id: I5323799bf0bc2f9a1f2815f0c44fc90ca9a7bd77
Diffstat (limited to 'cgpt/cmd_find.c')
-rw-r--r--cgpt/cmd_find.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/cgpt/cmd_find.c b/cgpt/cmd_find.c
index 43438ef7..40f10ba0 100644
--- a/cgpt/cmd_find.c
+++ b/cgpt/cmd_find.c
@@ -181,12 +181,8 @@ static int do_search(char *filename) {
(set_type && !memcmp(&type_guid, &entry->type, sizeof(Guid)))) {
found = 1;
} else if (set_label) {
- if (CGPT_OK != UTF16ToUTF8(entry->name,
- sizeof(entry->name) / sizeof(entry->name[0]),
- (uint8_t *)partlabel, sizeof(partlabel))) {
- Error("The label cannot be converted to UTF16, so abort.\n");
- return 0;
- }
+ UTF16ToUTF8(entry->name, sizeof(entry->name) / sizeof(entry->name[0]),
+ (uint8_t *)partlabel, sizeof(partlabel));
if (!strncmp(label, partlabel, sizeof(partlabel))) {
found = 1;
}