* First cut at Solaris fixes. There may still be some *printf("%s", NULL)

[citadel.git] / citadel / ipc_c_tcp.c

diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index 009c69722c977e305fe7ed9376d8474e38df25a2..a56adb2b4a3af962f878d09f353b0cd3c2d37b45 100644 (file)
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -128,12 +128,12 @@ int connectsock(char *host, char *service, char *protocol)
 
 int uds_connectsock(char *sockpath)
 {
-       struct sockaddr_un sun;
+       struct sockaddr_un addr;
        int s;
 
-       memset(&sun, 0, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, sockpath, sizeof sun.sun_path);
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
@@ -142,7 +142,7 @@ int uds_connectsock(char *sockpath)
                logoff(3);
        }
 
-       if (connect(s, (struct sockaddr *) &sun, sizeof(sun)) < 0) {
+       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
                fprintf(stderr, "can't connect: %s\n",
                        strerror(errno));
                logoff(3);