Synchronised line endinge with release branch

1 files changed, 119 insertions, 119 deletions

diff --git a/libXfont/src/util/fontnames.c b/libXfont/src/util/fontnames.c
index 3beaf0fd5..ceafce593 100644
--- a/libXfont/src/util/fontnames.c
+++ b/libXfont/src/util/fontnames.c
@@ -1,119 +1,119 @@
-/*

-

-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.

-

-*/

-

-/*

- * Author:  Keith Packard, MIT X Consortium

- *

- */

-

-#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++) {

-	free(pFN->names[i]);

-    }

-    free(pFN->names);

-    free(pFN->length);

-    free(pFN);

-}

-

-FontNamesPtr

-MakeFontNamesRecord(unsigned int size)

-{

-    FontNamesPtr pFN;

-

-    pFN = malloc(sizeof(FontNamesRec));

-    if (pFN) {

-	pFN->nnames = 0;

-	pFN->size = size;

-	if (size)

-	{

-	    pFN->length = malloc(size * sizeof(int));

-	    pFN->names = malloc(size * sizeof(char *));

-	    if (!pFN->length || !pFN->names) {

-	    	free(pFN->length);

-	    	free(pFN->names);

-	    	free(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 = malloc(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 = realloc(names->length, size * sizeof(int));

-	nnames = realloc(names->names, size * sizeof(char *));

-	if (nlength && nnames) {

-	    names->size = size;

-	    names->length = nlength;

-	    names->names = nnames;

-	} else {

-	    free(nelt);

-	    free(nlength);

-	    free(nnames);

-	    return AllocError;

-	}

-    }

-    names->length[index] = length;

-    names->names[index] = nelt;

-    strncpy(nelt, name, length);

-    nelt[length] = '\0';

-    names->nnames++;

-    return Successful;

-}

+/*
+
+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.
+
+*/
+
+/*
+ * Author:  Keith Packard, MIT X Consortium
+ *
+ */
+
+#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++) {
+	free(pFN->names[i]);
+    }
+    free(pFN->names);
+    free(pFN->length);
+    free(pFN);
+}
+
+FontNamesPtr
+MakeFontNamesRecord(unsigned int size)
+{
+    FontNamesPtr pFN;
+
+    pFN = malloc(sizeof(FontNamesRec));
+    if (pFN) {
+	pFN->nnames = 0;
+	pFN->size = size;
+	if (size)
+	{
+	    pFN->length = malloc(size * sizeof(int));
+	    pFN->names = malloc(size * sizeof(char *));
+	    if (!pFN->length || !pFN->names) {
+	    	free(pFN->length);
+	    	free(pFN->names);
+	    	free(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 = malloc(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 = realloc(names->length, size * sizeof(int));
+	nnames = realloc(names->names, size * sizeof(char *));
+	if (nlength && nnames) {
+	    names->size = size;
+	    names->length = nlength;
+	    names->names = nnames;
+	} else {
+	    free(nelt);
+	    free(nlength);
+	    free(nnames);
+	    return AllocError;
+	}
+    }
+    names->length[index] = length;
+    names->names[index] = nelt;
+    strncpy(nelt, name, length);
+    nelt[length] = '\0';
+    names->nnames++;
+    return Successful;
+}