Module Name: src
Committed By: rin
Date: Sun Nov 12 15:26:34 UTC 2017
Modified Files:
src/external/bsd/nvi/dist/common: util.c
Log Message:
No need to cast endp in both cases of USE_WIDECHAR == "yes" nor "no".
Note that RCHAR_T is intended to use for bundled regex, not for nvi itself.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/util.c
diff -u src/external/bsd/nvi/dist/common/util.c:1.3 src/external/bsd/nvi/dist/common/util.c:1.4
--- src/external/bsd/nvi/dist/common/util.c:1.3 Sun Jan 26 21:43:45 2014
+++ src/external/bsd/nvi/dist/common/util.c Sun Nov 12 15:26:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.3 2014/01/26 21:43:45 christos Exp $ */
+/* $NetBSD: util.c,v 1.4 2017/11/12 15:26:33 rin Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = "Id: util.c,v 10.22 2001/06/25 15:19:12 skimo Exp (Berkeley) Date: 2001/06/25 15:19:12 ";
#endif /* not lint */
#else
-__RCSID("$NetBSD: util.c,v 1.3 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: util.c,v 1.4 2017/11/12 15:26:33 rin Exp $");
#endif
#include <sys/types.h>
@@ -169,7 +169,7 @@ enum nresult
nget_uslong(SCR *sp, u_long *valp, const CHAR_T *p, CHAR_T **endp, int base)
{
errno = 0;
- *valp = STRTOUL(p, (RCHAR_T **)endp, base);
+ *valp = STRTOUL(p, endp, base);
if (errno == 0)
return (NUM_OK);
if (errno == ERANGE && *valp == ULONG_MAX)
@@ -187,7 +187,7 @@ enum nresult
nget_slong(SCR *sp, long int *valp, const CHAR_T *p, CHAR_T **endp, int base)
{
errno = 0;
- *valp = STRTOL(p, (RCHAR_T **)endp, base);
+ *valp = STRTOL(p, endp, base);
if (errno == 0)
return (NUM_OK);
if (errno == ERANGE) {
