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

* grub-core/normal/charset.c (grub_utf8_to_ucs4_alloc): Fix return type

Browse source 
to grub_ssize_t.
	* grub-core/normal/main.c (grub_normal_init_page): Fix msg_len type.
	* include/grub/charset.h (grub_utf8_to_ucs4_alloc): Fix prototype.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 17:20:30 +01:00
parent d43ad75467
commit 8b282ad222
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/charset.c (grub_utf8_to_ucs4_alloc): Fix return type
to grub_ssize_t.
* grub-core/normal/main.c (grub_normal_init_page): Fix msg_len type.
* include/grub/charset.h (grub_utf8_to_ucs4_alloc): Fix prototype.
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/menu_text.c (grub_print_message_indented_real): Add * grub-core/normal/menu_text.c (grub_print_message_indented_real): Add

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

@ -288,9 +288,9 @@ grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize)
return 1; return 1;
} }
int grub_ssize_t
grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg, grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
grub_uint32_t **last_position) grub_uint32_t **last_position)
{ {
grub_size_t msg_len = grub_strlen (msg); grub_size_t msg_len = grub_strlen (msg);

2
grub-core/normal/main.c
View file

@ -209,7 +209,7 @@ read_config_file (const char *config)
void void
grub_normal_init_page (struct grub_term_output *term) grub_normal_init_page (struct grub_term_output *term)
{ {
int msg_len; grub_ssize_t msg_len;
int posx; int posx;
const char *msg = _("GNU GRUB version %s"); const char *msg = _("GNU GRUB version %s");
char *msg_formatted; char *msg_formatted;

5
include/grub/charset.h
View file

@ -174,8 +174,9 @@ 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);
int grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg, grub_ssize_t grub_utf8_to_ucs4_alloc (const char *msg,
grub_uint32_t **last_position); grub_uint32_t **unicode_msg,
grub_uint32_t **last_position);
/* Process one character from UTF8 sequence. /* Process one character from UTF8 sequence.
At beginning set *code = 0, *count = 0. Returns 0 on failure and At beginning set *code = 0, *count = 0. Returns 0 on failure and