Align files with upstream libX11-1.6.0

This commit looks a bit crazy at first glance. It (re-)introduces lots
of whitespaces and bad formatting.

Explanation: Backporting upstream changes lead to commits being
applied out of order. This meant a lot of manual intervention which in
turn lead to slight differences between upstream and NX.

With this commit these slight differences are minimized which will be
of great help when adding further upstream patches.

1 files changed, 11 insertions, 11 deletions

diff --git a/nx-X11/lib/X11/Text.c b/nx-X11/lib/X11/Text.c
index 645aa283f..223b1cf8b 100644
--- a/nx-X11/lib/X11/Text.c
+++ b/nx-X11/lib/X11/Text.c
@@ -38,7 +38,7 @@ XDrawString(
     int y,
     _Xconst char *string,
     int length)
-{   
+{
     int Datalength = 0;
     register xPolyText8Req *req;
 
@@ -60,11 +60,11 @@ XDrawString(
     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. 
+     * the buffer 32-bit aligned.
      */
 
     if (dpy->bufptr + Datalength > dpy->bufmax)
@@ -92,11 +92,11 @@ XDrawString(
 	    PartialNChars = PartialNChars - 254;
 	    CharacterOffset += 254;
 	}
-	    
+
         if (PartialNChars)
         {
 	    nbytes = PartialNChars + SIZEOF(xTextElt);
-	    BufAlloc (unsigned char *, tbuf, nbytes); 
+	    BufAlloc (unsigned char *, tbuf, nbytes);
 /*    elt->delta = 0;
  *    elt->len = PartialNChars;
  */
@@ -112,23 +112,23 @@ XDrawString(
 
     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)" 
+	 * 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 
+	 * 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. 
+     * at the end of this routine.
      */
 
     if ((dpy->bufptr - dpy->buffer) & 3)