CVS commit: src/usr.sbin/makefs

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Sun Apr 29 13:32:21 UTC 2012

Modified Files:
        src/usr.sbin/makefs: makefs.c
        src/usr.sbin/makefs/cd9660: iso9660_rrip.c

Log Message:
usage is dead. name_len should be read as unsigned byte.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/makefs/cd9660/iso9660_rrip.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/makefs/makefs.c
diff -u src/usr.sbin/makefs/makefs.c:1.33 src/usr.sbin/makefs/makefs.c:1.34
--- src/usr.sbin/makefs/makefs.c:1.33	Thu Apr 19 17:09:53 2012
+++ src/usr.sbin/makefs/makefs.c	Sun Apr 29 13:32:21 2012
@@ -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[])

Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.10 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.11
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.10	Sun May 29 17:07:58 2011
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sun Apr 29 13:32:21 2012
@@ -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 *
 		}
 		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);
 		}