Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/puffs remove some always true if () checks GCC 4.5....



details:   https://anonhg.NetBSD.org/src/rev/2dfe6e6f6f2f
branches:  trunk
changeset: 766419:2dfe6e6f6f2f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 22 04:03:23 2011 +0000

description:
remove some always true if () checks GCC 4.5.3 picks up.

diffstat:

 usr.sbin/puffs/mount_9p/fs.c     |  6 +++---
 usr.sbin/puffs/mount_psshfs/fs.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 12fdc64e0ed7 -r 2dfe6e6f6f2f usr.sbin/puffs/mount_9p/fs.c
--- a/usr.sbin/puffs/mount_9p/fs.c      Wed Jun 22 04:02:46 2011 +0000
+++ b/usr.sbin/puffs/mount_9p/fs.c      Wed Jun 22 04:03:23 2011 +0000
@@ -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,
diff -r 12fdc64e0ed7 -r 2dfe6e6f6f2f usr.sbin/puffs/mount_psshfs/fs.c
--- a/usr.sbin/puffs/mount_psshfs/fs.c  Wed Jun 22 04:02:46 2011 +0000
+++ b/usr.sbin/puffs/mount_psshfs/fs.c  Wed Jun 22 04:03:23 2011 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index