unifdef -UNOTYET

Mostly removes resource class code copied from the X server resource
handling code and never used.  Also removes reset on last client
disconnect code (similarly copied from the X server and not used).

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3 files changed, 0 insertions, 132 deletions

diff --git a/difs/dispatch.c b/difs/dispatch.c
index 6f8b2b6..a85d306 100644
--- a/difs/dispatch.c
+++ b/difs/dispatch.c
@@ -1034,11 +1034,6 @@ DoCloseDownClient(ClientPtr client)
 	CheckFileNumbers();
 #endif /* DebugConnectionTranslation */
 
-#ifdef NOTYET
-	/* reset server when last client goes away */
-	if (client->requestVector != InitialVector && nClients == 0)
-	    dispatchException |= DE_RESET;
-#endif
 
 	if (currentClient == client)
 	    currentClient = serverClient;
diff --git a/difs/resource.c b/difs/resource.c
index b8a93be..0508a04 100644
--- a/difs/resource.c
+++ b/difs/resource.c
@@ -100,47 +100,12 @@ typedef struct _ClientResource {
 }           ClientResourceRec;
 
 static RESTYPE lastResourceType;
-#ifdef NOTYET
-static RESTYPE lastResourceClass;
-#endif
 static RESTYPE TypeMask;
 
 typedef int (*DeleteType) (void *, FSID);
 
 static DeleteType *DeleteFuncs = (DeleteType *) NULL;
 
-#ifdef NOTYET
-RESTYPE
-CreateNewResourceType(DeleteType deleteFunc)
-{
-    RESTYPE     next = lastResourceType + 1;
-    DeleteType *funcs;
-
-    if (next & lastResourceClass)
-	return 0;
-    funcs = (DeleteType *) fsrealloc(DeleteFuncs,
-				     (next + 1) * sizeof(DeleteType));
-    if (!funcs)
-	return 0;
-    lastResourceType = next;
-    DeleteFuncs = funcs;
-    DeleteFuncs[next] = deleteFunc;
-    return next;
-}
-
-RESTYPE
-CreateNewResourceClass(void)
-{
-    RESTYPE     next = lastResourceClass >> 1;
-
-    if (next & lastResourceType)
-	return 0;
-    lastResourceClass = next;
-    TypeMask = next - 1;
-    return next;
-}
-
-#endif				/* NOTYET */
 
 static ClientResourceRec clientTable[MAXCLIENTS];
 
@@ -164,9 +129,6 @@ InitClientResources(ClientPtr client)
 
     if (client == serverClient) {
 	lastResourceType = RT_LASTPREDEF;
-#ifdef NOTYET
-	lastResourceClass = RC_LASTPREDEF;
-#endif
 	TypeMask = RC_LASTPREDEF - 1;
 	if (DeleteFuncs)
 	    fsfree(DeleteFuncs);
@@ -410,63 +372,6 @@ FreeResource(
 	FatalError("freeing resource id=%lX which isn't there\n", id);
 }
 
-#ifdef NOTYET
-void
-FreeResourceByType(
-    int         cid,
-    FSID        id,
-    RESTYPE     type,
-    Bool        skipFree)
-{
-    register ResourcePtr res;
-    register ResourcePtr *prev,
-               *head;
-
-    if (clientTable[cid].buckets) {
-	head = &clientTable[cid].resources[hash(cid, id)];
-
-	prev = head;
-	while (res = *prev) {
-	    if (res->id == id && res->type == type) {
-		*prev = res->next;
-		if (!skipFree)
-		    (*DeleteFuncs[type & TypeMask]) (res->value, res->id);
-		fsfree(res);
-		break;
-	    } else
-		prev = &res->next;
-	}
-    }
-}
-
-/*
- * Change the value associated with a resource id.  Caller
- * is responsible for "doing the right thing" with the old
- * data
- */
-
-Bool
-ChangeResourceValue(
-    int         cid,
-    FSID        id,
-    RESTYPE     rtype,
-    pointer     value)
-{
-    register ResourcePtr res;
-
-    if (clientTable[cid].buckets) {
-	res = clientTable[cid].resources[hash(cid, id)];
-
-	for (; res; res = res->next)
-	    if ((res->id == id) && (res->type == rtype)) {
-		res->value = value;
-		return TRUE;
-	    }
-    }
-    return FALSE;
-}
-
-#endif				/* NOTYET */
 
 void
 FreeClientResources(ClientPtr client)
@@ -544,27 +449,3 @@ LookupIDByType(
     return (pointer) NULL;
 }
 
-#ifdef NOTYET
-/*
- *  lookup_ID_by_class returns the object with the given id and any one of the
- *  given classes, else NULL.
- */
-pointer
-LookupIDByClass(
-    FSID        id,
-    RESTYPE     classes)
-{
-    int         cid;
-    register ResourcePtr res;
-
-    if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && clientTable[cid].buckets) {
-	res = clientTable[cid].resources[hash(cid, id)];
-
-	for (; res; res = res->next)
-	    if ((res->id == id) && (res->type & classes))
-		return res->value;
-    }
-    return (pointer) NULL;
-}
-
-#endif				/* NOTYET */
diff --git a/include/fsresource.h b/include/fsresource.h
index e003e84..c9d3e23 100644
--- a/include/fsresource.h
+++ b/include/fsresource.h
@@ -73,14 +73,6 @@ typedef unsigned long RESTYPE;
 
 #define	BAD_RESOURCE		0xe0000000
 
-#ifdef NOTYET
-extern Bool ChangeResourceValue(int cid, FSID id, RESTYPE rtype, pointer value);
-extern FSID FakeClientID(int client);
-extern RESTYPE CreateNewResourceClass(void);
-extern RESTYPE CreateNewResourceType(DeleteType deleteFunc);
-extern pointer LookupIDByClass(FSID id, RESTYPE classes);
-extern void FreeResourceByType(int cid, FSID id, RESTYPE type, Bool skipFree);
-#endif /* NOTYET */
 
 extern Bool AddResource(int cid, FSID id, RESTYPE type, pointer value);
 extern Bool InitClientResources(ClientPtr client);