mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
mi: fix missing braces for expected logical condition 'if-else if'
Without missing braces, logical behavior 'if-else if' block works as two 'if' independent blocks.
This commit is contained in:
committed by
Enrico Weigelt
parent
5460be02c9
commit
4689dfb21f
@@ -104,11 +104,12 @@ miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
|
||||
#if 1
|
||||
MiBits startmask;
|
||||
|
||||
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
|
||||
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) {
|
||||
if (screenInfo.bitmapBitOrder == LSBFirst)
|
||||
startmask = (MiBits) (-1) ^ LONG2CHARSSAMEORDER((MiBits) (-1) << 1);
|
||||
else
|
||||
startmask = (MiBits) (-1) ^ LONG2CHARSSAMEORDER((MiBits) (-1) >> 1);
|
||||
}
|
||||
else if (screenInfo.bitmapBitOrder == LSBFirst)
|
||||
startmask = (MiBits) (-1) ^ LONG2CHARSDIFFORDER((MiBits) (-1) << 1);
|
||||
else
|
||||
@@ -163,13 +164,14 @@ miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
|
||||
}
|
||||
#if 1
|
||||
/* This is not quite right, but it'll do for now */
|
||||
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
|
||||
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) {
|
||||
if (screenInfo.bitmapBitOrder == LSBFirst)
|
||||
msk =
|
||||
LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) << 1);
|
||||
else
|
||||
msk =
|
||||
LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) >> 1);
|
||||
}
|
||||
else if (screenInfo.bitmapBitOrder == LSBFirst)
|
||||
msk = LONG2CHARSDIFFORDER(LONG2CHARSDIFFORDER(msk) << 1);
|
||||
else
|
||||
@@ -213,13 +215,14 @@ miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
|
||||
}
|
||||
#if 1
|
||||
/* This is not quite right, but it'll do for now */
|
||||
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER)
|
||||
if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) {
|
||||
if (screenInfo.bitmapBitOrder == LSBFirst)
|
||||
msk =
|
||||
LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) << 1);
|
||||
else
|
||||
msk =
|
||||
LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) >> 1);
|
||||
}
|
||||
else if (screenInfo.bitmapBitOrder == LSBFirst)
|
||||
msk = LONG2CHARSDIFFORDER(LONG2CHARSDIFFORDER(msk) << 1);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user