From 491884972873879acc9a9ee1e70eb6a882fac78e Mon Sep 17 00:00:00 2001 From: dogcow Date: Tue, 16 May 2006 00:16:59 +0000 Subject: [PATCH] pointer signedness comparison fixes --- distrib/utils/sysinst/label.c | 8 ++++---- distrib/utils/sysinst/mbr.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/distrib/utils/sysinst/label.c b/distrib/utils/sysinst/label.c index ff93bd05ee70..460b6673d84f 100644 --- a/distrib/utils/sysinst/label.c +++ b/distrib/utils/sysinst/label.c @@ -1,4 +1,4 @@ -/* $NetBSD: label.c,v 1.47 2005/03/14 21:37:43 dsl Exp $ */ +/* $NetBSD: label.c,v 1.48 2006/05/16 00:16:59 dogcow Exp $ */ /* * Copyright 1997 Jonathan Stone @@ -36,7 +36,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: label.c,v 1.47 2005/03/14 21:37:43 dsl Exp $"); +__RCSID("$NetBSD: label.c,v 1.48 2006/05/16 00:16:59 dogcow Exp $"); #endif #include @@ -724,7 +724,7 @@ get_last_mounted(int fd, int partstart) case FS_UFS1_MAGIC_SWAPPED: if (!(SB->fs_old_flags & FS_FLAGS_UPDATED)) { if (*sbp == SBLOCK_UFS1) - mnt = SB->fs_fsmnt; + mnt = (const char *) SB->fs_fsmnt; continue; } /* FALLTHROUGH */ @@ -732,7 +732,7 @@ get_last_mounted(int fd, int partstart) case FS_UFS2_MAGIC_SWAPPED: /* Check we have the main superblock */ if (SB->fs_sblockloc == *sbp) - mnt = SB->fs_fsmnt; + mnt = (const char *) SB->fs_fsmnt; continue; } diff --git a/distrib/utils/sysinst/mbr.c b/distrib/utils/sysinst/mbr.c index 3dbef11b6ddc..301504feca14 100644 --- a/distrib/utils/sysinst/mbr.c +++ b/distrib/utils/sysinst/mbr.c @@ -1,4 +1,4 @@ -/* $NetBSD: mbr.c,v 1.73 2006/05/12 21:22:34 dsl Exp $ */ +/* $NetBSD: mbr.c,v 1.74 2006/05/16 00:16:59 dogcow Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -329,7 +329,7 @@ set_mbr_type(menudesc *m, void *arg) char *cp; int opt = mbri->opt; int type; - int start, sz; + u_int start, sz; int i; char numbuf[4]; @@ -904,8 +904,8 @@ edit_mbr_bootmenu(menudesc *m, void *arg) opt = 0; msg_prompt_win(/* XXX translate? */ "bootmenu", -1, 18, 0, 0, - mbri->mbrb.mbrbs_nametab[opt], - mbri->mbrb.mbrbs_nametab[opt], + (char *) mbri->mbrb.mbrbs_nametab[opt], + (char *) mbri->mbrb.mbrbs_nametab[opt], sizeof mbri->mbrb.mbrbs_nametab[opt]); if (mbri->mbrb.mbrbs_nametab[opt][0] == ' ') mbri->mbrb.mbrbs_nametab[opt][0] = 0;