grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] util/grub-gen-asciih: fix build warning->error


From: Trevor Woerner
Subject: [PATCH] util/grub-gen-asciih: fix build warning->error
Date: Wed, 28 May 2014 09:06:22 -0400

Using a GCC 4.8.1 cross-compiler for ARM a "may be used uninitialized in this
function" warning is generated which is converted to an error via -Werror.
This patch eliminates the warning by initializing the structure then checking
it has been filled in correctly after calling add_glyph().

Signed-off-by: Trevor Woerner <address@hidden>
---
 util/grub-gen-asciih.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/util/grub-gen-asciih.c b/util/grub-gen-asciih.c
index e01447a..c143afd 100644
--- a/util/grub-gen-asciih.c
+++ b/util/grub-gen-asciih.c
@@ -131,6 +131,8 @@ write_font_ascii_bitmap (FILE *file, FT_Face face)
   struct grub_glyph_info glyph;
   int char_code;
 
+  memset (&glyph, 0, sizeof(glyph));
+
   fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n");
   fprintf (file, "unsigned char ascii_bitmaps[] =\n");
   fprintf (file, "{\n");
@@ -144,6 +146,12 @@ write_font_ascii_bitmap (FILE *file, FT_Face face)
        return;
       add_glyph (glyph_idx, face, char_code, &glyph);
 
+      if (glyph.bitmap == 0)
+        {
+          fprintf (stderr, "grub-gen-asciih: add_glyph not successful");
+          exit (1);
+        }
+
       if (glyph.width == 8 && glyph.height == 16
          && glyph.x_ofs == 0 && glyph.y_ofs == 0)
        {
-- 
1.9.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]