From 7fe436a7b786ff02ed55cf9ed65edfd2fe07ac22 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 16 Nov 2013 23:31:06 -0800 Subject: [PATCH] xfree86/fbdevhw: Fix warnings Unused fPtr variable. Deal with string constants. Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- hw/xfree86/fbdevhw/fbdevhw.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index cbb40930b..0450822ee 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -81,15 +81,13 @@ typedef struct { Bool fbdevHWGetRec(ScrnInfoPtr pScrn) { - fbdevHWPtr fPtr; - if (fbdevHWPrivateIndex < 0) fbdevHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex(); if (FBDEVHWPTR(pScrn) != NULL) return TRUE; - fPtr = FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1); + FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1); return TRUE; } @@ -301,7 +299,7 @@ fbdev_open_pci(struct pci_device *pPci, char **namep) } static int -fbdev_open(int scrnIndex, char *dev, char **namep) +fbdev_open(int scrnIndex, const char *dev, char **namep) { struct fb_fix_screeninfo fix; int fd; @@ -497,7 +495,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check) void fbdevHWSetVideoModes(ScrnInfoPtr pScrn) { - char **modename; + const char **modename; DisplayModePtr mode, this, last = pScrn->modes; if (NULL == pScrn->display->modes)