From 46ca27eb547ad225b306d7f0886232d408b98c7f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 10 Aug 2007 14:31:16 -0700 Subject: Clean up tv mode name allocation and copy. TV mode names used to contain the signalling standard along with the pixel size. The signalling has been moved to the TV_FORMAT property, but the allocation and initialization of the mode name was left a bit messy as a result. (cherry picked from commit ed1b106fabf3a18489bdb3083326f27387a9cb72) --- src/i830_tv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/i830_tv.c b/src/i830_tv.c index aba0e3be..e3aeaf9c 100644 --- a/src/i830_tv.c +++ b/src/i830_tv.c @@ -1415,10 +1415,8 @@ i830_tv_get_modes(xf86OutputPtr output) continue; mode_ptr = xnfcalloc(1, sizeof(DisplayModeRec)); - mode_ptr->name = xnfalloc(strlen(tv_mode->name) + - strlen(input->name) + 4); - sprintf(mode_ptr->name, "%s", input->name); - + mode_ptr->name = xnfalloc(strlen(input->name) + 1); + strcpy (mode_ptr->name, input->name); mode_ptr->HDisplay = hactive_s; mode_ptr->HSyncStart = hactive_s + 1; -- cgit v1.2.3