X11/src StrKeysym.c,3.10,3.11

[Daniel Stone]

Committed by: daniels

Update of /cvs/xlibs/X11/src
In directory gabe:/tmp/cvs-serv2930

Modified Files:
	StrKeysym.c 
Log Message:
Resync with Markus Kuhn's cleanup in X.Org HEAD.

Index: StrKeysym.c
===================================================================
RCS file: /cvs/xlibs/X11/src/StrKeysym.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- StrKeysym.c	28 Jan 2005 18:48:07 -0000	3.10
+++ StrKeysym.c	28 Jan 2005 18:53:55 -0000	3.11
@@ -138,13 +138,14 @@
 	    else if ('a' <= c && c <= 'f') val = (val<<4)+c-'a'+10;
 	    else if ('A' <= c && c <= 'F') val = (val<<4)+c-'A'+10;
 	    else return NoSymbol;
-
+            if (val > 0x10ffff)
+                return NoSymbol;
 	}
+	if (val < 0x20 || (val > 0x73 && val < 0xa0))
+            return NoSymbol;
 	if (val < 0x100)
             return val;
-	if (val > 0x10ffff || val < 0x100)
-	    return NoSymbol;
         return val | 0x01000000;
     }
-    return (NoSymbol);
+    return NoSymbol;
 }