From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1250-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 10589 invoked by alias); 31 Jan 2008 12:35:32 -0000
Received: (qmail 10575 invoked by uid 9447); 31 Jan 2008 12:35:32 -0000
Date: Thu, 31 Jan 2008 12:35:00 -0000
Message-ID: <20080131123532.10573.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib format_text/import_vsn1.c label/label.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2008-01/txt/msg00083.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2008-01-31 12:35:32

Modified files:
	lib/format_text: import_vsn1.c 
	lib/label      : label.c 

Log message:
	a couple more compiler warnings

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/import_vsn1.c.diff?cvsroot=lvm2&r1=1.49&r2=1.50
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/label/label.c.diff?cvsroot=lvm2&r1=1.40&r2=1.41

--- LVM2/lib/format_text/import_vsn1.c	2008/01/30 13:59:59	1.49
+++ LVM2/lib/format_text/import_vsn1.c	2008/01/31 12:35:31	1.50
@@ -524,7 +524,7 @@
 		case 0:
 			lv->read_ahead = DM_READ_AHEAD_AUTO;
 			break;
-		case -1:
+		case (uint32_t) -1:
 			lv->read_ahead = DM_READ_AHEAD_NONE;
 			break;
 		default:
--- LVM2/lib/label/label.c	2008/01/30 13:19:45	1.40
+++ LVM2/lib/label/label.c	2008/01/31 12:35:31	1.41
@@ -143,7 +143,7 @@
 				continue;
 			}
 			if (calc_crc(INITIAL_CRC, &lh->offset_xl, LABEL_SIZE -
-				     ((void *) &lh->offset_xl - (void *) lh)) !=
+				     ((uintptr_t) &lh->offset_xl - (uintptr_t) lh)) !=
 			    xlate32(lh->crc_xl)) {
 				log_info("Label checksum incorrect on %s - "
 					 "ignoring", dev_name(dev));
@@ -322,7 +322,7 @@
 		return_0;
 
 	lh->crc_xl = xlate32(calc_crc(INITIAL_CRC, &lh->offset_xl, LABEL_SIZE -
-				      ((void *) &lh->offset_xl - (void *) lh)));
+				      ((uintptr_t) &lh->offset_xl - (uintptr_t) lh)));
 
 	if (!dev_open(dev))
 		return_0;