diff options
| -rw-r--r-- | client.c | 8 | ||||
| -rw-r--r-- | server.c | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: client.c,v 1.16 2007-10-23 09:36:19 nicm Exp $ */ +/* $Id: client.c,v 1.17 2007-10-23 10:25:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -42,7 +42,7 @@ client_init(char *path, struct client_ctx *cctx, int start_server) struct stat sb; struct msg_identify_data data; struct winsize ws; - size_t sz; + size_t size; int mode; u_int retries; @@ -71,8 +71,8 @@ retry: memset(&sa, 0, sizeof sa); sa.sun_family = AF_UNIX; - sz = strlcpy(sa.sun_path, path, sizeof sa.sun_path); - if (sz >= sizeof sa.sun_path) { + size = strlcpy(sa.sun_path, path, sizeof sa.sun_path); + if (size >= sizeof sa.sun_path) { log_warnx("%s: %s", path, strerror(ENAMETOOLONG)); return (-1); } @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.30 2007-10-23 09:36:19 nicm Exp $ */ +/* $Id: server.c,v 1.31 2007-10-23 10:25:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -58,7 +58,7 @@ int server_start(char *path) { struct sockaddr_un sa; - size_t sz; + size_t size; pid_t pid; mode_t mask; int n, fd, mode; @@ -83,8 +83,8 @@ server_start(char *path) memset(&sa, 0, sizeof sa); sa.sun_family = AF_UNIX; - sz = strlcpy(sa.sun_path, path, sizeof sa.sun_path); - if (sz >= sizeof sa.sun_path) { + size = strlcpy(sa.sun_path, path, sizeof sa.sun_path); + if (size >= sizeof sa.sun_path) { errno = ENAMETOOLONG; fatal("socket failed"); } |