From 02c84a673932a7354bf7d7d715dcfee5d6e419c6 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 25 May 2008 15:13:10 +0000 Subject: [PATCH] Tue May 20 13:32:51 EDT 2008 Pekka.Pessi@nokia.com * su_wait.c: fixed klocwork issues git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8625 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_wait.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index f5ba423176..a18190171e 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Sun May 25 11:11:31 EDT 2008 +Sun May 25 11:12:25 EDT 2008 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c b/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c index 09c7ed930a..3898a570a7 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c @@ -186,16 +186,14 @@ int su_wait_destroy(su_wait_t *waitobj) { #if SU_HAVE_WINSOCK su_wait_t w0 = NULL; + assert(waitobj != NULL); if (*waitobj) WSACloseEvent(*waitobj); -#elif SU_HAVE_POLL || HAVE_SELECT - su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; #else su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; -#endif assert(waitobj != NULL); *waitobj = w0; - +#endif return waitobj ? 0 : -1; }