qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XF86VidModeGetMonitor: don't return static strings to the caller when

Browse Source 
the man page says it's dynamically allocated memory. Just leave the
NULL there (after discusion with Adam Jackson from X.Org).
also remove the RCS keyworks while there to ease future merge.
This commit is contained in:
matthieu 2008-06-13 17:30:58 +00:00
parent 6b46002c42
commit 657fa78569
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libXxf86vm/src/XF86VMode.c
View File

@ -1,5 +1,3 @@
/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */
/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */
/* /*
Copyright (c) 1995 Kaleb S. KEITHLEY Copyright (c) 1995 Kaleb S. KEITHLEY
@ -29,7 +27,6 @@ or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY. from Kaleb S. KEITHLEY.
*/ */
/* $XConsortium: XF86VMode.c /main/4 1996/01/16 07:52:25 kaleb CHECKEDOUT $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */ /* THIS IS NOT AN X CONSORTIUM STANDARD */
@ -966,12 +963,8 @@ XF86VidModeGetMonitor(dpy, screen, monitor)
} }
if (rep.vendorLength) if (rep.vendorLength)
_XReadPad(dpy, monitor->vendor, rep.vendorLength); _XReadPad(dpy, monitor->vendor, rep.vendorLength);
else
monitor->vendor = "";
if (rep.modelLength) if (rep.modelLength)
_XReadPad(dpy, monitor->model, rep.modelLength); _XReadPad(dpy, monitor->model, rep.modelLength);
else
monitor->model = "";
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();