frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Keith Packard 2013-12-15 01:55:43 -08:00
parent 89c0fa3d6c
commit 1f3676a81e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/vfb/InitOutput.c
View File

@ -899,7 +899,7 @@ void vfbExtensionInit(void)
} }
void void
InitOutput(ScreenInfo * screenInfo, int argc, char **argv) InitOutput(ScreenInfo * screen_info, int argc, char **argv)
{ {
int i; int i;
int NumFormats = 0; int NumFormats = 0;
@ -935,18 +935,18 @@ InitOutput(ScreenInfo * screenInfo, int argc, char **argv)
if (vfbPixmapDepths[i]) { if (vfbPixmapDepths[i]) {
if (NumFormats >= MAXFORMATS) if (NumFormats >= MAXFORMATS)
FatalError("MAXFORMATS is too small for this server\n"); FatalError("MAXFORMATS is too small for this server\n");
screenInfo->formats[NumFormats].depth = i; screen_info->formats[NumFormats].depth = i;
screenInfo->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i); screen_info->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i);
screenInfo->formats[NumFormats].scanlinePad = BITMAP_SCANLINE_PAD; screen_info->formats[NumFormats].scanlinePad = BITMAP_SCANLINE_PAD;
NumFormats++; NumFormats++;
} }
} }
screenInfo->imageByteOrder = IMAGE_BYTE_ORDER; screen_info->imageByteOrder = IMAGE_BYTE_ORDER;
screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT; screen_info->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD; screen_info->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER; screen_info->bitmapBitOrder = BITMAP_BIT_ORDER;
screenInfo->numPixmapFormats = NumFormats; screen_info->numPixmapFormats = NumFormats;
/* initialize screens */ /* initialize screens */