diff options
| author | Peter Eriksson <pen@lysator.liu.se> | 2020-02-27 09:59:32 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-02-28 03:08:45 +0000 |
| commit | b29e6480dc3b266ca1f311f675f67670f5635a21 (patch) | |
| tree | 84df6e85fa78367f7ab79cb35caba08766f200dd | |
| parent | 534809a0f09775390e89fa1cbfae3a1d0fafecb8 (diff) | |
| download | samba-b29e6480dc3b266ca1f311f675f67670f5635a21.tar.gz | |
Rename macro argument s_addr due to it already being defined
Signed-off-by: Peter Eriksson <pen@lysator.liu.se>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/tsocket/tsocket.h | 8 | ||||
| -rw-r--r-- | lib/tsocket/tsocket_bsd.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h index aad82795691..2f1c7981346 100644 --- a/lib/tsocket/tsocket.h +++ b/lib/tsocket/tsocket.h @@ -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 diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index 6ad40bd0ada..10ea1347149 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -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); } |