diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-06-23 12:54:03 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-06-23 12:54:03 -0500 |
| commit | 39c79cd6fb661269b8505247a2dea1ae7b7aad81 (patch) | |
| tree | f0a008e4f726dc0cec865eac883b6059ef26b939 /res | |
| parent | 44c3c392e3642cdab0ed85f1f4cf72daf9f2cb9a (diff) | |
| parent | 096b27d9d2e399dc7de7eab8252c8b02286e0702 (diff) | |
Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_outbound_registration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index 7f60acdb3..d0b868799 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -389,7 +389,7 @@ static struct pjsip_param *get_uri_option_line(const void *uri) static const pj_str_t LINE_STR = { "line", 4 }; if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri)) { - return NULL; + return NULL; } pjuri = pjsip_uri_get_uri(uri); return pjsip_param_find(&pjuri->other_param, &LINE_STR); @@ -403,7 +403,7 @@ static struct ast_sip_endpoint *line_identify(pjsip_rx_data *rdata) RAII_VAR(struct sip_outbound_registration_state *, state, NULL, ao2_cleanup); if (!(line = get_uri_option_line(rdata->msg_info.to->uri)) - && !(line = get_uri_option_line(rdata->msg_info.msg->line.req.uri))) { + && !(line = get_uri_option_line(rdata->msg_info.msg->line.req.uri))) { return NULL; } |