* grub-core/lib/LzmaEnc.c (LzmaEnc_CodeOneBlock): Remove set but not

	used variable.
	* grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index b23f5156df200af2ba33ace26f810c27986f1809..b7bd30183339b840c168d51d2bec2f28883b4a3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/LzmaEnc.c (LzmaEnc_CodeOneBlock): Remove set but not
+       used variable.
+       * grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size):
+       Likewise.
+
 2011-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix potential problem with calling zfs_to_cpu and cpu_to_be in a row.

diff --git a/grub-core/kern/ia64/dl_helper.c b/grub-core/kern/ia64/dl_helper.c
index 91f28026e2c767eb6dad211bb6c60c2ffa5b9d19..958cdb25edd6f902d3571cf5662d99213ce2b5e1 100644 (file)
--- a/grub-core/kern/ia64/dl_helper.c
+++ b/grub-core/kern/ia64/dl_helper.c
@@ -30,7 +30,6 @@ grub_ia64_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
   const Elf64_Ehdr *e = ehdr;
   grub_size_t cntt = 0, cntg = 0;;
   const Elf64_Shdr *s;
-  Elf64_Word entsize;
   unsigned i;
 
   /* Find a symbol table.  */
@@ -43,8 +42,6 @@ grub_ia64_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
   if (i == grub_le_to_cpu16 (e->e_shnum))
     return;
 
-  entsize = s->sh_entsize;
-
   for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu32 (e->e_shoff));
        i < grub_le_to_cpu16 (e->e_shnum);
        i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize)))

diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
index 01ffa91f91baea4a65c543e49fdf5226059e243d..258ed9c911a3b5cf74efdbd4cf7df9a5876cf328 100644 (file)
--- a/grub-core/lib/LzmaEnc.c
+++ b/grub-core/lib/LzmaEnc.c
@@ -1994,13 +1994,15 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
 static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
 {
   UInt32 beforeSize = kNumOpts;
+#ifdef COMPRESS_MF_MT
   Bool btMode;
+#endif
   if (!RangeEnc_Alloc(&p->rc, alloc))
     return SZ_ERROR_MEM;
+#ifdef COMPRESS_MF_MT
   btMode = (p->matchFinderBase.btMode != 0);
-  #ifdef COMPRESS_MF_MT
   p->mtMode = (p->multiThread && !p->fastMode && btMode);
-  #endif
+#endif
 
   {
     unsigned lclp = p->lc + p->lp;