vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/normal/charset.c: Move comment to right place.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-12 22:13:20 +01:00
parent 5c827cf971
commit e70cb72f73
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-01-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/charset.c: Move comment to right place.
2012-01-11 Vladimir Serbinenko <phcoder@gmail.com> 2012-01-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/affs.c (grub_affs_bblock): Revert flags. * grub-core/fs/affs.c (grub_affs_bblock): Revert flags.

14
grub-core/normal/charset.c
View file

@ -42,13 +42,6 @@
Most underline diacritics aren't displayed in gfxterm Most underline diacritics aren't displayed in gfxterm
*/ */
/* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
bytes (if SRCSIZE is -1, it is ignored) in length to a UTF-16 string.
Return the number of characters converted. DEST must be able to hold
at least DESTSIZE characters. If an invalid sequence is found, return -1.
If SRCEND is not NULL, then *SRCEND is set to the next byte after the
last byte used in SRC. */
#include <grub/charset.h> #include <grub/charset.h>
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/misc.h> #include <grub/misc.h>
@ -67,6 +60,7 @@ grub_utf8_process (grub_uint8_t c, grub_uint32_t *code, int *count)
{ {
if ((c & GRUB_UINT8_2_LEADINGBITS) != GRUB_UINT8_1_LEADINGBIT) if ((c & GRUB_UINT8_2_LEADINGBITS) != GRUB_UINT8_1_LEADINGBIT)
{ {
*count = 0;
/* invalid */ /* invalid */
return 0; return 0;
} }
@ -105,6 +99,12 @@ grub_utf8_process (grub_uint8_t c, grub_uint32_t *code, int *count)
return 0; return 0;
} }
/* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
bytes (if SRCSIZE is -1, it is ignored) in length to a UTF-16 string.
Return the number of characters converted. DEST must be able to hold
at least DESTSIZE characters. If an invalid sequence is found, return -1.
If SRCEND is not NULL, then *SRCEND is set to the next byte after the
last byte used in SRC. */
grub_ssize_t grub_ssize_t
grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize, grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
const grub_uint8_t *src, grub_size_t srcsize, const grub_uint8_t *src, grub_size_t srcsize,