Fix const handling in XSetLocaleModifiers

Instead of reusing the input parameter to store the output, make a result variable instead, so that there's less const confusion. Fixes gcc warnings: lcWrap.c: In function 'XSetLocaleModifiers': lcWrap.c:87:18: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] lcWrap.c:91:25: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] lcWrap.c:93:12: warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Fix const handling in XSetLocaleModifiers
e667b905 · Alan Coopersmith · Ulrich Sibiller · d2671c28 · e667b905
Commit e667b905 authored Aug 10, 2013 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

lcWrap.c nx-X11/lib/X11/lcWrap.c +5 -5

No files found.
--- a/nx-X11/lib/X11/lcWrap.c
+++ b/nx-X11/lib/X11/lcWrap.c
@@ -77,20 +77,20 @@ XSetLocaleModifiers(
 {
    XLCd lcd = _XlcCurrentLC();
    char *user_mods;
+    char *mapped_mods;

    if (!lcd)
 	return (char *) NULL;
    if (!modifiers)
 	return lcd->core->modifiers;
    user_mods = getenv("XMODIFIERS");
-    modifiers = (*lcd->methods->map_modifiers) (lcd,
-						user_mods, (char *)modifiers);
-    if (modifiers) {
+    mapped_mods = (*lcd->methods->map_modifiers) (lcd, user_mods, modifiers);
+    if (mapped_mods) {
 	if (lcd->core->modifiers)
 	    Xfree(lcd->core->modifiers);
-	lcd->core->modifiers = (char *)modifiers;
+	lcd->core->modifiers = mapped_mods;
    }
-    return (char *)modifiers;
+    return mapped_mods;
 }

 Bool