Port: name clash on Solaris, rename sun to s_un

'sun' is a reserved keyword on Solaris

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index e2d0def8e842f2eb156d82178a71ca3be148f96c..bee133d8d9cbf8f32c70e8d849c4371ac6e7e1fc 100644 (file)
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -38,7 +38,7 @@
 LTTNG_HIDDEN
 int lttcomm_connect_unix_sock(const char *pathname)
 {
-       struct sockaddr_un sun;
+       struct sockaddr_un s_un;
        int fd, ret, closeret;
 
        fd = socket(PF_UNIX, SOCK_STREAM, 0);
@@ -48,12 +48,12 @@ int lttcomm_connect_unix_sock(const char *pathname)
                goto error;
        }
 
-       memset(&sun, 0, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, pathname, sizeof(sun.sun_path));
-       sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+       memset(&s_un, 0, sizeof(s_un));
+       s_un.sun_family = AF_UNIX;
+       strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path));
+       s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0';
 
-       ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun));
+       ret = connect(fd, (struct sockaddr *) &s_un, sizeof(s_un));
        if (ret < 0) {
                /*
                 * Don't print message on connect error, because connect is used in
@@ -81,11 +81,11 @@ LTTNG_HIDDEN
 int lttcomm_accept_unix_sock(int sock)
 {
        int new_fd;
-       struct sockaddr_un sun;
+       struct sockaddr_un s_un;
        socklen_t len = 0;
 
        /* Blocking call */
-       new_fd = accept(sock, (struct sockaddr *) &sun, &len);
+       new_fd = accept(sock, (struct sockaddr *) &s_un, &len);
        if (new_fd < 0) {
                PERROR("accept");
        }
@@ -110,7 +110,7 @@ int lttcomm_create_anon_unix_socketpair(int *fds)
 LTTNG_HIDDEN
 int lttcomm_create_unix_sock(const char *pathname)
 {
-       struct sockaddr_un sun;
+       struct sockaddr_un s_un;
        int fd;
        int ret = -1;
 
@@ -120,14 +120,14 @@ int lttcomm_create_unix_sock(const char *pathname)
                goto error;
        }
 
-       memset(&sun, 0, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, pathname, sizeof(sun.sun_path));
-       sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+       memset(&s_un, 0, sizeof(s_un));
+       s_un.sun_family = AF_UNIX;
+       strncpy(s_un.sun_path, pathname, sizeof(s_un.sun_path));
+       s_un.sun_path[sizeof(s_un.sun_path) - 1] = '\0';
 
        /* Unlink the old file if present */
        (void) unlink(pathname);
-       ret = bind(fd, (struct sockaddr *) &sun, sizeof(sun));
+       ret = bind(fd, (struct sockaddr *) &s_un, sizeof(s_un));
        if (ret < 0) {
                PERROR("bind");
                goto error;