# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.planolesay@gmail.com-20111024132224-\
#   1no35rwxsr794gi4
# target_branch: lp:burg
# testament_sha1: b94f8d5bdc13a8d37e25460f8624b30753a280af
# timestamp: 2011-10-24 15:23:46 +0200
# base_revision_id: bean123ch@gmail.com-20101007050107-\
#   mvle1t7j2w53m92r
# 
# Begin patch
=== modified file 'commands/hexdump.c'
--- commands/hexdump.c	2010-08-18 10:02:31 +0000
+++ commands/hexdump.c	2011-10-24 13:22:24 +0000
@@ -39,12 +39,10 @@
   char buf[GRUB_DISK_SECTOR_SIZE * 4];
   grub_ssize_t size, length;
   grub_disk_addr_t skip;
-  int namelen;
 
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
-  namelen = grub_strlen (args[0]);
   skip = (state[0].set) ? grub_strtoull (state[0].arg, 0, 0) : 0;
   length = (state[1].set) ? grub_strtoul (state[1].arg, 0, 0) : 256;
 

=== modified file 'disk/lvm.c'
--- disk/lvm.c	2010-04-29 16:55:39 +0000
+++ disk/lvm.c	2011-10-24 13:22:24 +0000
@@ -216,7 +216,7 @@
 {
   grub_err_t err;
   grub_disk_t disk;
-  grub_uint64_t da_offset, da_size, mda_offset, mda_size;
+  grub_uint64_t mda_offset, mda_size;
   char buf[GRUB_LVM_LABEL_SIZE];
   char vg_id[GRUB_LVM_ID_STRLEN+1];
   char pv_id[GRUB_LVM_ID_STRLEN+1];
@@ -263,8 +263,6 @@
   pv_id[j] = '\0';
 
   dlocn = pvh->disk_areas_xl;
-  da_offset = grub_le_to_cpu64 (dlocn->offset);
-  da_size = grub_le_to_cpu64 (dlocn->size);
 
   dlocn++;
   /* Is it possible to have multiple data/metadata areas? I haven't

=== modified file 'efiemu/main.c'
--- efiemu/main.c	2010-06-06 08:14:08 +0000
+++ efiemu/main.c	2011-10-24 13:22:24 +0000
@@ -285,15 +285,13 @@
 grub_err_t
 grub_efiemu_prepare (void)
 {
-  grub_err_t err;
-
   if (prepared)
     return GRUB_ERR_NONE;
 
   grub_dprintf ("efiemu", "Preparing %d-bit efiemu\n",
 		8 * grub_efiemu_sizeof_uintn_t ());
 
-  err = grub_efiemu_autocore ();
+  grub_efiemu_autocore ();
 
   /* Create NVRAM. */
   grub_efiemu_pnvram ();

=== modified file 'fs/jfs.c'
--- fs/jfs.c	2010-01-23 19:12:13 +0000
+++ fs/jfs.c	2011-10-24 13:22:24 +0000
@@ -612,7 +612,6 @@
   char fpath[grub_strlen (path)];
   char *name = fpath;
   char *next;
-  unsigned int pos = 0;
   struct grub_jfs_diropen *diro;
 
   grub_strncpy (fpath, path, grub_strlen (path) + 1);
@@ -675,8 +674,6 @@
 	  if (!next)
 	    return 0;
 
-	  pos = 0;
-
 	  name = next;
 	  next = grub_strchr (name, '/');
 	  if (next)

=== modified file 'fs/minix.c'
--- fs/minix.c	2010-01-04 18:24:25 +0000
+++ fs/minix.c	2011-10-24 13:22:24 +0000
@@ -468,7 +468,6 @@
 		void *closure)
 {
   struct grub_minix_data *data = 0;
-  struct grub_minix_sblock *sblock;
   unsigned int pos = 0;
 
   data = grub_minix_mount (device->disk);
@@ -479,8 +478,6 @@
   if (grub_errno)
     goto fail;
 
-  sblock = &data->sblock;
-
   grub_minix_find_file (data, path);
   if (grub_errno)
     goto fail;

=== modified file 'fs/sfs.c'
--- fs/sfs.c	2010-08-18 10:02:31 +0000
+++ fs/sfs.c	2011-10-24 13:22:24 +0000
@@ -149,7 +149,6 @@
   struct grub_sfs_btree *tree;
   int i;
   int next;
-  int prev;
 
   treeblock = grub_malloc (data->blocksize);
   if (!block)
@@ -161,7 +160,6 @@
   /* Handle this level in the btree.  */
   do
     {
-      prev = 0;
 
       grub_disk_read (data->disk, next, 0, data->blocksize, treeblock);
       if (grub_errno)

=== modified file 'fs/ufs.c'
--- fs/ufs.c	2010-01-23 19:12:13 +0000
+++ fs/ufs.c	2011-10-24 13:22:24 +0000
@@ -601,7 +601,6 @@
 	      void *closure)
 {
   struct grub_ufs_data *data;
-  struct grub_ufs_sblock *sblock;
   unsigned int pos = 0;
 
   data = grub_ufs_mount (device->disk);
@@ -612,8 +611,6 @@
   if (grub_errno)
     return grub_errno;
 
-  sblock = &data->sblock;
-
   if (!path || path[0] != '/')
     {
       grub_error (GRUB_ERR_BAD_FILENAME, "bad filename");

=== modified file 'gfxmenu/gui_list.c'
--- gfxmenu/gui_list.c	2010-03-09 19:24:43 +0000
+++ gfxmenu/gui_list.c	2011-10-24 13:22:24 +0000
@@ -556,7 +556,6 @@
   list_impl_t self;
   grub_font_t default_font;
   grub_gui_color_t default_fg_color;
-  grub_gui_color_t default_bg_color;
 
   self = grub_zalloc (sizeof (*self));
   if (! self)
@@ -569,7 +568,6 @@
 
   default_font = grub_font_get ("Unknown Regular 16");
   default_fg_color = grub_gui_color_rgb (0, 0, 0);
-  default_bg_color = grub_gui_color_rgb (255, 255, 255);
 
   self->icon_width = 32;
   self->icon_height = 32;

=== modified file 'gfxmenu/view.c'
--- gfxmenu/view.c	2010-06-06 08:14:08 +0000
+++ gfxmenu/view.c	2011-10-24 13:22:24 +0000
@@ -309,10 +309,8 @@
   view = userdata;
   if (component->ops->is_instance (component, "list"))
     {
-      grub_gui_list_t list;
       grub_video_rect_t bounds;
 
-      list = (grub_gui_list_t) component;
       component->ops->get_bounds (component, &bounds);
       grub_gfxmenu_view_redraw (view, &bounds);
     }

=== modified file 'gfxmenu/widget-box.c'
--- gfxmenu/widget-box.c	2010-03-09 19:24:43 +0000
+++ gfxmenu/widget-box.c	2011-10-24 13:22:24 +0000
@@ -79,21 +79,9 @@
 draw (grub_gfxmenu_box_t self, int x, int y)
 {
   int height_n;
-  int height_s;
-  int height_e;
-  int height_w;
-  int width_n;
-  int width_s;
-  int width_e;
   int width_w;
 
   height_n = get_height (self->scaled_pixmaps[BOX_PIXMAP_N]);
-  height_s = get_height (self->scaled_pixmaps[BOX_PIXMAP_S]);
-  height_e = get_height (self->scaled_pixmaps[BOX_PIXMAP_E]);
-  height_w = get_height (self->scaled_pixmaps[BOX_PIXMAP_W]);
-  width_n = get_width (self->scaled_pixmaps[BOX_PIXMAP_N]);
-  width_s = get_width (self->scaled_pixmaps[BOX_PIXMAP_S]);
-  width_e = get_width (self->scaled_pixmaps[BOX_PIXMAP_E]);
   width_w = get_width (self->scaled_pixmaps[BOX_PIXMAP_W]);
 
   /* Draw sides.  */

=== modified file 'loader/xnu.c'
--- loader/xnu.c	2010-04-29 16:55:39 +0000
+++ loader/xnu.c	2011-10-24 13:22:24 +0000
@@ -1057,8 +1057,8 @@
 
 /* Load all loadable kexts placed under DIRNAME and matching OSBUNDLEREQUIRED */
 grub_err_t
-grub_xnu_scan_dir_for_kexts (char *dirname, char *osbundlerequired,
-			     int maxrecursion)
+grub_xnu_scan_dir_for_kexts (char *dirname, char *osbundlerequired __attribute__((unused)),
+			     int maxrecursion __attribute__((unused)))
 {
   grub_device_t dev;
   char *device_name;
@@ -1072,8 +1072,6 @@
   dev = grub_device_open (device_name);
   if (dev)
     {
-      struct grub_xnu_scan_dir_for_kexts_closure c;
-
       fs = grub_fs_probe (dev);
       path = grub_strchr (dirname, ')');
       if (! path)
@@ -1081,9 +1079,6 @@
       else
 	path++;
 
-      c.dirname = dirname;
-      c.osbundlerequired = osbundlerequired;
-      c.maxrecursion = maxrecursion;
       if (fs)
 	(fs->dir) (dev, path, grub_xnu_scan_dir_for_kexts_hook, 0);
       grub_device_close (dev);

=== modified file 'menu/ext/main.c'
--- menu/ext/main.c	2010-09-21 05:13:40 +0000
+++ menu/ext/main.c	2011-10-24 13:22:24 +0000
@@ -739,7 +739,6 @@
 
       while (1)
 	{
-	  grub_err_t r = 0;
 	  grub_uitree_t node;
 
 	  node = grub_uitree_find_id (root, "__menu__");
@@ -763,7 +762,7 @@
 	  if (grub_widget_create (root) == GRUB_ERR_NONE)
 	    {
 	      grub_widget_init (root);
-	      r = grub_widget_input (root, 0);
+	      grub_widget_input (root, 0);
 	    }
 	  grub_widget_free (root);
 	  if (grub_widget_refresh)

=== modified file 'normal/term.c'
--- normal/term.c	2010-04-29 16:55:39 +0000
+++ normal/term.c	2011-10-24 13:22:24 +0000
@@ -110,14 +110,13 @@
 grub_puts_terminal (const char *str, struct grub_term_output *term)
 {
   grub_uint32_t code;
-  grub_ssize_t ret;
   const grub_uint8_t *ptr = (const grub_uint8_t *) str;
   const grub_uint8_t *end;
   end = (const grub_uint8_t *) (str + grub_strlen (str));
 
   while (*ptr)
     {
-      ret = grub_utf8_to_ucs4 (&code, 1, ptr, end - ptr, &ptr);
+      grub_utf8_to_ucs4 (&code, 1, ptr, end - ptr, &ptr);
       grub_putcode (code, term);
     }
 }

=== modified file 'script/lua/grub_lua.h'
--- script/lua/grub_lua.h	2010-01-23 19:12:13 +0000
+++ script/lua/grub_lua.h	2011-10-24 13:22:24 +0000
@@ -104,7 +104,7 @@
 static inline int
 abs (int c)
 {
-  return (c >= 0) ? : -c;
+  return (c >= 0) ? c : -c;
 }
 
 int strcspn (const char *s1, const char *s2);

# Begin bundle
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