Author: mikej Date: Sun May 25 11:10:34 2008 New Revision: 8622 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c Log: 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. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:10:34 2008 @@ -1 +1 @@ -Sun May 25 11:09:54 EDT 2008 +Sun May 25 11:10:29 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_base_port.c Sun May 25 11:10:34 2008 @@ -560,11 +560,18 @@ 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; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c Sun May 25 11:10:34 2008 @@ -427,10 +427,18 @@ #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); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_pthread_port.c Sun May 25 11:10:34 2008 @@ -388,6 +388,8 @@ /** 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 @@ 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;