From 895f40792a14d8b88923bf3b428d31ae3bb31e46 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 2 Dec 2009 17:43:01 -0800 Subject: 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 Reviewed-by: Keith Packard Signed-off-by: Keith Packard --- Xext/sync.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'Xext/sync.c') diff --git a/Xext/sync.c b/Xext/sync.c index b3bba1734..ce6531467 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -64,7 +64,6 @@ PERFORMANCE OF THIS SOFTWARE. #include "extnsionst.h" #include "dixstruct.h" #include "resource.h" -#include "registry.h" #include "opaque.h" #include #include "syncsrv.h" @@ -874,12 +873,11 @@ SyncCreateSystemCounter( */ if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); if (RTCounter == 0) { return NULL; } - RegisterResourceName(RTCounter, "SyncCounter"); } pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial); @@ -2112,13 +2110,13 @@ SyncExtensionInit(void) if (RTCounter == 0) { - RTCounter = CreateNewResourceType(FreeCounter); + RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter"); } - RTAlarm = CreateNewResourceType(FreeAlarm); - RTAwait = CreateNewResourceType(FreeAwait); + RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm"); + RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait"); if (RTAwait) RTAwait |= RC_NEVERRETAIN; - RTAlarmClient = CreateNewResourceType(FreeAlarmClient); + RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient"); if (RTAlarmClient) RTAlarmClient |= RC_NEVERRETAIN; @@ -2135,10 +2133,6 @@ SyncExtensionInit(void) return; } - RegisterResourceName(RTCounter, "SyncCounter"); - RegisterResourceName(RTAlarm, "SyncAlarm"); - RegisterResourceName(RTAwait, "SyncAwait"); - RegisterResourceName(RTAlarmClient, "SyncAlarmClient"); SyncEventBase = extEntry->eventBase; SyncErrorBase = extEntry->errorBase; EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent; -- cgit v1.2.3