Andrew Talbot : ntdll: Remove unneeded casts.

Alexandre Julliard julliard at winehq.org
Mon Jan 14 09:33:12 CST 2008


Module: wine
Branch: master
Commit: 00981b580a24fa7711f176178f9781e2b496477c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=00981b580a24fa7711f176178f9781e2b496477c

Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date:   Sat Jan 12 16:05:50 2008 +0000

ntdll: Remove unneeded casts.

---

 dlls/ntdll/critsection.c |   11 +++++------
 dlls/ntdll/serial.c      |    4 ++--
 dlls/ntdll/threadpool.c  |   10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
index 3c0d549..0fa47c4 100644
--- a/dlls/ntdll/critsection.c
+++ b/dlls/ntdll/critsection.c
@@ -39,12 +39,12 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
 
 static inline LONG interlocked_inc( PLONG dest )
 {
-    return interlocked_xchg_add( (int *)dest, 1 ) + 1;
+    return interlocked_xchg_add( dest, 1 ) + 1;
 }
 
 static inline LONG interlocked_dec( PLONG dest )
 {
-    return interlocked_xchg_add( (int *)dest, -1 ) - 1;
+    return interlocked_xchg_add( dest, -1 ) - 1;
 }
 
 static inline void small_pause(void)
@@ -208,8 +208,7 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit )
     {
         HANDLE sem;
         if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0;
-        if (!(ret = (HANDLE)interlocked_cmpxchg_ptr( (PVOID *)&crit->LockSemaphore,
-                                                     sem, 0 )))
+        if (!(ret = interlocked_cmpxchg_ptr( &crit->LockSemaphore, sem, 0 )))
             ret = sem;
         else
             NtClose(sem);  /* somebody beat us to it */
@@ -490,7 +489,7 @@ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit )
             if (crit->LockCount > 0) break;  /* more than one waiter, don't bother spinning */
             if (crit->LockCount == -1)       /* try again */
             {
-                if (interlocked_cmpxchg( (int *)&crit->LockCount, 0, -1 ) == -1) goto done;
+                if (interlocked_cmpxchg( &crit->LockCount, 0, -1 ) == -1) goto done;
             }
             small_pause();
         }
@@ -534,7 +533,7 @@ done:
 BOOL WINAPI RtlTryEnterCriticalSection( RTL_CRITICAL_SECTION *crit )
 {
     BOOL ret = FALSE;
-    if (interlocked_cmpxchg( (int *)&crit->LockCount, 0, -1 ) == -1)
+    if (interlocked_cmpxchg( &crit->LockCount, 0, -1 ) == -1)
     {
         crit->OwningThread   = ULongToHandle(GetCurrentThreadId());
         crit->RecursionCount = 1;
diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c
index 1b05b6e..2ca604d 100644
--- a/dlls/ntdll/serial.c
+++ b/dlls/ntdll/serial.c
@@ -264,9 +264,9 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc)
     case CS6:   slc->WordLength = 6;    break;
     case CS7:   slc->WordLength = 7;	break;
     case CS8:	slc->WordLength = 8;	break;
-    default: ERR("unknown size %x\n", (UINT)(port.c_cflag & CSIZE));
+    default: ERR("unknown size %x\n", port.c_cflag & CSIZE);
     }
-    
+
     if (port.c_cflag & CSTOPB)
     {
         if (slc->WordLength == 5)
diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c
index 179b505..e054136 100644
--- a/dlls/ntdll/threadpool.c
+++ b/dlls/ntdll/threadpool.c
@@ -73,12 +73,12 @@ struct work_item
 
 static inline LONG interlocked_inc( PLONG dest )
 {
-    return interlocked_xchg_add( (int *)dest, 1 ) + 1;
+    return interlocked_xchg_add( dest, 1 ) + 1;
 }
 
 static inline LONG interlocked_dec( PLONG dest )
 {
-    return interlocked_xchg_add( (int *)dest, -1 ) - 1;
+    return interlocked_xchg_add( dest, -1 ) - 1;
 }
 
 static void WINAPI worker_thread_proc(void * param)
@@ -148,7 +148,7 @@ static NTSTATUS add_work_item_to_queue(struct work_item *work_item)
     {
         HANDLE sem;
         status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX);
-        if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, sem, 0 ))
+        if (interlocked_cmpxchg_ptr( &work_item_event, sem, 0 ))
             NtClose(sem);  /* somebody beat us to it */
     }
     else
@@ -486,14 +486,14 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent)
                 status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, TRUE, FALSE );
                 if (status != STATUS_SUCCESS)
                     return status;
-                interlocked_xchg_ptr( (PVOID *)&wait_work_item->CompletionEvent, CompletionEvent );
+                interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent );
                 if (wait_work_item->CallbackInProgress)
                     NtWaitForSingleObject( CompletionEvent, FALSE, NULL );
                 NtClose( CompletionEvent );
             }
             else
             {
-                interlocked_xchg_ptr( (PVOID *)&wait_work_item->CompletionEvent, CompletionEvent );
+                interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent );
                 if (wait_work_item->CallbackInProgress)
                     status = STATUS_PENDING;
             }




More information about the wine-cvs mailing list