Source-Changes-HG archive

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

[src/trunk]: src/external/bsd/nvi/dist/cl _POSIX_VDISABLE exceeds CHAR_MAX. W...



details:   https://anonhg.NetBSD.org/src/rev/f3241a407eba
branches:  trunk
changeset: 357475:f3241a407eba
user:      rin <rin%NetBSD.org@localhost>
date:      Sun Nov 12 15:33:03 2017 +0000

description:
_POSIX_VDISABLE exceeds CHAR_MAX. We thus need to cast it to CHAR_T for the
case where USE_WIDECHAR != "yes", i.e., CHAR_T is char.

diffstat:

 external/bsd/nvi/dist/cl/cl_funcs.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 126b2ff013b9 -r f3241a407eba external/bsd/nvi/dist/cl/cl_funcs.c
--- a/external/bsd/nvi/dist/cl/cl_funcs.c       Sun Nov 12 15:27:53 2017 +0000
+++ b/external/bsd/nvi/dist/cl/cl_funcs.c       Sun Nov 12 15:33:03 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cl_funcs.c,v 1.4 2014/01/26 21:43:45 christos Exp $ */
+/*     $NetBSD: cl_funcs.c,v 1.5 2017/11/12 15:33:03 rin Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: cl_funcs.c,v 10.72 2002/03/02 23:18:33 skimo Exp  (Berkeley) Date: 2002/03/02 23:18:33 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: cl_funcs.c,v 1.4 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: cl_funcs.c,v 1.5 2017/11/12 15:33:03 rin Exp $");
 #endif
 
 #include <sys/types.h>
@@ -500,17 +500,21 @@
        clp = CLP(sp);
        switch (val) {
        case KEY_VEOF:
-               *dnep = (*chp = clp->orig.c_cc[VEOF]) == _POSIX_VDISABLE;
+               *dnep =
+                   (*chp = clp->orig.c_cc[VEOF]) == (CHAR_T)_POSIX_VDISABLE;
                break;
        case KEY_VERASE:
-               *dnep = (*chp = clp->orig.c_cc[VERASE]) == _POSIX_VDISABLE;
+               *dnep =
+                   (*chp = clp->orig.c_cc[VERASE]) == (CHAR_T)_POSIX_VDISABLE;
                break;
        case KEY_VKILL:
-               *dnep = (*chp = clp->orig.c_cc[VKILL]) == _POSIX_VDISABLE;
+               *dnep = 
+                   (*chp = clp->orig.c_cc[VKILL]) == (CHAR_T)_POSIX_VDISABLE;
                break;
 #ifdef VWERASE
        case KEY_VWERASE:
-               *dnep = (*chp = clp->orig.c_cc[VWERASE]) == _POSIX_VDISABLE;
+               *dnep =
+                   (*chp = clp->orig.c_cc[VWERASE]) == (CHAR_T)_POSIX_VDISABLE;
                break;
 #endif
        default:



Home | Main Index | Thread Index | Old Index