From: Robert Spalek <robert@ucw.cz>
Date: Sat, 19 Feb 2005 22:23:38 +0000 (+0000)
Subject: comparison of signed and unsigned encountered without CONFIG_LFS
X-Git-Tag: holmes-import~823
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e1642f1c4125567b5b3054701a085b0a2ec94f9b;p=libucw.git

comparison of signed and unsigned encountered without CONFIG_LFS
---

diff --git a/lib/partmap.c b/lib/partmap.c
index 04e08912..7a31de28 100644
--- a/lib/partmap.c
+++ b/lib/partmap.c
@@ -65,16 +65,16 @@ partmap_close(struct partmap *p)
 void *
 partmap_map(struct partmap *p, sh_off_t start, uns size)
 {
-  if (!p->start_map || start < p->start_off || start+size > p->end_off)
+  if (!p->start_map || start < p->start_off || (sh_off_t) (start+size) > p->end_off)
     {
       if (p->start_map)
 	munmap(p->start_map, p->end_off - p->start_off);
       sh_off_t end = start + size;
       sh_off_t win_start = start/PAGE_SIZE * PAGE_SIZE;
       uns win_len = PARTMAP_WINDOW;
-      if (win_start+win_len > p->file_size)
+      if ((sh_off_t) (win_start+win_len) > p->file_size)
 	win_len = ALIGN(p->file_size - win_start, PAGE_SIZE);
-      if (win_start+win_len < end)
+      if ((sh_off_t) (win_start+win_len) < end)
 	die("partmap_map: Window is too small for mapping %d bytes", size);
       p->start_map = sh_mmap(NULL, win_len, p->writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, p->fd, win_start);
       if (p->start_map == MAP_FAILED)
diff --git a/lib/sorter.h b/lib/sorter.h
index c33103dd..3d31b656 100644
--- a/lib/sorter.h
+++ b/lib/sorter.h
@@ -304,7 +304,7 @@ P(presort)(struct fastbuf **fb1, struct fastbuf **fb2)
 	{
 	  run_count++;
 #ifdef SORT_UP_TO
-	  if (sorter_presort_bufsize < SORT_UP_TO)
+	  if (sorter_presort_bufsize < (uns) SORT_UP_TO)
 #endif
 	    SWAP(out1, out2, tbuf);
 	  if (!out1)