Revert "The right implementation of CGPT label conversion between UTF8 and UTF16."

This reverts commit 6965cbfed3352754f0ff9a270e3b330223b7154c.

TBR=Change broke tree

Change-Id: I5323799bf0bc2f9a1f2815f0c44fc90ca9a7bd77

1 files changed, 5 insertions, 13 deletions

diff --git a/cgpt/cgpt.h b/cgpt/cgpt.h
index 85702a4f..9b0805cf 100644
--- a/cgpt/cgpt.h
+++ b/cgpt/cgpt.h
@@ -81,22 +81,14 @@ int WritePMBR(struct drive *drive);
 
 /* Convert possibly unterminated UTF16 string to UTF8.
  * Caller must prepare enough space for UTF8, which could be up to
- * twice the byte length of UTF16 string plus the terminating '\0'.
- *
- * Return: CGPT_OK --- all character are converted successfully.
- *         CGPT_FAILED --- convert error, i.e. output buffer is too short.
+ * twice the number of UTF16 chars plus the terminating '\0'.
  */
-int UTF16ToUTF8(const uint16_t *utf16, unsigned int maxinput,
-                uint8_t *utf8, unsigned int maxoutput);
-
+void UTF16ToUTF8(const uint16_t *utf16, unsigned int maxinput,
+                 uint8_t *utf8, unsigned int maxoutput);
 /* Convert null-terminated UTF8 string to UTF16.
- * Caller must prepare enough space for UTF16, which is the byte length of UTF8
- * plus the terminating 0x0000.
- *
- * Return: CGPT_OK --- all character are converted successfully.
- *         CGPT_FAILED --- convert error, i.e. output buffer is too short.
+ * Caller must prepare enough space for UTF16, including a terminating 0x0000
  */
-int UTF8ToUTF16(const uint8_t *utf8, uint16_t *utf16, unsigned int maxoutput);
+void UTF8ToUTF16(const uint8_t *utf8, uint16_t *utf16, unsigned int maxoutput);
 
 /* Helper functions for supported GPT types. */
 int ResolveType(const Guid *type, char *buf);