CVS commit: src/sys/fs/cd9660

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Mar 12 02:36:25 UTC 2016

Modified Files:
        src/sys/fs/cd9660: cd9660_vnops.c

Log Message:
PR/50951: Unmess this up.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/fs/cd9660/cd9660_vnops.c

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


Modified files:

Index: src/sys/fs/cd9660/cd9660_vnops.c
diff -u src/sys/fs/cd9660/cd9660_vnops.c:1.53 src/sys/fs/cd9660/cd9660_vnops.c:1.54
--- src/sys/fs/cd9660/cd9660_vnops.c:1.53	Fri Mar 11 13:35:50 2016
+++ src/sys/fs/cd9660/cd9660_vnops.c	Fri Mar 11 21:36:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.53 2016/03/11 18:35:50 christos Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.54 2016/03/12 02:36:25 christos Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.53 2016/03/11 18:35:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.54 2016/03/12 02:36:25 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -319,7 +319,8 @@ iso_shipdir(struct isoreaddir *idp)
 	cl = idp->current.d_namlen;
 	cname = idp->current.d_name;
 
-	if ((assoc = cl) > 1 && *cname == ASSOCCHAR) {
+	assoc = (cl > 1) && (*cname == ASSOCCHAR);
+	if (assoc) {
 		cl--;
 		cname++;
 	}