* grub-core/video/readers/jpeg.c: Use grub_dprintf for debug statements

	rather than printf.
	* grub-core/video/readers/tga.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0fe18bb39aa7150f70509e827277bee546f9618c..04a2f000d8f09020b5a304bd55c885d792630eea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/video/readers/jpeg.c: Use grub_dprintf for debug statements
+       rather than printf.
+       * grub-core/video/readers/tga.c: Likewise.
+
 2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/priority_queue_unit_test.cc: New test.

diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
index 33f28c32b58aa0573a36047a05300e516ee19187..0067b7dc148ebed5feb73ba683819fdaa8f1e124 100644 (file)
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -693,9 +693,7 @@ grub_jpeg_decode_jpeg (struct grub_jpeg_data *data)
       if (grub_errno)
        break;
 
-#ifdef JPEG_DEBUG
-      grub_printf ("jpeg marker: %x\n", marker);
-#endif
+      grub_dprintf ("jpeg", "jpeg marker: %x\n", marker);
 
       switch (marker)
        {

diff --git a/grub-core/video/readers/tga.c b/grub-core/video/readers/tga.c
index 84be68a0a4b9f691c40d5eb7c9a76fefd30b30ad..5aa4c7dc23e07a229931d8cd3d611fbfa4a9e677 100644 (file)
--- a/grub-core/video/readers/tga.c
+++ b/grub-core/video/readers/tga.c
@@ -29,8 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
 /* Uncomment following define to enable TGA debug.  */
 //#define TGA_DEBUG
 
+#define dump_int_field(x) grub_dprintf ("tga", #x " = %d (0x%04x)\n", x, x);
 #if defined(TGA_DEBUG)
-#define dump_int_field(x) grub_printf( #x " = %d (0x%04x)\n", x, x);
 static grub_command_t cmd;
 #endif
 
@@ -347,8 +347,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
       return grub_errno;
     }
 
-#if defined(TGA_DEBUG)
-  grub_printf("tga: header\n");
+  grub_dprintf("tga", "tga: header\n");
   dump_int_field(header.id_length);
   dump_int_field(header.color_map_type);
   dump_int_field(header.image_type);
@@ -361,7 +360,6 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
   dump_int_field(header.image_height);
   dump_int_field(header.image_bpp);
   dump_int_field(header.image_descriptor);
-#endif
 
   /* Check that bitmap encoding is supported.  */
   switch (header.image_type)