Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x

Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14

1 files changed, 0 insertions, 123 deletions

diff --git a/nx-X11/lib/font/util/fontnames.c b/nx-X11/lib/font/util/fontnames.c
deleted file mode 100644
index 2d3a51752..000000000
--- a/nx-X11/lib/font/util/fontnames.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $Xorg: fontnames.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
-/*
-
-Copyright 1991, 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.
-
-*/
-/* $XFree86: xc/lib/font/util/fontnames.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
-
-/*
- * Author:  Keith Packard, MIT X Consortium
- *
- *	@(#)fontnames.c	3.1	91/04/10
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include	<X11/fonts/fontmisc.h>
-#include	<X11/fonts/fontstruct.h>
-
-void
-FreeFontNames(FontNamesPtr pFN)
-{
-    int         i;
-
-    if (!pFN)
-	return;
-    for (i = 0; i < pFN->nnames; i++) {
-	xfree(pFN->names[i]);
-    }
-    xfree(pFN->names);
-    xfree(pFN->length);
-    xfree(pFN);
-}
-
-FontNamesPtr
-MakeFontNamesRecord(unsigned int size)
-{
-    FontNamesPtr pFN;
-
-    pFN = (FontNamesPtr) xalloc(sizeof(FontNamesRec));
-    if (pFN) {
-	pFN->nnames = 0;
-	pFN->size = size;
-	if (size)
-	{
-	    pFN->length = (int *) xalloc(size * sizeof(int));
-	    pFN->names = (char **) xalloc(size * sizeof(char *));
-	    if (!pFN->length || !pFN->names) {
-	    	xfree(pFN->length);
-	    	xfree(pFN->names);
-	    	xfree(pFN);
-	    	pFN = (FontNamesPtr) 0;
-	    }
-	}
-	else
-	{
-	    pFN->length = 0;
-	    pFN->names = 0;
-	}
-    }
-    return pFN;
-}
-
-int
-AddFontNamesName(FontNamesPtr names, char *name, int length)
-{
-    int         index = names->nnames;
-    char       *nelt;
-
-    nelt = (char *) xalloc(length + 1);
-    if (!nelt)
-	return AllocError;
-    if (index >= names->size) {
-	int         size = names->size << 1;
-	int        *nlength;
-	char      **nnames;
-
-	if (size == 0)
-	    size = 8;
-	nlength = (int *) xrealloc(names->length, size * sizeof(int));
-	nnames = (char **) xrealloc(names->names, size * sizeof(char *));
-	if (nlength && nnames) {
-	    names->size = size;
-	    names->length = nlength;
-	    names->names = nnames;
-	} else {
-	    xfree(nelt);
-	    xfree(nlength);
-	    xfree(nnames);
-	    return AllocError;
-	}
-    }
-    names->length[index] = length;
-    names->names[index] = nelt;
-    strncpy(nelt, name, length);
-    nelt[length] = '\0';
-    names->nnames++;
-    return Successful;
-}