dos -> unix

1 files changed, 91 insertions, 91 deletions

diff --git a/libX11/src/GetFPath.c b/libX11/src/GetFPath.c
index b5643b5d8..7d497c92e 100644
--- a/libX11/src/GetFPath.c
+++ b/libX11/src/GetFPath.c
@@ -1,91 +1,91 @@
-/*

-

-Copyright 1986, 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.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-

-char **XGetFontPath(

-    register Display *dpy,

-    int *npaths)	/* RETURN */

-{

-	xGetFontPathReply rep;

-	register long nbytes;

-	char **flist;

-	char *ch;

-	register unsigned i;

-	register int length;

-	register xReq *req;

-

-	LockDisplay(dpy);

-	GetEmptyReq (GetFontPath, req);

-	(void) _XReply (dpy, (xReply *) &rep, 0, xFalse);

-

-	if (rep.nPaths) {

-	    flist = (char **)

-		Xmalloc((unsigned) rep.nPaths * sizeof (char *));

-	    nbytes = (long)rep.length << 2;

-	    ch = (char *) Xmalloc ((unsigned) (nbytes + 1));

-                /* +1 to leave room for last null-terminator */

-

-	    if ((! flist) || (! ch)) {

-		if (flist) Xfree((char *) flist);

-		if (ch) Xfree(ch);

-		_XEatData(dpy, (unsigned long) nbytes);

-		UnlockDisplay(dpy);

-		SyncHandle();

-		return (char **) NULL;

-	    }

-

-	    _XReadPad (dpy, ch, nbytes);

-	    /*

-	     * unpack into null terminated strings.

-	     */

-	    length = *ch;

-	    for (i = 0; i < rep.nPaths; i++) {

-		flist[i] = ch+1;  /* skip over length */

-		ch += length + 1; /* find next length ... */

-		length = *ch;

-		*ch = '\0'; /* and replace with null-termination */

-	    }

-	}

-	else flist = NULL;

-	*npaths = rep.nPaths;

-	UnlockDisplay(dpy);

-	SyncHandle();

-	return (flist);

-}

-

-int

-XFreeFontPath (char **list)

-{

-	if (list != NULL) {

-		Xfree (list[0]-1);

-		Xfree ((char *)list);

-	}

-	return 1;

-}

+/*
+
+Copyright 1986, 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.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+char **XGetFontPath(
+    register Display *dpy,
+    int *npaths)	/* RETURN */
+{
+	xGetFontPathReply rep;
+	register long nbytes;
+	char **flist;
+	char *ch;
+	register unsigned i;
+	register int length;
+	register xReq *req;
+
+	LockDisplay(dpy);
+	GetEmptyReq (GetFontPath, req);
+	(void) _XReply (dpy, (xReply *) &rep, 0, xFalse);
+
+	if (rep.nPaths) {
+	    flist = (char **)
+		Xmalloc((unsigned) rep.nPaths * sizeof (char *));
+	    nbytes = (long)rep.length << 2;
+	    ch = (char *) Xmalloc ((unsigned) (nbytes + 1));
+                /* +1 to leave room for last null-terminator */
+
+	    if ((! flist) || (! ch)) {
+		if (flist) Xfree((char *) flist);
+		if (ch) Xfree(ch);
+		_XEatData(dpy, (unsigned long) nbytes);
+		UnlockDisplay(dpy);
+		SyncHandle();
+		return (char **) NULL;
+	    }
+
+	    _XReadPad (dpy, ch, nbytes);
+	    /*
+	     * unpack into null terminated strings.
+	     */
+	    length = *ch;
+	    for (i = 0; i < rep.nPaths; i++) {
+		flist[i] = ch+1;  /* skip over length */
+		ch += length + 1; /* find next length ... */
+		length = *ch;
+		*ch = '\0'; /* and replace with null-termination */
+	    }
+	}
+	else flist = NULL;
+	*npaths = rep.nPaths;
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return (flist);
+}
+
+int
+XFreeFontPath (char **list)
+{
+	if (list != NULL) {
+		Xfree (list[0]-1);
+		Xfree ((char *)list);
+	}
+	return 1;
+}