* grub-core/normal/context.c (grub_env_context_close): Silence spurious

	warning.
	* grub-core/normal/menu.c (grub_menu_execute_entry): Likewise.
	* grub-core/partmap/msdos.c (pc_partition_map_embed): Use unsigned
	counter.

diff --git a/ChangeLog b/ChangeLog
index 9588504212f6b1971482633494f470d582791e68..6efb466bb438e56284b00b8ea460c840d82f0fac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/context.c (grub_env_context_close): Silence spurious
+       warning.
+       * grub-core/normal/menu.c (grub_menu_execute_entry): Likewise.
+       * grub-core/partmap/msdos.c (pc_partition_map_embed): Use unsigned
+       counter.
+
 2011-01-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Use alias->path rather than buggy "canon".

diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c
index b73161d0b668b4795a2e1d7bcb09237648decacc..108679913bcd7c552fab9b65e88e576f8d85c3e4 100644 (file)
--- a/grub-core/normal/context.c
+++ b/grub-core/normal/context.c
@@ -148,7 +148,7 @@ grub_env_context_close (void)
 grub_err_t
 grub_env_extractor_close (int source)
 {
-  grub_menu_t menu, menu2;
+  grub_menu_t menu = NULL;
   grub_menu_entry_t *last;
   grub_err_t err;
 
@@ -161,6 +161,7 @@ grub_env_extractor_close (int source)
 
   if (source)
     {
+      grub_menu_t menu2;
       menu2 = grub_env_get_menu ();
       
       last = &menu2->entry_list;

diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index 6a123a6de65e9c4fd4648f0360fc214daa3acdf5..e62482122f87b03803a2d81a6d4033e0078f22a2 100644 (file)
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -159,7 +159,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
 {
   grub_err_t err = GRUB_ERR_NONE;
   int errs_before;
-  grub_menu_t menu;
+  grub_menu_t menu = NULL;
   char *optr, *buf, *oldchosen = NULL, *olddefault = NULL;
   const char *ptr, *chosen, *def;
   grub_size_t sz = 0;

diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index f99e27a6ecf9f36f3dd648c9f720945cc6f1718b..d411c4405bf1bbf1f901cc6bfdf99b7214c6eab4 100644 (file)
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -234,7 +234,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
 
   if (end >= *nsectors + 1)
     {
-      int i;
+      unsigned i;
       *nsectors = end - 1;
       *sectors = grub_malloc (*nsectors * sizeof (**sectors));
       if (!*sectors)