Module Name: src
Committed By: mrg
Date: Wed Jun 22 04:03:24 UTC 2011
Modified Files:
src/usr.sbin/puffs/mount_9p: fs.c
src/usr.sbin/puffs/mount_psshfs: fs.c
Log Message:
remove some always true if () checks GCC 4.5.3 picks up.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/mount_9p/fs.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/puffs/mount_psshfs/fs.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/puffs/mount_9p/fs.c
diff -u src/usr.sbin/puffs/mount_9p/fs.c:1.8 src/usr.sbin/puffs/mount_9p/fs.c:1.9
--- src/usr.sbin/puffs/mount_9p/fs.c:1.8 Sun Aug 24 18:26:05 2008
+++ src/usr.sbin/puffs/mount_9p/fs.c Wed Jun 22 04:03:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.c,v 1.8 2008/08/24 18:26:05 pooka Exp $ */
+/* $NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.8 2008/08/24 18:26:05 pooka Exp $");
+__RCSID("$NetBSD: fs.c,v 1.9 2011/06/22 04:03:23 mrg Exp $");
#endif /* !lint */
#include <assert.h>
@@ -46,7 +46,7 @@
puffs_framebuf_seekset(a2, 0); \
*(a4) = 0; \
rv = fname(a1, a2, a3, a4); \
- if (rv || a4 == 0) errx(1, "p9p_handshake io failed %d, %d", rv, *a4)
+ if (rv) errx(1, "p9p_handshake io failed %d, %d", rv, *a4)
struct puffs_node *
p9p_handshake(struct puffs_usermount *pu,
Index: src/usr.sbin/puffs/mount_psshfs/fs.c
diff -u src/usr.sbin/puffs/mount_psshfs/fs.c:1.23 src/usr.sbin/puffs/mount_psshfs/fs.c:1.24
--- src/usr.sbin/puffs/mount_psshfs/fs.c:1.23 Fri Oct 29 16:13:51 2010
+++ src/usr.sbin/puffs/mount_psshfs/fs.c Wed Jun 22 04:03:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $ */
+/* $NetBSD: fs.c,v 1.24 2011/06/22 04:03:23 mrg Exp $ */
/*
* Copyright (c) 2006-2009 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $");
+__RCSID("$NetBSD: fs.c,v 1.24 2011/06/22 04:03:23 mrg Exp $");
#endif /* !lint */
#include <err.h>
@@ -46,7 +46,7 @@
puffs_framebuf_seekset(a2, 0); \
*(a4) = 0; \
rv = fname(a1, a2, a3, a4); \
- if (rv || a4 == 0) { \
+ if (rv) { \
return rv ? rv : EPROTO; \
} \
} while (/*CONSTCOND*/0)
