removed redundant condition:

[winpr/libwinpr/synch/semaphore.c:131] -> [winpr/libwinpr/synch/semaphore.c:136]: (warning) Either the condition 'if(semaphore)' is redundant or there is possible null pointer dereference: semaphore.
[winpr/libwinpr/synch/semaphore.c:132] -> [winpr/libwinpr/synch/semaphore.c:136]: (warning) Either the condition 'if(semaphore)' is redundant or there is possible null pointer dereference: semaphore.
[winpr/libwinpr/synch/semaphore.c:133] -> [winpr/libwinpr/synch/semaphore.c:136]: (warning) Either the condition 'if(semaphore)' is redundant or there is possible null pointer dereference: semaphore.
[winpr/libwinpr/synch/semaphore.c:134] -> [winpr/libwinpr/synch/semaphore.c:136]: (warning) Either the condition 'if(semaphore)' is redundant or there is possible null pointer dereference: semaphore.

diff --git a/winpr/libwinpr/synch/semaphore.c b/winpr/libwinpr/synch/semaphore.c
index 78398c4..aa8f80a 100644 (file)
--- a/winpr/libwinpr/synch/semaphore.c
+++ b/winpr/libwinpr/synch/semaphore.c
@@ -133,51 +133,48 @@ HANDLE CreateSemaphoreW(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lIniti
        semaphore->sem = (winpr_sem_t*) NULL;
        semaphore->ops = &ops;
 
-       if (semaphore)
-       {
 #ifdef WINPR_PIPE_SEMAPHORE
 
-               if (pipe(semaphore->pipe_fd) < 0)
+       if (pipe(semaphore->pipe_fd) < 0)
+       {
+               WLog_ERR(TAG, "failed to create semaphore");
+               free(semaphore);
+               return NULL;
+       }
+
+       while (lInitialCount > 0)
+       {
+               if (write(semaphore->pipe_fd[1], "-", 1) != 1)
                {
-                       WLog_ERR(TAG, "failed to create semaphore");
+                       close(semaphore->pipe_fd[0]);
+                       close(semaphore->pipe_fd[1]);
                        free(semaphore);
                        return NULL;
                }
 
-               while (lInitialCount > 0)
-               {
-                       if (write(semaphore->pipe_fd[1], "-", 1) != 1)
-                       {
-                               close(semaphore->pipe_fd[0]);
-                               close(semaphore->pipe_fd[1]);
-                               free(semaphore);
-                               return NULL;
-                       }
-
-                       lInitialCount--;
-               }
+               lInitialCount--;
+       }
 
 #else
-               semaphore->sem = (winpr_sem_t*) malloc(sizeof(winpr_sem_t));
-               if (!semaphore->sem)
-               {
-                       WLog_ERR(TAG, "failed to allocate semaphore memory");
-                       free(semaphore);
-                       return NULL;
-               }
+       semaphore->sem = (winpr_sem_t*) malloc(sizeof(winpr_sem_t));
+       if (!semaphore->sem)
+       {
+               WLog_ERR(TAG, "failed to allocate semaphore memory");
+               free(semaphore);
+               return NULL;
+       }
 #if defined __APPLE__
-               if (semaphore_create(mach_task_self(), semaphore->sem, SYNC_POLICY_FIFO, lMaximumCount) != KERN_SUCCESS)
+       if (semaphore_create(mach_task_self(), semaphore->sem, SYNC_POLICY_FIFO, lMaximumCount) != KERN_SUCCESS)
 #else
-               if (sem_init(semaphore->sem, 0, lMaximumCount) == -1)
-#endif
-               {
-                       WLog_ERR(TAG, "failed to create semaphore");
-                       free(semaphore->sem);
-                       free(semaphore);
-                       return NULL;
-               }
+       if (sem_init(semaphore->sem, 0, lMaximumCount) == -1)
 #endif
+       {
+               WLog_ERR(TAG, "failed to create semaphore");
+               free(semaphore->sem);
+               free(semaphore);
+               return NULL;
        }
+#endif
 
        WINPR_HANDLE_SET_TYPE_AND_MODE(semaphore, HANDLE_TYPE_SEMAPHORE, WINPR_FD_READ);
        handle = (HANDLE) semaphore;