Source-Changes-HG archive

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

[src/trunk]: src/lib/libedit Elide gcc warning about intermediate const casts...



details:   https://anonhg.NetBSD.org/src/rev/53904c2632d9
branches:  trunk
changeset: 815284:53904c2632d9
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 09 21:37:34 2016 +0000

description:
Elide gcc warning about intermediate const casts caused by visibility change.

diffstat:

 lib/libedit/eln.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 49dd00cf60b7 -r 53904c2632d9 lib/libedit/eln.c
--- a/lib/libedit/eln.c Mon May 09 21:27:55 2016 +0000
+++ b/lib/libedit/eln.c Mon May 09 21:37:34 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eln.c,v 1.33 2016/04/11 18:56:31 christos Exp $        */
+/*     $NetBSD: eln.c,v 1.34 2016/05/09 21:37:34 christos Exp $        */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.33 2016/04/11 18:56:31 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.34 2016/05/09 21:37:34 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <errno.h>
@@ -91,8 +91,7 @@
        int ret;
        const wchar_t **wargv;
 
-       wargv = (const wchar_t **)
-           ct_decode_argv(argc, argv, &el->el_lgcyconv);
+       wargv = (void *)ct_decode_argv(argc, argv, &el->el_lgcyconv);
        if (!wargv)
                return -1;
        ret = el_wparse(el, argc, wargv);
@@ -171,8 +170,7 @@
                        if ((argv[i] = va_arg(ap, const char *)) == NULL)
                            break;
                argv[0] = argv[i] = NULL;
-               wargv = (const wchar_t **)
-                   ct_decode_argv(i + 1, argv, &el->el_lgcyconv);
+               wargv = (void *)ct_decode_argv(i + 1, argv, &el->el_lgcyconv);
                if (!wargv) {
                    ret = -1;
                    goto out;



Home | Main Index | Thread Index | Old Index