Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build warning #92

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions libsofia-sip-ua/nua/nua.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ su_log_t nua_log[] = { SU_LOG_INIT("nua", "NUA_DEBUG", SU_DEBUG) };
* @param root Pointer to a root object
* @param callback Pointer to event callback function
* @param magic Pointer to callback context
* @param tag,value, ... List of tagged parameters
* @param tag, value, ... List of tagged parameters
*
* @retval !=NULL a pointer to a @nua stack object
* @retval NULL upon an error
Expand Down Expand Up @@ -1098,7 +1098,7 @@ nua_handle_t *nua_handle_by_call_id(nua_t *nua, const char *call_id)
/** Get leg from dialog. */
const nta_leg_t *nua_get_dialog_state_leg(nua_handle_t *nh)
{
if (nh && nh->nh_ds)
if (nh)
return nh->nh_ds->ds_leg;
else
return NULL;
Expand All @@ -1107,7 +1107,7 @@ const nta_leg_t *nua_get_dialog_state_leg(nua_handle_t *nh)
/** Get su_home_t from nua handle. */
su_home_t *nua_handle_get_home(nua_handle_t *nh)
{
if (nh && nh->nh_home)
if (nh)
return nh->nh_home;
else
return NULL;
Expand All @@ -1116,7 +1116,7 @@ su_home_t *nua_handle_get_home(nua_handle_t *nh)
/** Get su_home_t from nua. */
su_home_t *nua_get_home(nua_t *nua)
{
if (nua && nua->nua_home)
if (nua)
return nua->nua_home;
else
return NULL;
Expand Down Expand Up @@ -1147,7 +1147,7 @@ unsigned nua_handle_is_destroyed(nua_handle_t *nh)

void nua_handle_dialog_usage_set_refresh_range(nua_handle_t *nh,
unsigned min, unsigned max) {
if (nh && nh->nh_ds && nh->nh_ds->ds_usage) {
if (nh && nh->nh_ds->ds_usage) {
nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, min, max);
}
}
Expand Down
3 changes: 2 additions & 1 deletion libsofia-sip-ua/nua/nua_stack.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ void nua_stack_deinit(su_root_t *root, nua_t *nua)

#if HAVE_SMIME /* Start NRC Boston */
sm_destroy(nua->sm);
#endif /* End NRC Boston */}
#endif
/* End NRC Boston */

}
}
Expand Down
2 changes: 1 addition & 1 deletion libsofia-sip-ua/stun/stun_dns.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static void priv_sres_cb(stun_dns_lookup_t *self,

for (i = 0; answer && answer[i] != NULL; i++) {
sres_srv_record_t *rr = (sres_srv_record_t *) answer[i]->sr_srv;
if (rr && rr->srv_record && rr->srv_record->r_type == sres_type_srv) {
if (rr && rr->srv_record->r_type == sres_type_srv) {
const char *tcp_name = STUN_SRV_SERVICE_TCP;
const char *udp_name = STUN_SRV_SERVICE_UDP;
if ((self->stun_state & stun_dns_tls) == 0 &&
Expand Down