From e9856294408c76f374547d9e74d4292f1b0c1163 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 8 Aug 2009 21:18:23 +0000 Subject: [PATCH] Tidy function a little by using a temporary variable. --- client.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/client.c b/client.c index cb2207dd..829b3d3c 100644 --- a/client.c +++ b/client.c @@ -43,7 +43,7 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags) struct msg_identify_data data; struct winsize ws; size_t size; - int mode; + int fd, mode; char *name, *term; char rpathbuf[MAXPATHLEN]; @@ -53,7 +53,7 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags) if (lstat(path, &sb) != 0) { if (cmdflags & CMD_STARTSERVER && errno == ENOENT) { - if ((cctx->srv_fd = server_start(path)) == -1) + if ((fd = server_start(path)) == -1) goto start_failed; goto server_started; } @@ -72,15 +72,14 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags) goto not_found; } - if ((cctx->srv_fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) + if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) fatal("socket"); - if (connect( - cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { + if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { if (errno == ECONNREFUSED) { if (unlink(path) != 0 || !(cmdflags & CMD_STARTSERVER)) goto not_found; - if ((cctx->srv_fd = server_start(path)) == -1) + if ((fd = server_start(path)) == -1) goto start_failed; goto server_started; } @@ -88,10 +87,11 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags) } server_started: - if ((mode = fcntl(cctx->srv_fd, F_GETFL)) == -1) + if ((mode = fcntl(fd, F_GETFL)) == -1) fatal("fcntl failed"); - if (fcntl(cctx->srv_fd, F_SETFL, mode|O_NONBLOCK) == -1) + if (fcntl(fd, F_SETFL, mode|O_NONBLOCK) == -1) fatal("fcntl failed"); + cctx->srv_fd = fd; cctx->srv_in = buffer_create(BUFSIZ); cctx->srv_out = buffer_create(BUFSIZ);