From 687d44b6eaa3c64a12af9bbd557b401419b208eb Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 29 Jul 2016 00:44:38 +0200 Subject: update src files *[ch] to libX11 1.3.4 --- nx-X11/lib/X11/ParseCmd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'nx-X11/lib/X11/ParseCmd.c') diff --git a/nx-X11/lib/X11/ParseCmd.c b/nx-X11/lib/X11/ParseCmd.c index fe796d7e5..b4bb97654 100644 --- a/nx-X11/lib/X11/ParseCmd.c +++ b/nx-X11/lib/X11/ParseCmd.c @@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -63,7 +63,7 @@ SOFTWARE. #include -static void _XReportParseError(XrmOptionDescRec *arg, char *msg) +static void _XReportParseError(XrmOptionDescRec *arg, const char *msg) { (void) fprintf(stderr, "Error parsing argument \"%s\" (%s); %s\n", arg->option, arg->specifier, msg); @@ -98,7 +98,7 @@ XrmParseCommand( XrmQPutStringResource(pdb, bindings, quarks, value_str); \ } /* PutCommandResource */ - myargc = (*argc); + myargc = (*argc); argend = argv + myargc; argsave = ++argv; @@ -157,7 +157,7 @@ XrmParseCommand( --(*argc); PutCommandResource(options[i].value); break; - + case XrmoptionIsArg: --(*argc); PutCommandResource(*argv); @@ -175,7 +175,7 @@ XrmParseCommand( } else (*argsave++) = (*argv); break; - + case XrmoptionResArg: if (myargc > 1) { ++argv; --myargc; --(*argc); --(*argc); @@ -183,13 +183,13 @@ XrmParseCommand( } else (*argsave++) = (*argv); break; - + case XrmoptionSkipArg: if (myargc > 1) { --myargc; (*argsave++) = (*argv++); } - (*argsave++) = (*argv); + (*argsave++) = (*argv); break; case XrmoptionSkipLine: @@ -217,7 +217,7 @@ XrmParseCommand( } } else - (*argsave++) = (*argv); /*compress arglist*/ + (*argsave++) = (*argv); /*compress arglist*/ } if (argsave < argend) -- cgit v1.2.3