[sr-dev] git:master:9c9da879: core: remove inline from implementation of functions declared without it

Module: kamailio Branch: master Commit: 9c9da87943ad86fd4ca3ba8b007cebfcb7d9bc61 URL: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2017-06-27T15:02:30+02:00 core: remove inline from implementation of functions declared without it --- Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… Patch: https://github.com/kamailio/kamailio/commit/9c9da87943ad86fd4ca3ba8b007cebf… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 71d56f55c9..0661ce4bfa 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1305,7 +1305,7 @@ static inline int _parse_ruri(str *uri, if (*status) return 1; if (parse_uri(uri->s, uri->len, parsed_uri)<0) { - LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", + LOG(L_ERR, "ERROR: _parse_ruri: bad uri <%.*s>\n", uri->len, ZSW(uri->s)); *status=0; return -1; @@ -1347,7 +1347,8 @@ int parse_orig_ruri(struct sip_msg* msg) return ret; } -inline int normalize_tel_user(char* res, str* src) { +int normalize_tel_user(char* res, str* src) +{ int i, l; l=0; for (i=0; i<src->len; i++) { @@ -1360,7 +1361,7 @@ inline int normalize_tel_user(char* res, str* src) { default: res[l++]=src->s[i]; } - } + } return l; } @@ -1372,7 +1373,7 @@ str s_tels = STR_STATIC_INIT("tels"); str s_urn = STR_STATIC_INIT("urn"); static str s_null = STR_STATIC_INIT(""); -inline void uri_type_to_str(uri_type type, str *s) { +void uri_type_to_str(uri_type type, str *s) { switch (type) { case SIP_URI_T: *s = s_sip; @@ -1400,7 +1401,7 @@ static str s_tls = STR_STATIC_INIT("tls"); static str s_sctp = STR_STATIC_INIT("sctp"); static str s_ws = STR_STATIC_INIT("ws"); -inline void proto_type_to_str(unsigned short type, str *s) { +void proto_type_to_str(unsigned short type, str *s) { switch (type) { case PROTO_UDP: *s = s_udp; diff --git a/src/core/parser/parse_uri.h b/src/core/parser/parse_uri.h index 1638e264f5..a3c8c7142c 100644 --- a/src/core/parser/parse_uri.h +++ b/src/core/parser/parse_uri.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -39,7 +39,7 @@ extern str s_sip, s_sips, s_tel, s_tels, s_urn; /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri - * returns: fills uri & returns <0 on error or 0 if ok + * returns: fills uri & returns <0 on error or 0 if ok */ int parse_uri(char *buf, int len, struct sip_uri* uri); int parse_sip_msg_uri(struct sip_msg* msg);