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

rather than printf.
	* grub-core/video/readers/tga.c: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-07 11:37:11 +02:00
parent 1eed0e6ebc
commit 47cf82b461
3 changed files with 9 additions and 7 deletions

View file

@ -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> 2013-05-07 Vladimir Serbinenko <phcoder@gmail.com>
* tests/priority_queue_unit_test.cc: New test. * tests/priority_queue_unit_test.cc: New test.

View file

@ -693,9 +693,7 @@ grub_jpeg_decode_jpeg (struct grub_jpeg_data *data)
if (grub_errno) if (grub_errno)
break; break;
#ifdef JPEG_DEBUG grub_dprintf ("jpeg", "jpeg marker: %x\n", marker);
grub_printf ("jpeg marker: %x\n", marker);
#endif
switch (marker) switch (marker)
{ {

View file

@ -29,8 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
/* Uncomment following define to enable TGA debug. */ /* Uncomment following define to enable TGA debug. */
//#define TGA_DEBUG //#define TGA_DEBUG
#define dump_int_field(x) grub_dprintf ("tga", #x " = %d (0x%04x)\n", x, x);
#if defined(TGA_DEBUG) #if defined(TGA_DEBUG)
#define dump_int_field(x) grub_printf( #x " = %d (0x%04x)\n", x, x);
static grub_command_t cmd; static grub_command_t cmd;
#endif #endif
@ -347,8 +347,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
return grub_errno; return grub_errno;
} }
#if defined(TGA_DEBUG) grub_dprintf("tga", "tga: header\n");
grub_printf("tga: header\n");
dump_int_field(header.id_length); dump_int_field(header.id_length);
dump_int_field(header.color_map_type); dump_int_field(header.color_map_type);
dump_int_field(header.image_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_height);
dump_int_field(header.image_bpp); dump_int_field(header.image_bpp);
dump_int_field(header.image_descriptor); dump_int_field(header.image_descriptor);
#endif
/* Check that bitmap encoding is supported. */ /* Check that bitmap encoding is supported. */
switch (header.image_type) switch (header.image_type)