From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NOUGr-0000j8-Nb for mharc-grub-devel@gnu.org; Sat, 26 Dec 2009 05:53:17 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NOUGl-0000hf-7R for grub-devel@gnu.org; Sat, 26 Dec 2009 05:53:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NOUGe-0000f7-NU for grub-devel@gnu.org; Sat, 26 Dec 2009 05:53:09 -0500 Received: from [199.232.76.173] (port=48349 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NOUGe-0000ew-8F for grub-devel@gnu.org; Sat, 26 Dec 2009 05:53:04 -0500 Received: from 197.red-80-32-81.staticip.rima-tde.net ([80.32.81.197]:41226 helo=mail.pina.cat) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NOUGd-0007F5-B9 for grub-devel@gnu.org; Sat, 26 Dec 2009 05:53:03 -0500 Received: from pinux (unknown [192.168.0.108]) by mail.pina.cat (Postfix) with ESMTPA id 24B3B2894B244 for ; Sat, 26 Dec 2009 11:53:02 +0100 (CET) Received: by pinux (Postfix, from userid 1000) id CD37310B7D; Sat, 26 Dec 2009 10:53:22 +0000 (GMT) Date: Sat, 26 Dec 2009 11:53:22 +0100 From: Carles Pina i Estany To: grub-devel@gnu.org Message-ID: <20091226105322.GA23263@pina.cat> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="fdj2RfSjLxBAspz7" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: patch to compile video/readers/* with test X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2009 10:53:11 -0000 --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Find an attached patch that fix the compilation of video/readers/* when DEBUG is enabled. If ok I would commit. Thanks, -- Carles Pina i Estany http://pinux.info --fdj2RfSjLxBAspz7 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="readers.patch" === modified file 'ChangeLog' --- ChangeLog 2009-12-26 10:01:33 +0000 +++ ChangeLog 2009-12-26 10:42:57 +0000 @@ -1,5 +1,23 @@ 2009-12-27 Carles Pina i Estany + * 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 + * efiemu/main.c (GRUB_MOD_INIT): Fix capitalizations and/or full stops. * kern/corecmd.c (grub_register_core_commands): Likewise. === modified file 'video/readers/jpeg.c' --- video/readers/jpeg.c 2009-12-25 23:50:59 +0000 +++ video/readers/jpeg.c 2009-12-26 10:35:09 +0000 @@ -54,6 +54,10 @@ static const grub_uint8_t jpeg_zigzag_or 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_vide #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); === modified file 'video/readers/png.c' --- video/readers/png.c 2009-12-25 23:50:59 +0000 +++ video/readers/png.c 2009-12-26 10:40:10 +0000 @@ -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 #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); } === modified file 'video/readers/tga.c' --- video/readers/tga.c 2009-12-25 23:50:59 +0000 +++ video/readers/tga.c 2009-12-26 10:39:37 +0000 @@ -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 #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); } --fdj2RfSjLxBAspz7--