diff options
author | Keith Packard <keithp@keithp.com> | 2013-11-15 13:26:36 +0900 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2013-11-15 13:38:49 +0900 |
commit | 75e6ae5de483bad6bfdea0ec1d9030bb44af335f (patch) | |
tree | 1aa268e4c377522d80beb4671190aba65e9f9bc1 | |
parent | e8bd7c2dc3329fa0da3078b6d2cc0ffa43b428e5 (diff) |
Clean up compiler warnings.
Add const to any immutable string pointers.
Rename 'range' to 'prop_range' to avoid redefined warning.
Eliminate some unused return values.
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r-- | src/driver.c | 16 | ||||
-rw-r--r-- | src/drmmode_display.c | 23 |
2 files changed, 20 insertions, 19 deletions
diff --git a/src/driver.c b/src/driver.c index cc526f6..b84624e 100644 --- a/src/driver.c +++ b/src/driver.c @@ -183,7 +183,7 @@ Identify(int flags) Chipsets); } -static int open_hw(char *dev) +static int open_hw(const char *dev) { int fd; if (dev) @@ -213,7 +213,7 @@ static int check_outputs(int fd) return ret; } -static Bool probe_hw(char *dev) +static Bool probe_hw(const char *dev) { int fd = open_hw(dev); if (fd != -1) { @@ -237,7 +237,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev) } -static Bool probe_hw_pci(char *dev, struct pci_device *pdev) +static Bool probe_hw_pci(const char *dev, struct pci_device *pdev) { int ret = FALSE, fd = open_hw(dev); char *id, *devid; @@ -298,7 +298,7 @@ ms_pci_probe(DriverPtr driver, scrn = xf86ConfigPciEntity(scrn, 0, entity_num, NULL, NULL, NULL, NULL, NULL, NULL); if (scrn) { - char *devpath; + const char *devpath; GDevPtr devSection = xf86GetDevFromEntity(scrn->entityList[0], scrn->entityInstanceList[0]); @@ -335,7 +335,7 @@ ms_platform_probe(DriverPtr driver, int entity_num, int flags, struct xf86_platform_device *dev, intptr_t match_data) { ScrnInfoPtr scrn = NULL; - char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH); + const char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH); int scr_flags = 0; if (flags & PLATFORM_PROBE_GPU_SCREEN) @@ -369,7 +369,7 @@ Probe(DriverPtr drv, int flags) int i, numDevSections; GDevPtr *devSections; Bool foundScreen = FALSE; - char *dev; + const char *dev; ScrnInfoPtr scrn = NULL; /* For now, just bail out for PROBE_DETECT. */ @@ -559,6 +559,7 @@ FreeRec(ScrnInfoPtr pScrn) ret = drmClose(ms->fd); else ret = close(ms->fd); + (void) ret; } free(ms->Options); free(ms); @@ -572,7 +573,8 @@ PreInit(ScrnInfoPtr pScrn, int flags) rgb defaultWeight = { 0, 0, 0 }; EntityInfoPtr pEnt; EntPtr msEnt = NULL; - char *BusID = NULL, *devicename; + char *BusID = NULL; + const char *devicename; Bool prefer_shadow = TRUE; uint64_t value = 0; int ret; diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 4fb4d21..773ec4c 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -534,14 +534,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) DamageRegister(&ppix->drawable, drmmode_crtc->slave_damage); if (ppriv->fb_id == 0) { - int r; - r = drmModeAddFB(drmmode->fd, ppix->drawable.width, - ppix->drawable.height, - ppix->drawable.depth, - ppix->drawable.bitsPerPixel, - ppix->devKind, - ppriv->backing_bo->handle, - &ppriv->fb_id); + drmModeAddFB(drmmode->fd, ppix->drawable.width, + ppix->drawable.height, + ppix->drawable.depth, + ppix->drawable.bitsPerPixel, + ppix->devKind, + ppriv->backing_bo->handle, + &ppriv->fb_id); } return TRUE; } @@ -830,7 +829,7 @@ drmmode_output_create_resources(xf86OutputPtr output) drmmode_prop = p->mode_prop; if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) { - INT32 range[2]; + INT32 prop_range[2]; INT32 value = p->value; p->num_atoms = 1; @@ -838,12 +837,12 @@ drmmode_output_create_resources(xf86OutputPtr output) if (!p->atoms) continue; p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); - range[0] = drmmode_prop->values[0]; - range[1] = drmmode_prop->values[1]; + prop_range[0] = drmmode_prop->values[0]; + prop_range[1] = drmmode_prop->values[1]; err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], FALSE, TRUE, drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, - 2, range); + 2, prop_range); if (err != 0) { xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "RRConfigureOutputProperty error, %d\n", err); |