On Tue, 29 Jun 2010 16:08:03 +0300, Tiago Vignatti <[email protected]> wrote:
> diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre > b/hw/xfree86/doc/man/xorg.conf.man.pre > index 6b3636f..3443e9b 100644 > --- a/hw/xfree86/doc/man/xorg.conf.man.pre > +++ b/hw/xfree86/doc/man/xorg.conf.man.pre > @@ -1455,9 +1455,6 @@ The entries that may be used in > .B Monitor > sections are described below. > .TP 7 > -.BI "VendorName \*q" vendor \*q > -This optional entry specifies the monitor's manufacturer. > -.TP 7 > .BI "ModelName \*q" model \*q > This optional entry specifies the monitor's model. > .TP 7 You appear to be patching the monitor section instead of the device section here. > diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c > index d71abc6..2675686 100644 > --- a/hw/xfree86/parser/Device.c > +++ b/hw/xfree86/parser/Device.c > @@ -123,14 +123,9 @@ xf86parseDeviceSection (void) > has_ident = TRUE; > break; > case VENDOR: > - if (xf86getSubToken (&(ptr->dev_comment)) != STRING) > - Error (QUOTE_MSG, "Vendor"); > - ptr->dev_vendor = val.str; > - break; > case BOARD: > - if (xf86getSubToken (&(ptr->dev_comment)) != STRING) > - Error (QUOTE_MSG, "Board"); > - ptr->dev_board = val.str; > + xf86parseError (OBSOLETE_MSG, xf86tokenString()); > + xf86getSubToken (&(ptr->dev_comment)); > break; Just FYI -- I think there is a memory leak here as you're parsing and then not freeing the string. Not a big deal as it's in the config file stuff. Question to the crowd -- any opinion on whether this change has become too large for inclusion in 1.9? It isn't adding any code, and only changes the ABI in removing some useless struct fields. -- [email protected]
pgpbRdkLCPt8J.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
