[PATCH] dix: remove dixLookupResource - we don't have any users left.

Aaron Plattner aplattner at nvidia.com
Fri Sep 4 23:07:15 PDT 2009


Recent versions of the driver use the *ByType and *ByClass versions when
they detect ABI 6.  I'm also fine with removing it.

The X_DEPRECATED on dixLookupResource breaks our build due to -Werror.  ;)

-- Aaron



This is off-topic, but does anyone else see traffic from the list
occasionally have headers like this?

  From: Eamon Walsh <ewalsh at tycho.nsa.gov>
  To: Peter Hutterer <peter.hutterer at who-t.net>
  CC: X.Org

It makes replying annoying.

On Fri, Sep 04, 2009 at 03:38:29PM -0700, Eamon Walsh wrote:
> This is fine with me, however, I know that the proprietary nvidia driver 
> does resource lookups so it's possible they might call this.  Maybe 
> check with them to verify.
> 
> On 09/03/2009 11:23 PM, Peter Hutterer wrote:
> > Signed-off-by: Peter Hutterer<peter.hutterer at who-t.net>
> > ---
> >   dix/deprecated.c   |   18 ------------------
> >   include/resource.h |    8 --------
> >   2 files changed, 0 insertions(+), 26 deletions(-)
> >
> > diff --git a/dix/deprecated.c b/dix/deprecated.c
> > index 8123886..21d0f57 100644
> > --- a/dix/deprecated.c
> > +++ b/dix/deprecated.c
> > @@ -162,22 +162,4 @@ LookupIDByClass(XID id, RESTYPE classes)
> >       return val;
> >   }
> >
> > -/* replaced by dixLookupResourceBy{Type,Class} */
> > -_X_EXPORT int
> > -dixLookupResource (pointer *result, XID id, RESTYPE rtype,
> > -		   ClientPtr client, Mask mode)
> > -{
> > -    Bool istype = ((rtype&  TypeMask)&&  (rtype != RC_ANY)) || (rtype == RT_NONE);
> > -
> > -    static int warn = 1;
> > -    if (warn>  0&&  --warn)
> > -	ErrorF("Warning: dixLookupResource() "
> > -	       "is deprecated.  Please convert your driver/module "
> > -	       "to use dixLookupResourceByType/dixLookupResourceByClass().\n");
> > -    if (istype)
> > -	return dixLookupResourceByType (result, id, rtype, client, mode);
> > -    else
> > -	return dixLookupResourceByClass (result, id, rtype, client, mode);
> > -}
> > -
> >   /* end deprecated functions */
> > diff --git a/include/resource.h b/include/resource.h
> > index 774f81b..8ed4e56 100644
> > --- a/include/resource.h
> > +++ b/include/resource.h
> > @@ -257,14 +257,6 @@ extern _X_EXPORT RESTYPE TypeMask;
> >   #define X_DEPRECATED
> >   #endif
> >
> > -/* replaced by dixLookupResourceByType or dixLookupResourceByClass */
> > -extern int dixLookupResource(
> > -    pointer *result,
> > -    XID id,
> > -    RESTYPE rtype,
> > -    ClientPtr client,
> > -    Mask access_mode) X_DEPRECATED;
> > -
> >   /* replaced by dixLookupResourceByType */
> >   extern _X_EXPORT pointer SecurityLookupIDByType(
> >       ClientPtr client,


More information about the xorg-devel mailing list