2008-07-13 Pavel Roskin <proski@gnu.org>

	* lib/LzmaEnc.c (LzmaEnc_SetProps): Fix warning about comparison
	between signed and unsigned.
	(LzmaEnc_Finish): Fix warning about an unused parameter.

diff --git a/ChangeLog b/ChangeLog
index 055c39064daee62e8f99ea9047bc61e9280b1c1f..9dc5f5e4f519075d66b14a343da4de26f3385745 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-13  Pavel Roskin  <proski@gnu.org>
+
+       * lib/LzmaEnc.c (LzmaEnc_SetProps): Fix warning about comparison
+       between signed and unsigned.
+       (LzmaEnc_Finish): Fix warning about an unused parameter.
+
 2008-07-13  Bean  <bean123ch@gmail.com>
 
        * Makefile.in (enable_lzo): New rule.

diff --git a/lib/LzmaEnc.c b/lib/LzmaEnc.c
index 9f7e167719185547258e1b6b286dec3b407d25d4..842d43ac16c9e02a34f16fb44ad8f380d6a57fae 100644 (file)
--- a/lib/LzmaEnc.c
+++ b/lib/LzmaEnc.c
@@ -431,7 +431,7 @@ SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
   LzmaEncProps_Normalize(&props);
 
   if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
+      props.dictSize > (1U << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
     return SZ_ERROR_PARAM;
   p->dictSize = props.dictSize;
   p->matchFinderCycles = props.mc;
@@ -2170,6 +2170,8 @@ void LzmaEnc_Finish(CLzmaEncHandle pp)
   CLzmaEnc *p = (CLzmaEnc *)pp;
   if (p->mtMode)
     MatchFinderMt_ReleaseStream(&p->matchFinderMt);
+  #else
+  (void)pp;
   #endif
 }