sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Rename macro argument s_addr due to it already being defined

Browse Source 
Signed-off-by: Peter Eriksson <pen@lysator.liu.se>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Peter Eriksson 2020-02-27 09:59:32 +01:00 committed by Andrew Bartlett
parent 534809a0f0
commit b29e6480dc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tsocket/tsocket.h
View File

@ -996,16 +996,16 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
* @return 0 on success, -1 on error with errno set.
*/
int tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
const struct samba_sockaddr *s_addr,
const struct samba_sockaddr *xs_addr,
struct tsocket_address **t_addr);
#else
int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
const struct samba_sockaddr *s_addr,
const struct samba_sockaddr *xs_addr,
struct tsocket_address **t_addr,
const char *location);
#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr) \
_tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr, \
#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, xs_addr, t_addr) \
_tsocket_address_bsd_from_samba_sockaddr(mem_ctx, xs_addr, t_addr, \
__location__)
#endif

6
lib/tsocket/tsocket_bsd.c
View File

@ -282,13 +282,13 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
}
int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
const struct samba_sockaddr *s_addr,
const struct samba_sockaddr *xs_addr,
struct tsocket_address **t_addr,
const char *location)
{
return _tsocket_address_bsd_from_sockaddr(mem_ctx,
&s_addr->u.sa,
s_addr->sa_socklen,
&xs_addr->u.sa,
xs_addr->sa_socklen,
t_addr,
location);
}