From 17770eb834f2838cc3fd2256fae8198523a239ce Mon Sep 17 00:00:00 2001 From: joerg <joerg@NetBSD.org> Date: Sun, 29 Apr 2012 13:32:21 +0000 Subject: [PATCH] usage is dead. name_len should be read as unsigned byte. --- usr.sbin/makefs/cd9660/iso9660_rrip.c | 8 ++++---- usr.sbin/makefs/makefs.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index d2796405409f..009d660313c1 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -1,4 +1,4 @@ -/* $NetBSD: iso9660_rrip.c,v 1.10 2011/05/29 17:07:58 tsutsui Exp $ */ +/* $NetBSD: iso9660_rrip.c,v 1.11 2012/04/29 13:32:21 joerg Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -43,7 +43,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: iso9660_rrip.c,v 1.10 2011/05/29 17:07:58 tsutsui Exp $"); +__RCSID("$NetBSD: iso9660_rrip.c,v 1.11 2012/04/29 13:32:21 joerg Exp $"); #endif /* !__lint */ static void cd9660_rrip_initialize_inode(cd9660node *); @@ -421,9 +421,9 @@ cd9660_rrip_initialize_node(cd9660node *node, cd9660node *parent, } else if ((node->node != NULL) && ((strlen(node->node->name) != - (int)node->isoDirRecord->name_len[0]) || + (uint8_t)node->isoDirRecord->name_len[0]) || (memcmp(node->node->name,node->isoDirRecord->name, - (int) node->isoDirRecord->name_len[0]) != 0))) { + (uint8_t)node->isoDirRecord->name_len[0]) != 0))) { cd9660_rrip_NM(node); } diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c index 3ad22ddde673..b4e3d352839f 100644 --- a/usr.sbin/makefs/makefs.c +++ b/usr.sbin/makefs/makefs.c @@ -1,4 +1,4 @@ -/* $NetBSD: makefs.c,v 1.33 2012/04/19 17:09:53 christos Exp $ */ +/* $NetBSD: makefs.c,v 1.34 2012/04/29 13:32:21 joerg Exp $ */ /* * Copyright (c) 2001-2003 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: makefs.c,v 1.33 2012/04/19 17:09:53 christos Exp $"); +__RCSID("$NetBSD: makefs.c,v 1.34 2012/04/29 13:32:21 joerg Exp $"); #endif /* !__lint */ #include <assert.h> @@ -84,8 +84,7 @@ u_int debug; struct timespec start_time; static fstype_t *get_fstype(const char *); -static void usage(void); -int main(int, char *[]); +static void usage(void) __dead; int main(int argc, char *argv[])