Revert "lib/tsocket: sa_socklen is a macro on irix, so better use sasocklen"

This reverts commit 3d4fb698660381e650d7caeb5b7cff12847c0fb8.

This was wrong... The problem was in the caller, sa_len is a macro on irix

metze

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index fb76fe5d8f..3dd96664ea 100644
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -843,7 +843,7 @@ struct sockaddr;
  *
  * @param[in]  sa       The sockaddr structure to convert.
  *
- * @param[in]  sasocklen   The lenth of the sockaddr sturucte.
+ * @param[in]  sa_socklen   The lenth of the sockaddr sturucte.
  *
  * @param[out] addr     The tsocket pointer to allocate and fill.
  *
@@ -851,17 +851,17 @@ struct sockaddr;
  */
 int tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
 				      struct sockaddr *sa,
-				      size_t sasocklen,
+				      size_t sa_socklen,
 				      struct tsocket_address **addr);
 #else
 int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
 				       struct sockaddr *sa,
-				       size_t sasocklen,
+				       size_t sa_socklen,
 				       struct tsocket_address **_addr,
 				       const char *location);
 
-#define tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sasocklen, _addr) \
-	_tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sasocklen, _addr, \
+#define tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sa_socklen, _addr) \
+	_tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sa_socklen, _addr, \
 					   __location__)
 #endif
 
@@ -872,10 +872,10 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
  *
  * @param[in]  sa       The bsd sockaddr structure to fill out.
  *
- * @param[in]  sasocklen   The length of the  bsd sockaddr structure to fill out.
+ * @param[in]  sa_socklen   The length of the  bsd sockaddr structure to fill out.
  *
  * @return              The actual size of the sockaddr structure, -1 on error
- *                      with errno set. The size could differ from sasocklen.
+ *                      with errno set. The size could differ from sa_socklen.
  *
  * @code
  *   ssize_t socklen;
@@ -891,7 +891,7 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
  */
 ssize_t tsocket_address_bsd_sockaddr(const struct tsocket_address *addr,
 				     struct sockaddr *sa,
-				     size_t sasocklen);
+				     size_t sa_socklen);
 
 #ifdef DOXYGEN
 /**