hw/vfb: Rename screenInfo parameter to screen_info
Avoid shadowing the global screenInfo value. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
89c0fa3d6c
commit
1f3676a81e
|
@ -899,7 +899,7 @@ void vfbExtensionInit(void)
|
|||
}
|
||||
|
||||
void
|
||||
InitOutput(ScreenInfo * screenInfo, int argc, char **argv)
|
||||
InitOutput(ScreenInfo * screen_info, int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
int NumFormats = 0;
|
||||
|
@ -935,18 +935,18 @@ InitOutput(ScreenInfo * screenInfo, int argc, char **argv)
|
|||
if (vfbPixmapDepths[i]) {
|
||||
if (NumFormats >= MAXFORMATS)
|
||||
FatalError("MAXFORMATS is too small for this server\n");
|
||||
screenInfo->formats[NumFormats].depth = i;
|
||||
screenInfo->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i);
|
||||
screenInfo->formats[NumFormats].scanlinePad = BITMAP_SCANLINE_PAD;
|
||||
screen_info->formats[NumFormats].depth = i;
|
||||
screen_info->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i);
|
||||
screen_info->formats[NumFormats].scanlinePad = BITMAP_SCANLINE_PAD;
|
||||
NumFormats++;
|
||||
}
|
||||
}
|
||||
|
||||
screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
|
||||
screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
|
||||
screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
|
||||
screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
|
||||
screenInfo->numPixmapFormats = NumFormats;
|
||||
screen_info->imageByteOrder = IMAGE_BYTE_ORDER;
|
||||
screen_info->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
|
||||
screen_info->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
|
||||
screen_info->bitmapBitOrder = BITMAP_BIT_ORDER;
|
||||
screen_info->numPixmapFormats = NumFormats;
|
||||
|
||||
/* initialize screens */
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user