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

xfree86/fbdevhw: Fix warnings 

Unused fPtr variable. Deal with string constants.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-16 23:31:06 -08:00
parent 6990de00eb
commit 7fe436a7b7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -81,15 +81,13 @@ typedef struct {
Bool Bool
fbdevHWGetRec(ScrnInfoPtr pScrn) fbdevHWGetRec(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr;
if (fbdevHWPrivateIndex < 0) if (fbdevHWPrivateIndex < 0)
fbdevHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex(); fbdevHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
if (FBDEVHWPTR(pScrn) != NULL) if (FBDEVHWPTR(pScrn) != NULL)
return TRUE; return TRUE;
fPtr = FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1); FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1);
return TRUE; return TRUE;
} }
@ -301,7 +299,7 @@ fbdev_open_pci(struct pci_device *pPci, char **namep)
} }
static int static int
fbdev_open(int scrnIndex, char *dev, char **namep) fbdev_open(int scrnIndex, const char *dev, char **namep)
{ {
struct fb_fix_screeninfo fix; struct fb_fix_screeninfo fix;
int fd; int fd;
@ -497,7 +495,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
void void
fbdevHWSetVideoModes(ScrnInfoPtr pScrn) fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
{ {
char **modename; const char **modename;
DisplayModePtr mode, this, last = pScrn->modes; DisplayModePtr mode, this, last = pScrn->modes;
if (NULL == pScrn->display->modes) if (NULL == pScrn->display->modes)