aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/ParseCmd.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/ParseCmd.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/ParseCmd.c')
-rw-r--r--libX11/src/ParseCmd.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libX11/src/ParseCmd.c b/libX11/src/ParseCmd.c
index fb79668ec..7d93f7650 100644
--- a/libX11/src/ParseCmd.c
+++ b/libX11/src/ParseCmd.c
@@ -29,13 +29,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
@@ -100,7 +100,7 @@ XrmParseCommand(
XrmQPutStringResource(pdb, bindings, quarks, value_str); \
} /* PutCommandResource */
- myargc = (*argc);
+ myargc = (*argc);
argend = argv + myargc;
argsave = ++argv;
@@ -159,7 +159,7 @@ XrmParseCommand(
--(*argc);
PutCommandResource(options[i].value);
break;
-
+
case XrmoptionIsArg:
--(*argc);
PutCommandResource(*argv);
@@ -177,7 +177,7 @@ XrmParseCommand(
} else
(*argsave++) = (*argv);
break;
-
+
case XrmoptionResArg:
if (myargc > 1) {
++argv; --myargc; --(*argc); --(*argc);
@@ -185,13 +185,13 @@ XrmParseCommand(
} else
(*argsave++) = (*argv);
break;
-
+
case XrmoptionSkipArg:
if (myargc > 1) {
--myargc;
(*argsave++) = (*argv++);
}
- (*argsave++) = (*argv);
+ (*argsave++) = (*argv);
break;
case XrmoptionSkipLine:
@@ -219,7 +219,7 @@ XrmParseCommand(
}
}
else
- (*argsave++) = (*argv); /*compress arglist*/
+ (*argsave++) = (*argv); /*compress arglist*/
}
if (argsave < argend)