andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfixes: switch to byte counting functions

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-07-06 12:29:26 +10:00
parent e216527107
commit 34bfaa9d9e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xfixes/cursor.c
View File

@ -488,7 +488,7 @@ ProcXFixesGetCursorName (ClientPtr client)
len = strlen (str); len = strlen (str);
reply.type = X_Reply; reply.type = X_Reply;
reply.length = (len + 3) >> 2; reply.length = bytes_to_int32(len);
reply.sequenceNumber = client->sequence; reply.sequenceNumber = client->sequence;
reply.atom = pCursor->name; reply.atom = pCursor->name;
reply.nbytes = len; reply.nbytes = len;
@ -545,7 +545,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
npixels = width * height; npixels = width * height;
name = pCursor->name ? NameForAtom (pCursor->name) : ""; name = pCursor->name ? NameForAtom (pCursor->name) : "";
nbytes = strlen (name); nbytes = strlen (name);
nbytesRound = (nbytes + 3) & ~3; nbytesRound = pad_to_int32(nbytes);
rep = xalloc (sizeof (xXFixesGetCursorImageAndNameReply) + rep = xalloc (sizeof (xXFixesGetCursorImageAndNameReply) +
npixels * sizeof (CARD32) + nbytesRound); npixels * sizeof (CARD32) + nbytesRound);
if (!rep) if (!rep)
@ -553,7 +553,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
rep->type = X_Reply; rep->type = X_Reply;
rep->sequenceNumber = client->sequence; rep->sequenceNumber = client->sequence;
rep->length = npixels + (nbytesRound >> 2); rep->length = npixels + bytes_to_int32(nbytesRound);
rep->width = width; rep->width = width;
rep->height = height; rep->height = height;
rep->x = x; rep->x = x;