aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/ParseGeom.c
diff options
context:
space:
mode:
Diffstat (limited to 'libX11/src/ParseGeom.c')
-rw-r--r--libX11/src/ParseGeom.c28
1 files changed, 5 insertions, 23 deletions
diff --git a/libX11/src/ParseGeom.c b/libX11/src/ParseGeom.c
index 6aaaccf07..ba6e45eb9 100644
--- a/libX11/src/ParseGeom.c
+++ b/libX11/src/ParseGeom.c
@@ -35,24 +35,6 @@ from The Open Group.
#include "Xlibint.h"
#include "Xutil.h"
-#ifdef notdef
-/*
- *Returns pointer to first char ins search which is also in what, else NULL.
- */
-static char *strscan (search, what)
-char *search, *what;
-{
- int i, len = strlen (what);
- char c;
-
- while ((c = *(search++)) != NULL)
- for (i = 0; i < len; i++)
- if (c == what [i])
- return (--search);
- return (NULL);
-}
-#endif
-
/*
* XParseGeometry parses strings of the form
* "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
@@ -62,7 +44,7 @@ char *search, *what;
* It returns a bitmask that indicates which of the four values
* were actually found in the string. For each value found,
* the corresponding argument is updated; for each value
- * not found, the corresponding argument is left unchanged.
+ * not found, the corresponding argument is left unchanged.
*/
static int
@@ -70,7 +52,7 @@ ReadInteger(char *string, char **NextString)
{
register int Result = 0;
int Sign = 1;
-
+
if (*string == '+')
string++;
else if (*string == '-')
@@ -110,13 +92,13 @@ unsigned int *height) /* RETURN */
strind = (char *)string;
if (*strind != '+' && *strind != '-' && *strind != 'x') {
tempWidth = ReadInteger(strind, &nextCharacter);
- if (strind == nextCharacter)
+ if (strind == nextCharacter)
return (0);
strind = nextCharacter;
mask |= WidthValue;
}
- if (*strind == 'x' || *strind == 'X') {
+ if (*strind == 'x' || *strind == 'X') {
strind++;
tempHeight = ReadInteger(strind, &nextCharacter);
if (strind == nextCharacter)
@@ -164,7 +146,7 @@ unsigned int *height) /* RETURN */
mask |= YValue;
}
}
-
+
/* If strind isn't at the end of the string the it's an invalid
geometry specification. */