summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorericj <>2001-06-26 19:31:10 +0000
committerericj <>2001-06-26 19:31:10 +0000
commitaf8f11035baccd4cb6d2dc3cecbe82f7b7e3448c (patch)
tree23db4b0c98a669eb32425943bc4100f1f58c60b6 /src
parent1ebcbdecf4030fc22bbaac8a276514ecbb5675a5 (diff)
downloadopenbsd-af8f11035baccd4cb6d2dc3cecbe82f7b7e3448c.tar.gz
openbsd-af8f11035baccd4cb6d2dc3cecbe82f7b7e3448c.tar.bz2
openbsd-af8f11035baccd4cb6d2dc3cecbe82f7b7e3448c.zip
rename variable, as not to conflict
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/nc/netcat.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index 5497eaba3a..980f335f24 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: netcat.c,v 1.22 2001/06/26 07:38:05 jasoni Exp $ */ 1/* $OpenBSD: netcat.c,v 1.23 2001/06/26 19:31:10 ericj Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> 3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
4 * 4 *
@@ -184,20 +184,20 @@ main(argc, argv)
184 * functions to talk to the caller. 184 * functions to talk to the caller.
185 */ 185 */
186 if (uflag) { 186 if (uflag) {
187 int ret; 187 int rv;
188 char buf[1024]; 188 char buf[1024];
189 char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; 189 char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
190 struct sockaddr_storage z; 190 struct sockaddr_storage z;
191 191
192 len = sizeof(z); 192 len = sizeof(z);
193 ret = recvfrom(s, buf, sizeof(buf), MSG_PEEK, 193 rv = recvfrom(s, buf, sizeof(buf), MSG_PEEK,
194 (struct sockaddr *)&z, &len); 194 (struct sockaddr *)&z, &len);
195 if (ret < 0) 195 if (rv < 0)
196 errx(1, "%s", strerror(errno)); 196 errx(1, "%s", strerror(errno));
197 197
198 ret = connect(s, (struct sockaddr *)&z, 198 rv = connect(s, (struct sockaddr *)&z,
199 len); 199 len);
200 if (ret < 0) 200 if (rv < 0)
201 errx(1, "%s", strerror(errno)); 201 errx(1, "%s", strerror(errno));
202 202
203 connfd = s; 203 connfd = s;