From: Vladimir Serbinenko Date: Mon, 18 Nov 2013 01:45:25 +0000 (+0100) Subject: * grub-core/lib/relocator.c (grub_mm_check_real): Accept const char * X-Git-Tag: grub-2.02-beta1~286 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=04f39f6df8fed3db08c6333d3b557d15bfe3d5a2;p=thirdparty%2Fgrub.git * grub-core/lib/relocator.c (grub_mm_check_real): Accept const char * as file argument. --- diff --git a/ChangeLog b/ChangeLog index c93e3d103..2ff66607f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-18 Vladimir Serbinenko + + * grub-core/lib/relocator.c (grub_mm_check_real): Accept const char * + as file argument. + 2013-11-18 Vladimir Serbinenko * grub-core/normal/cmdline.c (grub_cmdline_get): Plug memory leak. diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c index c86c5e886..9f9770bc4 100644 --- a/grub-core/lib/relocator.c +++ b/grub-core/lib/relocator.c @@ -1618,7 +1618,7 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr, } void -grub_mm_check_real (char *file, int line) +grub_mm_check_real (const char *file, int line) { grub_mm_region_t r; grub_mm_header_t p, pa; diff --git a/include/grub/mm.h b/include/grub/mm.h index 047006944..c6660af71 100644 --- a/include/grub/mm.h +++ b/include/grub/mm.h @@ -35,7 +35,7 @@ void EXPORT_FUNC(grub_free) (void *ptr); void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size); void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size); -void grub_mm_check_real (char *file, int line); +void grub_mm_check_real (const char *file, int line); #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__); /* For debugging. */