Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

_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.
This commit is contained in:
rin 2017-11-12 15:33:03 +00:00
parent b72c72dd34
commit 2d83cf0dc9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
external/bsd/nvi/dist/cl/cl_funcs.c vendored
View File

@ -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 * Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved. * 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 "; 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 */ #endif /* not lint */
#else #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 #endif
#include <sys/types.h> #include <sys/types.h>
@ -500,17 +500,21 @@ cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep)
clp = CLP(sp); clp = CLP(sp);
switch (val) { switch (val) {
case KEY_VEOF: case KEY_VEOF:
*dnep = (*chp = clp->orig.c_cc[VEOF]) == _POSIX_VDISABLE; *dnep =
(*chp = clp->orig.c_cc[VEOF]) == (CHAR_T)_POSIX_VDISABLE;
break; break;
case KEY_VERASE: case KEY_VERASE:
*dnep = (*chp = clp->orig.c_cc[VERASE]) == _POSIX_VDISABLE; *dnep =
(*chp = clp->orig.c_cc[VERASE]) == (CHAR_T)_POSIX_VDISABLE;
break; break;
case KEY_VKILL: case KEY_VKILL:
*dnep = (*chp = clp->orig.c_cc[VKILL]) == _POSIX_VDISABLE; *dnep =
(*chp = clp->orig.c_cc[VKILL]) == (CHAR_T)_POSIX_VDISABLE;
break; break;
#ifdef VWERASE #ifdef VWERASE
case KEY_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; break;
#endif #endif
default: default: