Synchronised line endinge with release branch

1 files changed, 242 insertions, 242 deletions

diff --git a/libXfont/src/util/atom.c b/libXfont/src/util/atom.c
index d2d628ece..f15e3d8de 100644
--- a/libXfont/src/util/atom.c
+++ b/libXfont/src/util/atom.c
@@ -1,242 +1,242 @@
-/*

-

-Copyright 1990, 1994, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-/*

- * Author:  Keith Packard, MIT X Consortium

- */

-

-/* lame atom replacement routines for font applications */

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/fonts/fontmisc.h>

-#include "stubs.h"

-

-typedef struct _AtomList {

-    char		*name;

-    int			len;

-    int			hash;

-    Atom		atom;

-} AtomListRec, *AtomListPtr;

-

-static AtomListPtr  *hashTable;

-

-static int	    hashSize, hashUsed;

-static int	    hashMask;

-static int	    rehash;

-

-static AtomListPtr  *reverseMap;

-static int	    reverseMapSize;

-static Atom	    lastAtom;

-

-static int

-Hash(char *string, int len)

-{

-    int	h;

-

-    h = 0;

-    while (len--)

-	h = (h << 3) ^ *string++;

-    if (h < 0)

-	return -h;

-    return h;

-}

-

-static int

-ResizeHashTable (void)

-{

-    int		newHashSize;

-    int		newHashMask;

-    AtomListPtr	*newHashTable;

-    int		i;

-    int		h;

-    int		newRehash;

-    int		r;

-

-    if (hashSize == 0)

-	newHashSize = 1024;

-    else

-	newHashSize = hashSize * 2;

-    newHashTable = calloc (newHashSize, sizeof (AtomListPtr));

-    if (!newHashTable) {

-	fprintf(stderr, "ResizeHashTable(): Error: Couldn't allocate"

-		" newHashTable (%ld)\n",

-		newHashSize * (unsigned long)sizeof (AtomListPtr));

-	return FALSE;

-    }

-    newHashMask = newHashSize - 1;

-    newRehash = (newHashMask - 2);

-    for (i = 0; i < hashSize; i++)

-    {

-	if (hashTable[i])

-	{

-	    h = (hashTable[i]->hash) & newHashMask;

-	    if (newHashTable[h])

-	    {

-		r = hashTable[i]->hash % newRehash | 1;

-		do {

-		    h += r;

-		    if (h >= newHashSize)

-			h -= newHashSize;

-		} while (newHashTable[h]);

-	    }

-	    newHashTable[h] = hashTable[i];

-	}

-    }

-    free (hashTable);

-    hashTable = newHashTable;

-    hashSize = newHashSize;

-    hashMask = newHashMask;

-    rehash = newRehash;

-    return TRUE;

-}

-

-static int

-ResizeReverseMap (void)

-{

-    int ret = TRUE;

-    if (reverseMapSize == 0)

-	reverseMapSize = 1000;

-    else

-	reverseMapSize *= 2;

-    reverseMap = realloc (reverseMap, reverseMapSize * sizeof (AtomListPtr));

-    if (!reverseMap) {

-	fprintf(stderr, "ResizeReverseMap(): Error: Couldn't reallocate"

-		" reverseMap (%ld)\n",

-		reverseMapSize * (unsigned long)sizeof(AtomListPtr));

-	ret = FALSE;

-    }

-    return ret;

-}

-

-static int

-NameEqual (const char *a, const char *b, int l)

-{

-    while (l--)

-	if (*a++ != *b++)

-	    return FALSE;

-    return TRUE;

-}

-

-#ifdef __SUNPRO_C

-#pragma weak MakeAtom

-#endif

-

-weak Atom 

-MakeAtom(char *string, unsigned len, int makeit)

-{

-    AtomListPtr	a;

-    int		hash;

-    int		h = 0;

-    int		r;

-

-    hash = Hash (string, len);

-    if (hashTable)

-    {

-    	h = hash & hashMask;

-	if (hashTable[h])

-	{

-	    if (hashTable[h]->hash == hash && hashTable[h]->len == len &&

-	    	NameEqual (hashTable[h]->name, string, len))

-	    {

-	    	return hashTable[h]->atom;

-	    }

-	    r = (hash % rehash) | 1;

-	    for (;;)

-	    {

-		h += r;

-		if (h >= hashSize)

-		    h -= hashSize;

-		if (!hashTable[h])

-		    break;

-		if (hashTable[h]->hash == hash && hashTable[h]->len == len &&

-		    NameEqual (hashTable[h]->name, string, len))

-		{

-		    return hashTable[h]->atom;

-		}

-	    }

-    	}

-    }

-    if (!makeit)

-	return None;

-    a = malloc (sizeof (AtomListRec) + len + 1);

-    if (a == NULL) {

-	fprintf(stderr, "MakeAtom(): Error: Couldn't allocate AtomListRec"

-		" (%ld)\n", (unsigned long)sizeof (AtomListRec) + len + 1);

-	return None;

-    }

-    a->name = (char *) (a + 1);

-    a->len = len;

-    strncpy (a->name, string, len);

-    a->name[len] = '\0';

-    a->atom = ++lastAtom;

-    a->hash = hash;

-    if (hashUsed >= hashSize / 2)

-    {

-	ResizeHashTable ();

-	h = hash & hashMask;

-	if (hashTable[h])

-	{

-	    r = (hash % rehash) | 1;

-	    do {

-		h += r;

-		if (h >= hashSize)

-		    h -= hashSize;

-	    } while (hashTable[h]);

-	}

-    }

-    hashTable[h] = a;

-    hashUsed++;

-    if (reverseMapSize <= a->atom) {

-	if (!ResizeReverseMap())

-	    return None;

-    }

-    reverseMap[a->atom] = a;

-    return a->atom;

-}

-

-#ifdef __SUNPRO_C

-#pragma weak ValidAtom

-#endif

-

-weak int 

-ValidAtom(Atom atom)

-{

-    return (atom != None) && (atom <= lastAtom);

-}

-

-#ifdef __SUNPRO_C

-#pragma weak NameForAtom

-#endif

-

-weak char *

-NameForAtom(Atom atom)

-{

-    if (atom != None && atom <= lastAtom)

-	return reverseMap[atom]->name;

-    return NULL;

-}

+/*
+
+Copyright 1990, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+/*
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+/* lame atom replacement routines for font applications */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/fonts/fontmisc.h>
+#include "stubs.h"
+
+typedef struct _AtomList {
+    char		*name;
+    int			len;
+    int			hash;
+    Atom		atom;
+} AtomListRec, *AtomListPtr;
+
+static AtomListPtr  *hashTable;
+
+static int	    hashSize, hashUsed;
+static int	    hashMask;
+static int	    rehash;
+
+static AtomListPtr  *reverseMap;
+static int	    reverseMapSize;
+static Atom	    lastAtom;
+
+static int
+Hash(char *string, int len)
+{
+    int	h;
+
+    h = 0;
+    while (len--)
+	h = (h << 3) ^ *string++;
+    if (h < 0)
+	return -h;
+    return h;
+}
+
+static int
+ResizeHashTable (void)
+{
+    int		newHashSize;
+    int		newHashMask;
+    AtomListPtr	*newHashTable;
+    int		i;
+    int		h;
+    int		newRehash;
+    int		r;
+
+    if (hashSize == 0)
+	newHashSize = 1024;
+    else
+	newHashSize = hashSize * 2;
+    newHashTable = calloc (newHashSize, sizeof (AtomListPtr));
+    if (!newHashTable) {
+	fprintf(stderr, "ResizeHashTable(): Error: Couldn't allocate"
+		" newHashTable (%ld)\n",
+		newHashSize * (unsigned long)sizeof (AtomListPtr));
+	return FALSE;
+    }
+    newHashMask = newHashSize - 1;
+    newRehash = (newHashMask - 2);
+    for (i = 0; i < hashSize; i++)
+    {
+	if (hashTable[i])
+	{
+	    h = (hashTable[i]->hash) & newHashMask;
+	    if (newHashTable[h])
+	    {
+		r = hashTable[i]->hash % newRehash | 1;
+		do {
+		    h += r;
+		    if (h >= newHashSize)
+			h -= newHashSize;
+		} while (newHashTable[h]);
+	    }
+	    newHashTable[h] = hashTable[i];
+	}
+    }
+    free (hashTable);
+    hashTable = newHashTable;
+    hashSize = newHashSize;
+    hashMask = newHashMask;
+    rehash = newRehash;
+    return TRUE;
+}
+
+static int
+ResizeReverseMap (void)
+{
+    int ret = TRUE;
+    if (reverseMapSize == 0)
+	reverseMapSize = 1000;
+    else
+	reverseMapSize *= 2;
+    reverseMap = realloc (reverseMap, reverseMapSize * sizeof (AtomListPtr));
+    if (!reverseMap) {
+	fprintf(stderr, "ResizeReverseMap(): Error: Couldn't reallocate"
+		" reverseMap (%ld)\n",
+		reverseMapSize * (unsigned long)sizeof(AtomListPtr));
+	ret = FALSE;
+    }
+    return ret;
+}
+
+static int
+NameEqual (const char *a, const char *b, int l)
+{
+    while (l--)
+	if (*a++ != *b++)
+	    return FALSE;
+    return TRUE;
+}
+
+#ifdef __SUNPRO_C
+#pragma weak MakeAtom
+#endif
+
+weak Atom 
+MakeAtom(char *string, unsigned len, int makeit)
+{
+    AtomListPtr	a;
+    int		hash;
+    int		h = 0;
+    int		r;
+
+    hash = Hash (string, len);
+    if (hashTable)
+    {
+    	h = hash & hashMask;
+	if (hashTable[h])
+	{
+	    if (hashTable[h]->hash == hash && hashTable[h]->len == len &&
+	    	NameEqual (hashTable[h]->name, string, len))
+	    {
+	    	return hashTable[h]->atom;
+	    }
+	    r = (hash % rehash) | 1;
+	    for (;;)
+	    {
+		h += r;
+		if (h >= hashSize)
+		    h -= hashSize;
+		if (!hashTable[h])
+		    break;
+		if (hashTable[h]->hash == hash && hashTable[h]->len == len &&
+		    NameEqual (hashTable[h]->name, string, len))
+		{
+		    return hashTable[h]->atom;
+		}
+	    }
+    	}
+    }
+    if (!makeit)
+	return None;
+    a = malloc (sizeof (AtomListRec) + len + 1);
+    if (a == NULL) {
+	fprintf(stderr, "MakeAtom(): Error: Couldn't allocate AtomListRec"
+		" (%ld)\n", (unsigned long)sizeof (AtomListRec) + len + 1);
+	return None;
+    }
+    a->name = (char *) (a + 1);
+    a->len = len;
+    strncpy (a->name, string, len);
+    a->name[len] = '\0';
+    a->atom = ++lastAtom;
+    a->hash = hash;
+    if (hashUsed >= hashSize / 2)
+    {
+	ResizeHashTable ();
+	h = hash & hashMask;
+	if (hashTable[h])
+	{
+	    r = (hash % rehash) | 1;
+	    do {
+		h += r;
+		if (h >= hashSize)
+		    h -= hashSize;
+	    } while (hashTable[h]);
+	}
+    }
+    hashTable[h] = a;
+    hashUsed++;
+    if (reverseMapSize <= a->atom) {
+	if (!ResizeReverseMap())
+	    return None;
+    }
+    reverseMap[a->atom] = a;
+    return a->atom;
+}
+
+#ifdef __SUNPRO_C
+#pragma weak ValidAtom
+#endif
+
+weak int 
+ValidAtom(Atom atom)
+{
+    return (atom != None) && (atom <= lastAtom);
+}
+
+#ifdef __SUNPRO_C
+#pragma weak NameForAtom
+#endif
+
+weak char *
+NameForAtom(Atom atom)
+{
+    if (atom != None && atom <= lastAtom)
+	return reverseMap[atom]->name;
+    return NULL;
+}