diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:55:43 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-22 19:56:32 -0800 |
| commit | 1f3676a81ef2c52699bdfcf1fb9da7e4e79b00b7 (patch) | |
| tree | 02e5ce6f94042e055ba384d69bcd8a90b6ddea80 /hw/vfb/InitOutput.c | |
| parent | 89c0fa3d6c8ae67084a30395085db6d872d9d6de (diff) | |
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>
Diffstat (limited to 'hw/vfb/InitOutput.c')
| -rw-r--r-- | hw/vfb/InitOutput.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index d10272244..2175ac685 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -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 */ |