Module Name: src
Committed By: joerg
Date: Tue May 24 12:03:04 UTC 2011
Modified Files:
src/sbin/routed: parms.c
Log Message:
Use bitwise operators, logical and with a constant doesn't make sense
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sbin/routed/parms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/routed/parms.c
diff -u src/sbin/routed/parms.c:1.24 src/sbin/routed/parms.c:1.25
--- src/sbin/routed/parms.c:1.24 Mon Oct 26 02:53:15 2009
+++ src/sbin/routed/parms.c Tue May 24 12:03:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: parms.c,v 1.24 2009/10/26 02:53:15 christos Exp $ */
+/* $NetBSD: parms.c,v 1.25 2011/05/24 12:03:04 joerg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#include <sys/stat.h>
#ifdef __NetBSD__
-__RCSID("$NetBSD: parms.c,v 1.24 2009/10/26 02:53:15 christos Exp $");
+__RCSID("$NetBSD: parms.c,v 1.25 2011/05/24 12:03:04 joerg Exp $");
#elif defined(__FreeBSD__)
__RCSID("$FreeBSD$");
#else
@@ -900,11 +900,11 @@
if ((0 != (new->parm_int_state & GROUP_IS_SOL_OUT)
&& 0 != (parmp->parm_int_state & GROUP_IS_SOL_OUT)
&& 0 != ((new->parm_int_state ^ parmp->parm_int_state)
- && GROUP_IS_SOL_OUT))
+ & GROUP_IS_SOL_OUT))
|| (0 != (new->parm_int_state & GROUP_IS_ADV_OUT)
&& 0 != (parmp->parm_int_state & GROUP_IS_ADV_OUT)
&& 0 != ((new->parm_int_state ^ parmp->parm_int_state)
- && GROUP_IS_ADV_OUT))
+ & GROUP_IS_ADV_OUT))
|| (new->parm_rdisc_pref != 0
&& parmp->parm_rdisc_pref != 0
&& new->parm_rdisc_pref != parmp->parm_rdisc_pref)
