diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-03 12:59:13 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-05-03 12:59:13 +0000 |
commit | 42f51ca8ac9c0f97101006a1892350b599b579c3 (patch) | |
tree | dc092d06ac762491ec21f9e28e7b33edddb9c8e9 /lib/libX11/src/Text16.c | |
parent | df8d13bc873527069d0e7b2396638af253b48763 (diff) |
update to libX11 1.2.1
Diffstat (limited to 'lib/libX11/src/Text16.c')
-rw-r--r-- | lib/libX11/src/Text16.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/libX11/src/Text16.c b/lib/libX11/src/Text16.c index 96d5911d6..0aa41a6a4 100644 --- a/lib/libX11/src/Text16.c +++ b/lib/libX11/src/Text16.c @@ -40,7 +40,7 @@ XDrawString16( int y, _Xconst XChar2b *string, int length) -{ +{ int Datalength = 0; register xPolyText16Req *req; @@ -62,11 +62,11 @@ XDrawString16( 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) @@ -99,11 +99,11 @@ XDrawString16( PartialNChars = PartialNChars - 254; CharacterOffset += 254; } - + if (PartialNChars) { nbytes = PartialNChars * 2 + SIZEOF(xTextElt); - BufAlloc (xTextElt *, elt, nbytes); + BufAlloc (xTextElt *, elt, nbytes); elt->delta = 0; elt->len = PartialNChars; #if defined(MUSTCOPY) || defined(MUSTCOPY2B) @@ -126,23 +126,23 @@ XDrawString16( 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) |