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

* include/grub/charset.h (grub_utf16_to_utf8): Make src a const pointer.

Browse source 
(grub_ucs4_to_utf8_alloc): Likewise.
	(grub_ucs4_to_utf8): Likewise.
	* grub-core/normal/charset.c (grub_ucs4_to_utf8): Likewise.
	(grub_ucs4_to_utf8_alloc): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-14 10:01:24 +01:00
parent 309e535231
commit cb8f88ea82
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2011-12-14 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/charset.h (grub_utf16_to_utf8): Make src a const pointer.
(grub_ucs4_to_utf8_alloc): Likewise.
(grub_ucs4_to_utf8): Likewise.
* grub-core/normal/charset.c (grub_ucs4_to_utf8): Likewise.
(grub_ucs4_to_utf8_alloc): Likewise.
2011-12-14 Vladimir Serbinenko <phcoder@gmail.com> 2011-12-14 Vladimir Serbinenko <phcoder@gmail.com>
AFFS never uses unicode. AFFS never uses unicode.

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

@ -197,7 +197,7 @@ grub_encode_utf8_character (grub_uint8_t *dest, grub_uint8_t *destend,
/* Convert UCS-4 to UTF-8. */ /* Convert UCS-4 to UTF-8. */
void void
grub_ucs4_to_utf8 (grub_uint32_t *src, grub_size_t size, grub_ucs4_to_utf8 (const grub_uint32_t *src, grub_size_t size,
grub_uint8_t *dest, grub_size_t destsize) grub_uint8_t *dest, grub_size_t destsize)
{ {
/* Keep last char for \0. */ /* Keep last char for \0. */
@ -223,10 +223,10 @@ grub_ucs4_to_utf8 (grub_uint32_t *src, grub_size_t size,
/* Convert UCS-4 to UTF-8. */ /* Convert UCS-4 to UTF-8. */
char * char *
grub_ucs4_to_utf8_alloc (grub_uint32_t *src, grub_size_t size) grub_ucs4_to_utf8_alloc (const grub_uint32_t *src, grub_size_t size)
{ {
grub_size_t remaining; grub_size_t remaining;
grub_uint32_t *ptr; const grub_uint32_t *ptr;
grub_size_t cnt = 0; grub_size_t cnt = 0;
grub_uint8_t *ret; grub_uint8_t *ret;

6
include/grub/charset.h
View file

@ -51,7 +51,7 @@ grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
/* Convert UTF-16 to UTF-8. */ /* Convert UTF-16 to UTF-8. */
static inline grub_uint8_t * static inline grub_uint8_t *
grub_utf16_to_utf8 (grub_uint8_t *dest, grub_uint16_t *src, grub_utf16_to_utf8 (grub_uint8_t *dest, const grub_uint16_t *src,
grub_size_t size) grub_size_t size)
{ {
grub_uint32_t code_high = 0; grub_uint32_t code_high = 0;
@ -141,7 +141,7 @@ grub_latin1_to_utf8 (grub_uint8_t *dest, const grub_uint8_t *src,
} }
/* Convert UCS-4 to UTF-8. */ /* Convert UCS-4 to UTF-8. */
char *grub_ucs4_to_utf8_alloc (grub_uint32_t *src, grub_size_t size); char *grub_ucs4_to_utf8_alloc (const grub_uint32_t *src, grub_size_t size);
int int
grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize); grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize);
@ -156,7 +156,7 @@ int
grub_utf8_process (grub_uint8_t c, grub_uint32_t *code, int *count); grub_utf8_process (grub_uint8_t c, grub_uint32_t *code, int *count);
void void
grub_ucs4_to_utf8 (grub_uint32_t *src, grub_size_t size, grub_ucs4_to_utf8 (const grub_uint32_t *src, grub_size_t size,
grub_uint8_t *dest, grub_size_t destsize); grub_uint8_t *dest, grub_size_t destsize);
grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize, grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
const grub_uint8_t *src, grub_size_t srcsize, const grub_uint8_t *src, grub_size_t srcsize,