Tweak a couple of variable names.

This commit is contained in:
Nicholas Marriott 2007-10-23 10:25:03 +00:00
parent 14fdb49c19
commit 64713e0511
2 changed files with 8 additions and 8 deletions

View File

@ -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> * 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 stat sb;
struct msg_identify_data data; struct msg_identify_data data;
struct winsize ws; struct winsize ws;
size_t sz; size_t size;
int mode; int mode;
u_int retries; u_int retries;
@ -71,8 +71,8 @@ retry:
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
sa.sun_family = AF_UNIX; sa.sun_family = AF_UNIX;
sz = strlcpy(sa.sun_path, path, sizeof sa.sun_path); size = strlcpy(sa.sun_path, path, sizeof sa.sun_path);
if (sz >= sizeof sa.sun_path) { if (size >= sizeof sa.sun_path) {
log_warnx("%s: %s", path, strerror(ENAMETOOLONG)); log_warnx("%s: %s", path, strerror(ENAMETOOLONG));
return (-1); return (-1);
} }

View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -58,7 +58,7 @@ int
server_start(char *path) server_start(char *path)
{ {
struct sockaddr_un sa; struct sockaddr_un sa;
size_t sz; size_t size;
pid_t pid; pid_t pid;
mode_t mask; mode_t mask;
int n, fd, mode; int n, fd, mode;
@ -83,8 +83,8 @@ server_start(char *path)
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
sa.sun_family = AF_UNIX; sa.sun_family = AF_UNIX;
sz = strlcpy(sa.sun_path, path, sizeof sa.sun_path); size = strlcpy(sa.sun_path, path, sizeof sa.sun_path);
if (sz >= sizeof sa.sun_path) { if (size >= sizeof sa.sun_path) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
fatal("socket failed"); fatal("socket failed");
} }