summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 13f9673b5..60341c9e9 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -329,9 +329,9 @@ conalloc(char *iname, char *oname)
329 } while ((s = tcpconnect(name)) < 0); 329 } while ((s = tcpconnect(name)) < 0);
330 330
331 if (s >= maxfd) 331 if (s >= maxfd)
332 fatal("conalloc: fdno %d too high\n", s); 332 fatal("conalloc: fdno %d too high", s);
333 if (fdcon[s].c_status) 333 if (fdcon[s].c_status)
334 fatal("conalloc: attempt to reuse fdno %d\n", s); 334 fatal("conalloc: attempt to reuse fdno %d", s);
335 335
336 fdcon[s].c_fd = s; 336 fdcon[s].c_fd = s;
337 fdcon[s].c_status = CS_CON; 337 fdcon[s].c_status = CS_CON;
@@ -355,7 +355,7 @@ confree(int s)
355{ 355{
356 close(s); 356 close(s);
357 if (s >= maxfd || fdcon[s].c_status == CS_UNUSED) 357 if (s >= maxfd || fdcon[s].c_status == CS_UNUSED)
358 fatal("confree: attempt to free bad fdno %d\n", s); 358 fatal("confree: attempt to free bad fdno %d", s);
359 free(fdcon[s].c_namebase); 359 free(fdcon[s].c_namebase);
360 free(fdcon[s].c_output_name); 360 free(fdcon[s].c_output_name);
361 if (fdcon[s].c_status == CS_KEYS) 361 if (fdcon[s].c_status == CS_KEYS)
@@ -455,7 +455,7 @@ conread(int s)
455 return; 455 return;
456 break; 456 break;
457 default: 457 default:
458 fatal("conread: invalid status %d\n", c->c_status); 458 fatal("conread: invalid status %d", c->c_status);
459 break; 459 break;
460 } 460 }
461 461
@@ -548,7 +548,7 @@ nexthost(int argc, char **argv)
548static void 548static void
549usage(void) 549usage(void)
550{ 550{
551 fatal("usage: %s [-t timeout] { [--] host | -f file } ...\n", __progname); 551 fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname);
552 return; 552 return;
553} 553}
554 554
@@ -580,11 +580,11 @@ main(int argc, char **argv)
580 580
581 maxfd = fdlim_get(1); 581 maxfd = fdlim_get(1);
582 if (maxfd < 0) 582 if (maxfd < 0)
583 fatal("%s: fdlim_get: bad value\n", __progname); 583 fatal("%s: fdlim_get: bad value", __progname);
584 if (maxfd > MAXMAXFD) 584 if (maxfd > MAXMAXFD)
585 maxfd = MAXMAXFD; 585 maxfd = MAXMAXFD;
586 if (maxcon <= 0) 586 if (maxcon <= 0)
587 fatal("%s: not enough file descriptors\n", __progname); 587 fatal("%s: not enough file descriptors", __progname);
588 if (maxfd > fdlim_get(0)) 588 if (maxfd > fdlim_get(0))
589 fdlim_set(maxfd); 589 fdlim_set(maxfd);
590 fdcon = xmalloc(maxfd * sizeof(con)); 590 fdcon = xmalloc(maxfd * sizeof(con));