commit 6ebbe3c949fdd922968ab97001be2d2e7f45c8e2
author Alexandre Julliard <julliard@winehq.org> Fri Jan 01 17:04:00 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 01 17:04:00 1999 +0000
tree d83ab2207fbe6b2e479db852e81fbfbed896d51a
parent 881708cc2d00fc7bcf2fd3123636a352cf719c5a

Cleaned up and removed some no longer used code.

scheduler/semaphore.c

diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c
index 561d536..24a70db 100644
--- a/scheduler/semaphore.c
+++ b/scheduler/semaphore.c
@@ -19,13 +19,6 @@
     K32OBJ        header;
 } SEMAPHORE;
 
-static void SEMAPHORE_Destroy( K32OBJ *obj );
-
-const K32OBJ_OPS SEMAPHORE_Ops =
-{
-    SEMAPHORE_Destroy      /* destroy */
-};
-
 
 /***********************************************************************
  *           CreateSemaphore32A   (KERNEL32.174)
@@ -52,8 +45,7 @@
     req.inherit = (sa && (sa->nLength>=sizeof(*sa)) && sa->bInheritHandle);
 
     CLIENT_SendRequest( REQ_CREATE_SEMAPHORE, -1, 2, &req, sizeof(req), name, len );
-    CLIENT_WaitReply( &len, NULL, 1, &reply, sizeof(reply) );
-    CHECK_LEN( len, sizeof(reply) );
+    CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
     if (reply.handle == -1) return 0;
 
     SYSTEM_LOCK();
@@ -95,8 +87,7 @@
     req.access  = access;
     req.inherit = inherit;
     CLIENT_SendRequest( REQ_OPEN_NAMED_OBJ, -1, 2, &req, sizeof(req), name, len );
-    CLIENT_WaitReply( &len, NULL, 1, &reply, sizeof(reply) );
-    CHECK_LEN( len, sizeof(reply) );
+    CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL );
     if (reply.handle != -1)
     {
         SYSTEM_LOCK();
@@ -133,7 +124,6 @@
 {
     struct release_semaphore_request req;
     struct release_semaphore_reply reply;
-    int len;
 
     if (count < 0)
     {
@@ -145,21 +135,7 @@
     if (req.handle == -1) return FALSE;
     req.count = (unsigned int)count;
     CLIENT_SendRequest( REQ_RELEASE_SEMAPHORE, -1, 1, &req, sizeof(req) );
-    if (CLIENT_WaitReply( &len, NULL, 1, &reply, sizeof(reply) )) return FALSE;
-    CHECK_LEN( len, sizeof(reply) );
+    if (CLIENT_WaitSimpleReply( &reply, sizeof(reply), NULL )) return FALSE;
     if (previous) *previous = reply.prev_count;
     return TRUE;
 }
-
-
-/***********************************************************************
- *           SEMAPHORE_Destroy
- */
-static void SEMAPHORE_Destroy( K32OBJ *obj )
-{
-    SEMAPHORE *sem = (SEMAPHORE *)obj;
-    assert( obj->type == K32OBJ_SEMAPHORE );
-    /* There cannot be any thread on the list since the ref count is 0 */
-    obj->type = K32OBJ_UNKNOWN;
-    HeapFree( SystemHeap, 0, sem );
-}