xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

csdial: avoid useless werrstr() call on success (thanks mischief)

Browse source
This commit is contained in:
cinap_lenrek 2014-02-25 20:14:08 +01:00
parent c4fec93ab9
commit b4d13efc1e
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/src/libc/9sys/dial.c
View file

@ -99,29 +99,30 @@ csdial(DS *ds)
* loop through each address from the connection server till
* we get one that works.
*/
*besterr = 0;
rv = -1;
*err = 0;
*besterr = 0;
seek(fd, 0, 0);
while((n = read(fd, buf, sizeof(buf) - 1)) > 0){
buf[n] = 0;
p = strchr(buf, ' ');
if(p == 0)
if(p == nil)
continue;
*p++ = 0;
rv = call(buf, p, ds);
if(rv >= 0)
break;
err[0] = '\0';
*err = 0;
errstr(err, sizeof err);
if(strstr(err, "does not exist") == 0)
strcpy(besterr, err);
}
close(fd);
if(rv < 0 && *besterr)
werrstr("%s", besterr);
else
werrstr("%s", err);
/* restore errstr if any */
if(rv < 0 && *err)
errstr(*besterr ? besterr : err, sizeof err);
return rv;
}