Rename the parameter to make it clear we don't mean the global screenInfo. Signed-off-by: Adam Jackson <a...@redhat.com> --- hw/vfb/InitOutput.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index ec3c47a..d512150 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 * screeninfo, 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; + screeninfo->formats[NumFormats].depth = i; + screeninfo->formats[NumFormats].bitsPerPixel = vfbBitsPerPixel(i); + screeninfo->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; + screeninfo->imageByteOrder = IMAGE_BYTE_ORDER; + screeninfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT; + screeninfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD; + screeninfo->bitmapBitOrder = BITMAP_BIT_ORDER; + screeninfo->numPixmapFormats = NumFormats; /* initialize screens */ -- 1.8.4.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel