Changeset 6520 in vbox

Timestamp:

Jan 28, 2008 5:57:15 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27537

Message:

Cleanups.

File:

• trunk/src/VBox/Additions/x11/xgraphics/vboxutils-new.c (modified) (14 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxutils-new.c

@@ -65 +65 @@
     CARD32 *color;
     unsigned char *mask;
-    size_t size_mask;
+    size_t sizeMask;
 
     image    += offsetof(VMMDevReqMousePointer, pointerData);
     mask      = image;
     pitch     = (w + 7) / 8;
-    size_mask = (pitch * h + 3) & ~3;
-    color     = (CARD32 *)(image + size_mask);
+    sizeMask  = (pitch * h + 3) & ~3;
+    color     = (CARD32 *)(image + sizeMask);
 
     TRACE_ENTRY();
@@ -179 +179 @@
 
         /* Get the active record and move the pointer along */
-        indexRecordNext = (pMem->indexRecordFree + 1)
-                           % VBVA_MAX_RECORDS;
+        indexRecordNext = (pMem->indexRecordFree + 1) % VBVA_MAX_RECORDS;
         if (indexRecordNext == pMem->indexRecordFirst)
         {
@@ -208 +207 @@
          */
         i32Diff = off32Data - off32Free;
-        cbHwBufferAvail = i32Diff > 0? i32Diff: VBVA_RING_BUFFER_SIZE
-                                              + i32Diff;
+        cbHwBufferAvail = i32Diff > 0 ? i32Diff : VBVA_RING_BUFFER_SIZE + i32Diff;
         if (cbHwBufferAvail <= VBVA_RING_BUFFER_THRESHOLD)
         {
@@ -231 +229 @@
         if (off32Free + sizeof(cmdHdr) < VBVA_RING_BUFFER_SIZE)
         {
-            memcpy(&pMem->au8RingBuffer[off32Free], &cmdHdr,
-                   sizeof(cmdHdr));
+            memcpy(&pMem->au8RingBuffer[off32Free], &cmdHdr, sizeof(cmdHdr));
             pMem->off32Free = pMem->off32Free + sizeof(cmdHdr);
         }
@@ -494 +491 @@
     unsigned short w, h, x, y;
     unsigned char *c, *p, *pm, *ps, *m;
-    size_t size, size_rgba, size_mask, src_pitch, dst_pitch;
+    size_t sizeRequest, sizeRgba, sizeMask, srcPitch, dstPitch;
     CARD32 fc, bc, *cp;
     int rc, scrnIndex = infoPtr->pScrn->scrnIndex;
@@ -513 +510 @@
             bitsp->xhot, bitsp->yhot, w, h);
 
-    src_pitch = PixmapBytePad (bitsp->width, 1);
-    dst_pitch = (w + 7) / 8;
-    size_mask = ((dst_pitch * h) + 3) & (size_t) ~3;
-    size_rgba = w * h * 4;
-    pVBox->pointerSize = size_mask + size_rgba;
-    size      = pVBox->pointerSize + pVBox->pointerHeaderSize;
-
-    p = c = xcalloc (1, size);
+    srcPitch = PixmapBytePad (bitsp->width, 1);
+    dstPitch = (w + 7) / 8;
+    sizeMask = ((dstPitch * h) + 3) & (size_t) ~3;
+    sizeRgba = w * h * 4;
+    pVBox->pointerSize = sizeMask + sizeRgba;
+    sizeRequest = pVBox->pointerSize + pVBox->pointerHeaderSize;
+
+    p = c = xcalloc (1, sizeRequest);
     if (!c)
         RETERROR(scrnIndex, NULL,
                  "Error failed to alloc %lu bytes for cursor\n",
-                 (unsigned long) size);
+                 (unsigned long) sizeRequest);
 
     rc = vmmdevInitRequest((VMMDevRequestHeader *)p, VMMDevReq_SetPointerShape);
@@ -535 +532 @@
 
     m = p + offsetof(VMMDevReqMousePointer, pointerData);
-    cp = (CARD32 *)(m + size_mask);
+    cp = (CARD32 *)(m + sizeMask);
 
     dolog ("w=%d h=%d sm=%d sr=%d p=%d\n",
-           w, h, (int) size_mask, (int) size_rgba, (int) dst_pitch);
+           w, h, (int) sizeMask, (int) sizeRgba, (int) dstPitch);
     dolog ("m=%p c=%p cp=%p\n", m, c, cp);
 
@@ -569 +566 @@
     for (pm = bitsp->mask, ps = bitsp->source, y = 0;
          y < h;
-         ++y, pm += src_pitch, ps += src_pitch, m += dst_pitch)
+         ++y, pm += srcPitch, ps += srcPitch, m += dstPitch)
     {
         for (x = 0; x < w; ++x)
@@ -605 +602 @@
     reqp->yHot   = bitsp->yhot;
     reqp->fFlags = VBOX_MOUSE_POINTER_SHAPE;
-    reqp->header.size = size;
+    reqp->header.size = sizeRequest;
 
 #ifdef DEBUG_X
@@ -635 +632 @@
     unsigned char *pm;
     CARD32 *pc;
-    size_t size, mask_size;
+    size_t sizeRequest, sizeMask;
     CARD8 *p;
     int scrnIndex;
@@ -647 +644 @@
     /* Mask must be generated for alpha cursors, that is required by VBox. */
     /* note: (michael) the next struct must be 32bit aligned. */
-    mask_size  = ((w + 7) / 8 * h + 3) & ~3;
+    sizeMask  = ((w + 7) / 8 * h + 3) & ~3;
 
     if (!w || !h || w > VBOX_MAX_CURSOR_WIDTH || h > VBOX_MAX_CURSOR_HEIGHT)
@@ -658 +655 @@
             bitsp->xhot, bitsp->yhot, w, h);
 
-    pVBox->pointerSize = w * h * 4 + mask_size;
-    size = pVBox->pointerSize + pVBox->pointerHeaderSize;
-    p = xcalloc(1, size);
+    pVBox->pointerSize = w * h * 4 + sizeMask;
+    sizeRequest = pVBox->pointerSize + pVBox->pointerHeaderSize;
+    p = xcalloc(1, sizeRequest);
     if (!p)
         RETERROR(scrnIndex, ,
             "Error failed to alloc %lu bytes for cursor\n",
-            (unsigned long) size);
+            (unsigned long) sizeRequest);
 
     reqp = (VMMDevReqMousePointer *)p;
@@ -673 +670 @@
     reqp->yHot   = bitsp->yhot;
     reqp->fFlags = VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA;
-    reqp->header.size = size;
-
-    memcpy(p + offsetof(VMMDevReqMousePointer, pointerData) + mask_size,
-            bitsp->argb, w * h * 4);
+    reqp->header.size = sizeRequest;
+
+    memcpy(p + offsetof(VMMDevReqMousePointer, pointerData) + sizeMask, bitsp->argb, w * h * 4);
 
     /* Emulate the AND mask. */
@@ -683 +679 @@
 
     /* Init AND mask to 1 */
-    memset(pm, 0xFF, mask_size);
+    memset(pm, 0xFF, sizeMask);
 
     /*