2009-12-27 Carles Pina i Estany <carles@pina.cat>

	* video/readers/jpeg.c (cmd): Declare.
	(grub_cmd_jpegtest): Use `grub_command_t' type.
	(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
	Assign to `cmd'.
	(GRUB_MOD_FINI): Use `cmd' to unregister.
	* video/readers/png.c (cmd): Declare.
	(grub_cmd_pngtest): Use `grub_command_t' type.
	(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
	Assign to `cmd'.
	(GRUB_MOD_FINI): Use `cmd' to unregister.
	* video/readers/tga.c (cmd): Declare.
	(grub_cmd_tgatest): Use `grub_command_t' type.
	(GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
	Assign to `cmd'.
	(GRUB_MOD_FINI): Use `cmd' to unregister.

diff --git a/ChangeLog b/ChangeLog
index f309d3cb00802d160effd6e2ad6814311ee2d4d8..8f44663a0c249137eb680fd48d8c9935542d138d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-27  Carles Pina i Estany  <carles@pina.cat>
+
+       * video/readers/jpeg.c (cmd): Declare.
+       (grub_cmd_jpegtest): Use `grub_command_t' type.
+       (GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
+       Assign to `cmd'.
+       (GRUB_MOD_FINI): Use `cmd' to unregister.
+       * video/readers/png.c (cmd): Declare.
+       (grub_cmd_pngtest): Use `grub_command_t' type.
+       (GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
+       Assign to `cmd'.
+       (GRUB_MOD_FINI): Use `cmd' to unregister.
+       * video/readers/tga.c (cmd): Declare.
+       (grub_cmd_tgatest): Use `grub_command_t' type.
+       (GRUB_MOD_INIT): Fix arguments passed to `grub_register_command'.
+       Assign to `cmd'.
+       (GRUB_MOD_FINI): Use `cmd' to unregister.
+
 2009-12-27  Carles Pina i Estany  <carles@pina.cat>
 
        * efiemu/main.c (GRUB_MOD_INIT): Fix capitalizations and/or full

diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index 0c3d00bef90b5393f23838f75d8ac11abcc3d986..e7b69a208a3a545693ef3503f5354051174b21bf 100644 (file)
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -54,6 +54,10 @@ static const grub_uint8_t jpeg_zigzag_order[64] = {
   53, 60, 61, 54, 47, 55, 62, 63
 };
 
+#ifdef JPEG_DEBUG
+static grub_command_t cmd;
+#endif
+
 typedef int jpeg_data_unit_t[64];
 
 struct grub_jpeg_data
@@ -695,8 +699,8 @@ grub_video_reader_jpeg (struct grub_video_bitmap **bitmap,
 
 #if defined(JPEG_DEBUG)
 static grub_err_t
-grub_cmd_jpegtest (struct grub_arg_list *state __attribute__ ((unused)),
-                  int argc, char **args)
+grub_cmd_jpegtest (grub_command_t cmd __attribute__ ((unused)),
+                   int argc, char **args)
 {
   struct grub_video_bitmap *bitmap = 0;
 
@@ -730,16 +734,16 @@ GRUB_MOD_INIT (video_reader_jpeg)
   grub_video_bitmap_reader_register (&jpg_reader);
   grub_video_bitmap_reader_register (&jpeg_reader);
 #if defined(JPEG_DEBUG)
-  grub_register_command ("jpegtest", grub_cmd_jpegtest,
-                        GRUB_COMMAND_FLAG_BOTH, "FILE",
-                        "Tests loading of JPEG bitmap.", 0);
+  cmd = grub_register_command ("jpegtest", grub_cmd_jpegtest,
+                              "FILE",
+                              "Tests loading of JPEG bitmap.");
 #endif
 }
 
-GRUB_MOD_FINI (video_reader_jpeg)
+GRUB_MOD_FINI (grub_cmd_jpegtest)
 {
 #if defined(JPEG_DEBUG)
-  grub_unregister_command ("jpegtest");
+  grub_unregister_command (cmd);
 #endif
   grub_video_bitmap_reader_unregister (&jpeg_reader);
   grub_video_bitmap_reader_unregister (&jpg_reader);

diff --git a/video/readers/png.c b/video/readers/png.c
index 908672a2e42031e058310603368ad1c35fcd5726..4e16bf27e06a80587dd83f569bd973fb703c6525 100644 (file)
--- a/video/readers/png.c
+++ b/video/readers/png.c
@@ -73,6 +73,10 @@
 
 #define DEFLATE_HUFF_LEN       16
 
+#ifdef PNG_DEBUG
+static grub_command_t cmd;
+#endif
+
 struct huff_table
 {
   int *values, *maxval, *offset;
@@ -866,7 +870,7 @@ grub_video_reader_png (struct grub_video_bitmap **bitmap,
 
 #if defined(PNG_DEBUG)
 static grub_err_t
-grub_cmd_pngtest (struct grub_arg_list *state __attribute__ ((unused)),
+grub_cmd_pngtest (grub_command_t cmd __attribute__ ((unused)),
                  int argc, char **args)
 {
   struct grub_video_bitmap *bitmap = 0;
@@ -894,16 +898,16 @@ GRUB_MOD_INIT (video_reader_png)
 {
   grub_video_bitmap_reader_register (&png_reader);
 #if defined(PNG_DEBUG)
-  grub_register_command ("pngtest", grub_cmd_pngtest,
-                        GRUB_COMMAND_FLAG_BOTH, "FILE",
-                        "Tests loading of PNG bitmap.", 0);
+  cmd = grub_register_command ("pngtest", grub_cmd_pngtest,
+                              "FILE",
+                              "Tests loading of PNG bitmap.");
 #endif
 }
 
 GRUB_MOD_FINI (video_reader_png)
 {
 #if defined(PNG_DEBUG)
-  grub_unregister_command ("pngtest");
+  grub_unregister_command (cmd);
 #endif
   grub_video_bitmap_reader_unregister (&png_reader);
 }

diff --git a/video/readers/tga.c b/video/readers/tga.c
index c5ff99cfea6ed4ba7e347a075d0fb83ccdc202fa..d720141e11d7bc0a2718aadde83f98aa32b466fa 100644 (file)
--- a/video/readers/tga.c
+++ b/video/readers/tga.c
@@ -29,6 +29,7 @@
 
 #if defined(TGA_DEBUG)
 #define dump_int_field(x) grub_printf( #x " = %d (0x%04x)\n", x, x);
+static grub_command_t cmd;
 #endif
 
 enum
@@ -452,7 +453,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
 
 #if defined(TGA_DEBUG)
 static grub_err_t
-grub_cmd_tgatest (struct grub_arg_list *state __attribute__ ((unused)),
+grub_cmd_tgatest (grub_command_t cmd __attribute__ ((unused)),
                   int argc, char **args)
 {
   struct grub_video_bitmap *bitmap = 0;
@@ -480,15 +481,15 @@ GRUB_MOD_INIT(video_reader_tga)
 {
   grub_video_bitmap_reader_register (&tga_reader);
 #if defined(TGA_DEBUG)
-  grub_register_command ("tgatest", grub_cmd_tgatest, GRUB_COMMAND_FLAG_BOTH,
-                         "FILE", "Tests loading of TGA bitmap.", 0);
+  cmd = grub_register_command ("tgatest", grub_cmd_tgatest,
+                               "FILE", "Tests loading of TGA bitmap.");
 #endif
 }
 
 GRUB_MOD_FINI(video_reader_tga)
 {
 #if defined(TGA_DEBUG)
-  grub_unregister_command ("tgatest");
+  grub_unregister_command (cmd);
 #endif
   grub_video_bitmap_reader_unregister (&tga_reader);
 }