diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-29 00:44:38 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:29 +0200 |
commit | 687d44b6eaa3c64a12af9bbd557b401419b208eb (patch) | |
tree | 55c30ba6b0ae6a2618395fae92922ea4402d52f6 /nx-X11/lib/X11/ParseGeom.c | |
parent | ea24f0b0eb7b82ad879810c8e84292d6bf810bea (diff) | |
download | nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.tar.gz nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.tar.bz2 nx-libs-687d44b6eaa3c64a12af9bbd557b401419b208eb.zip |
update src files *[ch] to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/ParseGeom.c')
-rw-r--r-- | nx-X11/lib/X11/ParseGeom.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/nx-X11/lib/X11/ParseGeom.c b/nx-X11/lib/X11/ParseGeom.c index d77205882..dfd812fc9 100644 --- a/nx-X11/lib/X11/ParseGeom.c +++ b/nx-X11/lib/X11/ParseGeom.c @@ -33,24 +33,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 @@ -60,7 +42,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 @@ -68,7 +50,7 @@ ReadInteger(char *string, char **NextString) { register int Result = 0; int Sign = 1; - + if (*string == '+') string++; else if (*string == '-') @@ -108,13 +90,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) @@ -162,7 +144,7 @@ unsigned int *height) /* RETURN */ mask |= YValue; } } - + /* If strind isn't at the end of the string the it's an invalid geometry specification. */ |