hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

xfree86/common: Warning fixes. Mostly const string handling.

Browse source 
Also removes DPMS functiosn from Xext/dpmsproc.h

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-15 16:56:15 +09:00
commit e1e01d2e33
24 changed files with 88 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/xfree86/common/xf86AutoConfig.c
View file

@ -300,6 +300,7 @@ copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
{
confScreenPtr nscreen;
GDevPtr cptr = NULL;
char *identifier;
nscreen = malloc(sizeof(confScreenRec));
if (!nscreen)
@ -313,13 +314,14 @@ copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
}
memcpy(cptr, odev, sizeof(GDevRec));
if (asprintf(&cptr->identifier, "Autoconfigured Video Device %s", driver)
if (asprintf(&identifier, "Autoconfigured Video Device %s", driver)
== -1) {
free(cptr);
free(nscreen);
return FALSE;
}
cptr->driver = driver;
cptr->identifier = identifier;
xf86ConfigLayout.screens[i].screen = nscreen;