[src/trunk]: src/lib/libcurses Don't hide assignments inside tests.

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/84359f3beae1
branches:  trunk
changeset: 994761:84359f3beae1
user:      uwe <uwe%NetBSD.org@localhost>
date:      Tue Nov 20 21:41:31 2018 +0000

description:
Don't hide assignments inside tests.

diffstat:

 lib/libcurses/cchar.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r b43924586c33 -r 84359f3beae1 lib/libcurses/cchar.c
--- a/lib/libcurses/cchar.c     Tue Nov 20 20:53:50 2018 +0000
+++ b/lib/libcurses/cchar.c     Tue Nov 20 21:41:31 2018 +0000
@@ -1,4 +1,4 @@
-/*   $NetBSD: cchar.c,v 1.7 2018/11/20 17:48:19 uwe Exp $ */
+/*   $NetBSD: cchar.c,v 1.8 2018/11/20 21:41:31 uwe Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: cchar.c,v 1.7 2018/11/20 17:48:19 uwe Exp $");
+__RCSID("$NetBSD: cchar.c,v 1.8 2018/11/20 21:41:31 uwe Exp $");
 #endif                                           /* not lint */
 
 #include <string.h>
@@ -58,11 +58,11 @@
        wchar_t *wp;
        size_t len;
 
-       if (opts)
+       if (__predict_false(opts != NULL))
                return ERR;
 
-       len = (wp = wmemchr(wcval->vals, L'\0', CCHARW_MAX))
-               ? wp - wcval->vals : CCHARW_MAX;
+       wp = wmemchr(wcval->vals, L'\0', CCHARW_MAX);
+       len = wp ? wp - wcval->vals : CCHARW_MAX;
 
        if (wch == NULL)
                return (int)len;
@@ -95,10 +95,12 @@
        int i;
        size_t len;
 
-       if (opts || (len = wcslen(wch)) > CCHARW_MAX
-               || (len > 1 && wcwidth(wch[0]) < 0)) {
+       if (__predict_false(opts != NULL))
                return ERR;
-       }
+
+       len = wcslen(wch);
+       if (len > CCHARW_MAX || (len > 1 && wcwidth(wch[0]) < 0))
+               return ERR;
 
        /*
         * If we have a following spacing-character, stop at that point.  We