diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-12-02 17:43:01 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-18 17:44:12 -0800 |
| commit | 895f40792a14d8b88923bf3b428d31ae3bb31e46 (patch) | |
| tree | 3f53eecbf3ffea314ee657a0254925fe65510605 /randr | |
| parent | a11c58fa0c5809f918b36b84be53385cb2d8ea59 (diff) | |
Add type name argument to CreateNewResourceType
Convert all calls of CreateNewResourceType to pass name argument
Breaks DIX ABI.
ABI versions bumped:
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/randr.c | 8 | ||||
| -rw-r--r-- | randr/rrcrtc.c | 4 | ||||
| -rw-r--r-- | randr/rrmode.c | 4 | ||||
| -rw-r--r-- | randr/rroutput.c | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/randr/randr.c b/randr/randr.c index 7d59a6870..b63a7f22e 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -29,8 +29,6 @@ #include <dix-config.h> #endif -#include "registry.h" - #include "randrstr.h" /* From render.h */ @@ -338,14 +336,12 @@ RRExtensionInit (void) if (!AddCallback (&ClientStateCallback, RRClientCallback, 0)) return; - RRClientType = CreateNewResourceType(RRFreeClient); + RRClientType = CreateNewResourceType(RRFreeClient, "RandRClient"); if (!RRClientType) return; - RegisterResourceName(RRClientType, "RandRClient"); - RREventType = CreateNewResourceType(RRFreeEvents); + RREventType = CreateNewResourceType(RRFreeEvents, "RandREvent"); if (!RREventType) return; - RegisterResourceName(RREventType, "RandREvent"); extEntry = AddExtension (RANDR_NAME, RRNumberEvents, RRNumberErrors, ProcRRDispatch, SProcRRDispatch, NULL, StandardMinorOpcode); diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 0e14b36dd..a9eb2d262 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -22,7 +22,6 @@ #include "randrstr.h" #include "swaprep.h" -#include "registry.h" RESTYPE RRCrtcType; @@ -633,10 +632,9 @@ RRCrtcTransformSet (RRCrtcPtr crtc, Bool RRCrtcInit (void) { - RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource); + RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource, "CRTC"); if (!RRCrtcType) return FALSE; - RegisterResourceName (RRCrtcType, "CRTC"); return TRUE; } diff --git a/randr/rrmode.c b/randr/rrmode.c index 9642ddae3..139619367 100644 --- a/randr/rrmode.c +++ b/randr/rrmode.c @@ -21,7 +21,6 @@ */ #include "randrstr.h" -#include "registry.h" RESTYPE RRModeType; @@ -266,10 +265,9 @@ RRModeInit (void) { assert (num_modes == 0); assert (modes == NULL); - RRModeType = CreateNewResourceType (RRModeDestroyResource); + RRModeType = CreateNewResourceType (RRModeDestroyResource, "MODE"); if (!RRModeType) return FALSE; - RegisterResourceName (RRModeType, "MODE"); return TRUE; } diff --git a/randr/rroutput.c b/randr/rroutput.c index 2eff8c183..3a1b8bbea 100644 --- a/randr/rroutput.c +++ b/randr/rroutput.c @@ -22,7 +22,6 @@ */ #include "randrstr.h" -#include "registry.h" RESTYPE RROutputType; @@ -422,10 +421,9 @@ RROutputDestroyResource (pointer value, XID pid) Bool RROutputInit (void) { - RROutputType = CreateNewResourceType (RROutputDestroyResource); + RROutputType = CreateNewResourceType (RROutputDestroyResource, "OUTPUT"); if (!RROutputType) return FALSE; - RegisterResourceName (RROutputType, "OUTPUT"); return TRUE; } |