diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-06-13 17:30:59 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-06-13 17:30:59 +0000 |
| commit | 62c3aa436fa89970a0fa6faf71f0241b5d0a85ec (patch) | |
| tree | 76ab037b2a1db055b84d64355b19dae50de1d3b7 /lib | |
| parent | ea9fac4b0602fe006673184f8c88b38cb1924612 (diff) | |
XF86VidModeGetMonitor: don't return static strings to the caller when
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libXxf86vm/src/XF86VMode.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/libXxf86vm/src/XF86VMode.c b/lib/libXxf86vm/src/XF86VMode.c index 75a49d2ba..3a7de6b01 100644 --- a/lib/libXxf86vm/src/XF86VMode.c +++ b/lib/libXxf86vm/src/XF86VMode.c @@ -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 @@ -29,7 +27,6 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY. */ -/* $XConsortium: XF86VMode.c /main/4 1996/01/16 07:52:25 kaleb CHECKEDOUT $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ @@ -966,12 +963,8 @@ XF86VidModeGetMonitor(dpy, screen, monitor) } if (rep.vendorLength) _XReadPad(dpy, monitor->vendor, rep.vendorLength); - else - monitor->vendor = ""; if (rep.modelLength) _XReadPad(dpy, monitor->model, rep.modelLength); - else - monitor->model = ""; UnlockDisplay(dpy); SyncHandle(); |