Date: Wed, 13 Oct 2010 17:09:16 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213788 - head/sys/contrib/ngatm/netnatm/api Message-ID: <201010131709.o9DH9G2j094086@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Wed Oct 13 17:09:16 2010 New Revision: 213788 URL: http://svn.freebsd.org/changeset/base/213788 Log: Fix several cases were a conditional operator was used instead of a bitwise operator. Found with: clang Modified: head/sys/contrib/ngatm/netnatm/api/cc_conn.c Modified: head/sys/contrib/ngatm/netnatm/api/cc_conn.c ============================================================================== --- head/sys/contrib/ngatm/netnatm/api/cc_conn.c Wed Oct 13 17:06:25 2010 (r213787) +++ head/sys/contrib/ngatm/netnatm/api/cc_conn.c Wed Oct 13 17:09:16 2010 (r213788) @@ -977,25 +977,25 @@ cc_conn_sig_handle(struct ccconn *conn, /* * attributes */ - if (conn->dirty_attr && CCDIRTY_AAL) + if (conn->dirty_attr & CCDIRTY_AAL) resp->connect.aal = conn->aal; - if (conn->dirty_attr && CCDIRTY_BLLI) + if (conn->dirty_attr & CCDIRTY_BLLI) resp->connect.blli = conn->blli[conn->blli_selector - 1]; - if (conn->dirty_attr && CCDIRTY_CONNID) + if (conn->dirty_attr & CCDIRTY_CONNID) resp->connect.connid = conn->connid; /* XXX NOTIFY */ - if (conn->dirty_attr && CCDIRTY_EETD) + if (conn->dirty_attr & CCDIRTY_EETD) resp->connect.eetd = conn->eetd; /* XXX GIT */ /* XXX UU */ - if (conn->dirty_attr && CCDIRTY_TRAFFIC) + if (conn->dirty_attr & CCDIRTY_TRAFFIC) resp->connect.traffic = conn->traffic; - if (conn->dirty_attr && CCDIRTY_EXQOS) + if (conn->dirty_attr & CCDIRTY_EXQOS) resp->connect.exqos = conn->exqos; - if (conn->dirty_attr && CCDIRTY_ABRSETUP) + if (conn->dirty_attr & CCDIRTY_ABRSETUP) resp->connect.abrsetup = conn->abrsetup; - if (conn->dirty_attr && CCDIRTY_ABRADD) + if (conn->dirty_attr & CCDIRTY_ABRADD) resp->connect.abradd = conn->abradd; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010131709.o9DH9G2j094086>