Date: Wed, 19 Nov 2014 07:47:37 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274698 - head/sys/contrib/ngatm/netnatm/saal Message-ID: <201411190747.sAJ7lbwx067633@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Wed Nov 19 07:47:37 2014 New Revision: 274698 URL: https://svnweb.freebsd.org/changeset/base/274698 Log: Fix the following -Werror warning from clang 3.5.0, while building lib/libngatm: sys/contrib/ngatm/netnatm/saal/saal_sscop.c:4030:32: error: 'break' is bound to current loop, GCC binds it to the enclosing loop [-Werror,-Wgcc-compat] } while(sn < sscop->vr_h && !QFIND(&sscop->rbuf, sn)); ^ sys/contrib/ngatm/netnatm/saal/saal_sscop.c:173:4: note: expanded from macro 'QFIND' break; \ ^ 1 error generated. The idea is to remove any ambiguity by replacing the macro with an equivalent static inline function. Reviewed by: emaste, rpaulo See also: http://reviews.llvm.org/D2518 Differential Revision: https://reviews.freebsd.org/D1188 Modified: head/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Modified: head/sys/contrib/ngatm/netnatm/saal/saal_sscop.c ============================================================================== --- head/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Wed Nov 19 07:44:21 2014 (r274697) +++ head/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Wed Nov 19 07:47:37 2014 (r274698) @@ -163,18 +163,17 @@ static void sscop_set_state(struct sscop } \ } while(0) - -#define QFIND(Q,RN) \ - ({ \ - struct sscop_msg *_msg = NULL, *_m; \ - MSGQ_FOREACH(_m, (Q)) { \ - if(_m->seqno == (RN)) { \ - _msg = _m; \ - break; \ - } \ - } \ - _msg; \ - }) +static inline struct sscop_msg *QFIND(sscop_msgq_head_t *q, u_int rn) +{ + struct sscop_msg *msg = NULL, *m; + MSGQ_FOREACH(m, q) { + if(m->seqno == rn) { + msg = m; + break; + } + } + return msg; +} #define QINSERT(Q,M) \ do { \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411190747.sAJ7lbwx067633>