[sr-dev] git:master: registrar(k): local send_reply() renamed

Module: sip-router Branch: master Commit: d34c702efad58d158c01aca988c006227292488f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d34c702… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Wed Jul 29 11:20:59 2009 +0200 registrar(k): local send_reply() renamed - new name reg_send_reply() - symbol conflict with sl module version on darwinos --- modules_k/registrar/reply.c | 2 +- modules_k/registrar/reply.h | 2 +- modules_k/registrar/save.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/registrar/reply.c b/modules_k/registrar/reply.c index 85c83ad..60c68ce 100644 --- a/modules_k/registrar/reply.c +++ b/modules_k/registrar/reply.c @@ -365,7 +365,7 @@ static int add_unsupported(struct sip_msg* _m, str* _p) /*! \brief * Send a reply */ -int send_reply(struct sip_msg* _m) +int reg_send_reply(struct sip_msg* _m) { str unsup = str_init(SUPPORTED_PATH_STR); long code; diff --git a/modules_k/registrar/reply.h b/modules_k/registrar/reply.h index e201ba0..8652e52 100644 --- a/modules_k/registrar/reply.h +++ b/modules_k/registrar/reply.h @@ -38,7 +38,7 @@ /*! \brief * Send a reply */ -int send_reply(struct sip_msg* _m); +int reg_send_reply(struct sip_msg* _m); /*! \brief diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index c48e5ac..148543f 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -780,7 +780,7 @@ int save(struct sip_msg* _m, char* _d, char* _cflags) update_stat(accepted_registrations, 1); /* Only send reply upon request, not upon reply */ - if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) && (send_reply(_m) < 0)) + if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) && (reg_send_reply(_m) < 0)) return -1; return ret; @@ -788,7 +788,7 @@ error: update_stat(rejected_registrations, 1); if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) ) - send_reply(_m); + reg_send_reply(_m); return 0; }