Skip to content
Snippets Groups Projects
Commit 0823a2da authored by Laszlo Ersek's avatar Laszlo Ersek
Browse files

ocaml: rename "sa_u" to "saddr_u"

<signal.h> in POSIX reserves the "sa_" prefix:

https://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_02



Let's use "saddr_" instead.

Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-Id: <20230215141158.2426855-5-lersek@redhat.com>
Reviewed-by: Eric Blake's avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarRichard W.M. Jones <rjones@redhat.com>
parent 86c8056d
No related branches found
No related tags found
No related merge requests found
Pipeline #785532123 failed
......@@ -140,19 +140,19 @@ nbd_internal_unix_sockaddr_to_sa (value sockaddrv,
socklen_t *len)
{
CAMLparam1 (sockaddrv);
union sock_addr_union sa_u;
union sock_addr_union saddr_u;
socklen_param_type sl; /* this is really an int or socklen_t */
memset (ss, 0, sizeof *ss);
#ifdef HAVE_CAML_UNIX_GET_SOCKADDR
caml_unix_get_sockaddr (sockaddrv, &sa_u, &sl);
caml_unix_get_sockaddr (sockaddrv, &saddr_u, &sl);
#else
/* OCaml <= 4.14 exports this unnamespaced symbol. */
get_sockaddr (sockaddrv, &sa_u, &sl);
get_sockaddr (sockaddrv, &saddr_u, &sl);
#endif
assert (sl <= sizeof *ss);
memcpy (ss, &sa_u, sl);
memcpy (ss, &saddr_u, sl);
*len = sl;
CAMLreturn0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment