mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-10 23:33:46 +00:00
Merge remote branch 'alanc/master'
This commit is contained in:
commit
5de312a60d
13 changed files with 82 additions and 100 deletions
|
|
@ -666,13 +666,11 @@ xf86OutputCreate (ScrnInfoPtr scrn,
|
|||
Bool
|
||||
xf86OutputRename (xf86OutputPtr output, const char *name)
|
||||
{
|
||||
int len = strlen(name) + 1;
|
||||
char *newname = malloc(len);
|
||||
char *newname = strdup(name);
|
||||
|
||||
if (!newname)
|
||||
return FALSE; /* so sorry... */
|
||||
|
||||
strcpy (newname, name);
|
||||
if (output->name && output->name != (char *) (output + 1))
|
||||
free(output->name);
|
||||
output->name = newname;
|
||||
|
|
|
|||
Loading…
Reference in a new issue