* 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.

diff --git a/ChangeLog b/ChangeLog
index 4da6d0ba08d6116357fbdce949b045e28439f181..611e198bea24152d10898547fa610cff77e06422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/normal/menu_text.c (grub_print_message_indented_real): Add

diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
index dacd2126dc4cc4956bd8e2b6e03683c6c8b85020..d5aa0f6a78c0f2303bb44f18be0baa4d04ace8b7 100644 (file)
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -288,9 +288,9 @@ grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize)
   return 1;
 }
 
-int
+grub_ssize_t
 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);
 

diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index ceeaa794d48764d2422e2f4c1136a400f94a1153..aea540457152bcf8466a273cdf8bafe5cd41ad33 100644 (file)
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -209,7 +209,7 @@ read_config_file (const char *config)
 void
 grub_normal_init_page (struct grub_term_output *term)
 {
-  int msg_len;
+  grub_ssize_t msg_len;
   int posx;
   const char *msg = _("GNU GRUB  version %s");
   char *msg_formatted;

diff --git a/include/grub/charset.h b/include/grub/charset.h
index 3036d16939b2a187da712e7272275fa3f96795d2..41da01f1c6bacbc5a5af65c323e15dab0c7a36c4 100644 (file)
--- a/include/grub/charset.h
+++ b/include/grub/charset.h
@@ -174,8 +174,9 @@ char *grub_ucs4_to_utf8_alloc (const grub_uint32_t *src, grub_size_t size);
 int
 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_uint32_t **last_position);
+grub_ssize_t grub_utf8_to_ucs4_alloc (const char *msg,
+                                     grub_uint32_t **unicode_msg,
+                                     grub_uint32_t **last_position);
 
 /* Process one character from UTF8 sequence. 
    At beginning set *code = 0, *count = 0. Returns 0 on failure and