d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup to use %S.

Browse Source
This commit is contained in:
Warner Losh 2016-05-20 19:37:46 +00:00
parent f4bf2442a0
commit 8f190a8c0e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=300328
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/boot/efi/loader/main.c
View File

@ -75,20 +75,6 @@ EFI_GUID inputid = SIMPLE_TEXT_INPUT_PROTOCOL;
static void efi_zfs_probe(void);
#endif
/*
* Need this because EFI uses UTF-16 unicode string constants, but we
* use UTF-8. We can't use printf due to the possibility of \0 and we
* don't support support wide characters either.
*/
static void
print_str16(const CHAR16 *str)
{
int i;
for (i = 0; str[i]; i++)
printf("%c", (char)str[i]);
}
static void
cp16to8(const CHAR16 *src, char *dst, size_t len)
{
@ -96,6 +82,8 @@ cp16to8(const CHAR16 *src, char *dst, size_t len)
for (i = 0; i < len && src[i]; i++)
dst[i] = (char)src[i];
if (i < len)
dst[i] = '\0';
}
static int
@ -330,10 +318,8 @@ main(int argc, CHAR16 *argv[])
BS->HandleProtocol(IH, &imgid, (VOID**)&img);
printf("Command line arguments:");
for (i = 0; i < argc; i++) {
printf(" ");
print_str16(argv[i]);
}
for (i = 0; i < argc; i++)
printf(" %S", argv[i]);
printf("\n");
printf("Image base: 0x%lx\n", (u_long)img->ImageBase);