From 5253e1b3e09a8c2b404072d6175e4a6ed0252cf6 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 25 May 2008 15:10:34 +0000 Subject: [PATCH] Tue May 20 13:30:50 EDT 2008 Pekka.Pessi@nokia.com * su_port.c, su_base_port.c, su_pthread_port.c: fixed klocworks issues. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8622 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c | 7 +++++++ libs/sofia-sip/libsofia-sip-ua/su/su_port.c | 8 ++++++++ libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 66e6622bf9..a25a6e0a6d 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Sun May 25 11:09:54 EDT 2008 +Sun May 25 11:10:29 EDT 2008 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c b/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c index 715888c021..cb75650fb9 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c @@ -560,11 +560,18 @@ static void su_base_port_clone_break(su_root_magic_t *m, su_root_destroy(task->sut_root); } +/**Wait for the clone to exit. + * @internal + * + * Called by su_port_wait() and su_clone_wait() + */ void su_base_port_wait(su_clone_r rclone) { su_port_t *self; su_root_t *root_to_wait; + assert(*rclone); + self = su_msg_from(rclone)->sut_port; assert(self == su_msg_to(rclone)->sut_port); root_to_wait = su_msg_to(rclone)->sut_root; diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_port.c b/libs/sofia-sip/libsofia-sip-ua/su/su_port.c index 8cc9dc5b0b..8a3b26b74a 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_port.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_port.c @@ -427,10 +427,18 @@ int su_clone_resume(su_clone_r rclone) #endif } +/** Wait for clone to exit. + * + * @internal + * + * Called by su_clone_wait(). + */ void su_port_wait(su_clone_r rclone) { su_port_t *cloneport; + assert(*rclone); + cloneport = su_msg_to(rclone)->sut_port; cloneport->sup_vtable->su_port_wait(rclone); } diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c b/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c index 0d356fa250..fe52976dd2 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c @@ -388,6 +388,8 @@ static void su_pthread_port_clone_break(su_root_magic_t *m, /** Wait for the pthread clone to exit. * @internal + * + * Called by su_port_wait() and su_clone_wait(). */ void su_pthread_port_wait(su_clone_r rclone) { @@ -395,6 +397,8 @@ void su_pthread_port_wait(su_clone_r rclone) struct su_pthread_port_waiting_parent mom[1]; pthread_t tid; + assert(*rclone); + clone = su_msg_to(rclone)->sut_port; parent = su_msg_from(rclone)->sut_port;