[sr-dev] git:master: uac(k): renamed static var to avoid conflicts

Module: sip-router Branch: master Commit: 1b7941a6e30ee7624ff0e32ee57882a0a45c8126 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b7941a… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Sun Jan 24 21:21:08 2010 +0100 uac(k): renamed static var to avoid conflicts --- modules_k/uac/auth_hdr.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules_k/uac/auth_hdr.c b/modules_k/uac/auth_hdr.c index 269f0bb..350fea4 100644 --- a/modules_k/uac/auth_hdr.c +++ b/modules_k/uac/auth_hdr.c @@ -314,7 +314,7 @@ str* build_authorization_hdr(int code, str *uri, struct uac_credential *crd, struct authenticate_body *auth, char *response) { - static str hdr; + static str _uac_auth_hdr; char *p; int len; int response_len; @@ -337,14 +337,14 @@ str* build_authorization_hdr(int code, str *uri, NC_FIELD_LEN + auth->nc->len + FIELD_SEPARATOR_UQ_LEN + CNONCE_FIELD_LEN + auth->cnonce->len + FIELD_SEPARATOR_LEN; - hdr.s = (char*)pkg_malloc( len + 1); - if (hdr.s==0) + _uac_auth_hdr.s = (char*)pkg_malloc( len + 1); + if (_uac_auth_hdr.s==0) { LM_ERR("no more pkg mem\n"); goto error; } - p = hdr.s; + p = _uac_auth_hdr.s; /* header start */ if (code==401) { @@ -395,20 +395,20 @@ str* build_authorization_hdr(int code, str *uri, add_string( p, FIELD_SEPARATOR_S ALGORITHM_FIELD_S CRLF, FIELD_SEPARATOR_LEN+ALGORITHM_FIELD_LEN+CRLF_LEN); - hdr.len = p - hdr.s; + _uac_auth_hdr.len = p - _uac_auth_hdr.s; - if (hdr.len!=len) + if (_uac_auth_hdr.len!=len) { LM_CRIT("BUG: bad buffer computation " - "(%d<>%d)\n",len,hdr.len); - pkg_free( hdr.s ); + "(%d<>%d)\n",len,_uac_auth_hdr.len); + pkg_free( _uac_auth_hdr.s ); goto error; } LM_DBG("hdr is <%.*s>\n", - hdr.len,hdr.s); + _uac_auth_hdr.len,_uac_auth_hdr.s); - return &hdr; + return &_uac_auth_hdr; error: return 0; }