Used synchronise script to update files

1 files changed, 139 insertions, 139 deletions

diff --git a/libX11/src/Text.c b/libX11/src/Text.c
index 223b1cf8b..6a4479ee5 100644
--- a/libX11/src/Text.c
+++ b/libX11/src/Text.c
@@ -1,139 +1,139 @@
-/*
-
-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"
-
-int
-XDrawString(
-    register Display *dpy,
-    Drawable d,
-    GC gc,
-    int x,
-    int y,
-    _Xconst char *string,
-    int length)
-{
-    int Datalength = 0;
-    register xPolyText8Req *req;
-
-    if (length <= 0)
-       return 0;
-
-    LockDisplay(dpy);
-    FlushGC(dpy, gc);
-    GetReq (PolyText8, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->x = x;
-    req->y = y;
-
-
-    Datalength += SIZEOF(xTextElt) * ((length + 253) / 254) + length;
-
-
-    req->length += (Datalength + 3)>>2;  /* convert to number of 32-bit words */
-
-
-    /*
-     * If the entire request does not fit into the remaining space in the
-     * buffer, flush the buffer first.   If the request does fit into the
-     * empty buffer, then we won't have to flush it at the end to keep
-     * the buffer 32-bit aligned.
-     */
-
-    if (dpy->bufptr + Datalength > dpy->bufmax)
-    	_XFlush (dpy);
-
-    {
-	int nbytes;
-	int PartialNChars = length;
-        /* register xTextElt *elt; */
- 	char *CharacterOffset = (char *)string;
-        unsigned char *tbuf;
-
-	while(PartialNChars > 254)
-        {
- 	    nbytes = 254 + SIZEOF(xTextElt);
-	    BufAlloc (unsigned char *, tbuf, nbytes);
-/*    elt->delta = 0;
- *    elt->len = 254;
- */
-            *(unsigned char *)tbuf = 254;
-            *(tbuf+1) = 0;
-/*       memcpy ((char *) (elt + 1), CharacterOffset, 254);
- */
-            memcpy ((char *)tbuf+2, CharacterOffset, 254);
-	    PartialNChars = PartialNChars - 254;
-	    CharacterOffset += 254;
-	}
-
-        if (PartialNChars)
-        {
-	    nbytes = PartialNChars + SIZEOF(xTextElt);
-	    BufAlloc (unsigned char *, tbuf, nbytes);
-/*    elt->delta = 0;
- *    elt->len = PartialNChars;
- */
-            *(unsigned char *)tbuf =  PartialNChars;
-            *(tbuf+1) = 0;
-/*     memcpy ((char *) (elt + 1), CharacterOffset, PartialNChars);
- */
-         memcpy ((char *)tbuf+2, CharacterOffset, PartialNChars);
-	 }
-    }
-
-    /* Pad request out to a 32-bit boundary */
-
-    if (Datalength &= 3) {
-	char *pad;
-	/*
-	 * BufAlloc is a macro that uses its last argument more than
-	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)"
-	 */
-	length = 4 - Datalength;
-	BufAlloc (char *, pad, length);
-	/*
-	 * if there are 3 bytes of padding, the first byte MUST be 0
-	 * so the pad bytes aren't mistaken for a final xTextElt
-	 */
-	*pad = 0;
-        }
-
-    /*
-     * If the buffer pointer is not now pointing to a 32-bit boundary,
-     * we must flush the buffer so that it does point to a 32-bit boundary
-     * at the end of this routine.
-     */
-
-    if ((dpy->bufptr - dpy->buffer) & 3)
-       _XFlush (dpy);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 0;
-}
+/*

+

+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"

+

+int

+XDrawString(

+    register Display *dpy,

+    Drawable d,

+    GC gc,

+    int x,

+    int y,

+    _Xconst char *string,

+    int length)

+{

+    int Datalength = 0;

+    register xPolyText8Req *req;

+

+    if (length <= 0)

+       return 0;

+

+    LockDisplay(dpy);

+    FlushGC(dpy, gc);

+    GetReq (PolyText8, req);

+    req->drawable = d;

+    req->gc = gc->gid;

+    req->x = x;

+    req->y = y;

+

+

+    Datalength += SIZEOF(xTextElt) * ((length + 253) / 254) + length;

+

+

+    req->length += (Datalength + 3)>>2;  /* convert to number of 32-bit words */

+

+

+    /*

+     * If the entire request does not fit into the remaining space in the

+     * buffer, flush the buffer first.   If the request does fit into the

+     * empty buffer, then we won't have to flush it at the end to keep

+     * the buffer 32-bit aligned.

+     */

+

+    if (dpy->bufptr + Datalength > dpy->bufmax)

+    	_XFlush (dpy);

+

+    {

+	int nbytes;

+	int PartialNChars = length;

+        /* register xTextElt *elt; */

+ 	char *CharacterOffset = (char *)string;

+        unsigned char *tbuf;

+

+	while(PartialNChars > 254)

+        {

+ 	    nbytes = 254 + SIZEOF(xTextElt);

+	    BufAlloc (unsigned char *, tbuf, nbytes);

+/*    elt->delta = 0;

+ *    elt->len = 254;

+ */

+            *(unsigned char *)tbuf = 254;

+            *(tbuf+1) = 0;

+/*       memcpy ((char *) (elt + 1), CharacterOffset, 254);

+ */

+            memcpy ((char *)tbuf+2, CharacterOffset, 254);

+	    PartialNChars = PartialNChars - 254;

+	    CharacterOffset += 254;

+	}

+

+        if (PartialNChars)

+        {

+	    nbytes = PartialNChars + SIZEOF(xTextElt);

+	    BufAlloc (unsigned char *, tbuf, nbytes);

+/*    elt->delta = 0;

+ *    elt->len = PartialNChars;

+ */

+            *(unsigned char *)tbuf =  PartialNChars;

+            *(tbuf+1) = 0;

+/*     memcpy ((char *) (elt + 1), CharacterOffset, PartialNChars);

+ */

+         memcpy ((char *)tbuf+2, CharacterOffset, PartialNChars);

+	 }

+    }

+

+    /* Pad request out to a 32-bit boundary */

+

+    if (Datalength &= 3) {

+	char *pad;

+	/*

+	 * BufAlloc is a macro that uses its last argument more than

+	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)"

+	 */

+	length = 4 - Datalength;

+	BufAlloc (char *, pad, length);

+	/*

+	 * if there are 3 bytes of padding, the first byte MUST be 0

+	 * so the pad bytes aren't mistaken for a final xTextElt

+	 */

+	*pad = 0;

+        }

+

+    /*

+     * If the buffer pointer is not now pointing to a 32-bit boundary,

+     * we must flush the buffer so that it does point to a 32-bit boundary

+     * at the end of this routine.

+     */

+

+    if ((dpy->bufptr - dpy->buffer) & 3)

+       _XFlush (dpy);

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return 0;

+}