diff options
author | Kevin Steves <stevesk@pobox.com> | 2001-03-05 19:46:37 +0000 |
---|---|---|
committer | Kevin Steves <stevesk@pobox.com> | 2001-03-05 19:46:37 +0000 |
commit | 935aa24bf41c0b77b79e6f010d482c9093a4b6d8 (patch) | |
tree | 09b1b9890cd9460238de80acdb5351a05e306c35 | |
parent | dd97de766cb44c48005321751577e60649d9a953 (diff) | |
download | openssh-git-935aa24bf41c0b77b79e6f010d482c9093a4b6d8.tar.gz |
- (stevesk) OpenBSD sync:
- deraadt@cvs.openbsd.org 2001/03/05 08:37:27
[ssh-keyscan.c]
skip inlining, why bother
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-keyscan.c | 20 |
2 files changed, 15 insertions, 11 deletions
@@ -171,6 +171,10 @@ - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy() - (bal) Fix up logging since it changed. removed log-*.c - (djm) Fix up LOG_AUTHPRIV for systems that have it + - (stevesk) OpenBSD sync: + - deraadt@cvs.openbsd.org 2001/03/05 08:37:27 + [ssh-keyscan.c] + skip inlining, why bother 20010304 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. @@ -4363,4 +4367,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.906 2001/03/05 10:23:31 djm Exp $ +$Id: ChangeLog,v 1.907 2001/03/05 19:46:37 stevesk Exp $ diff --git a/ssh-keyscan.c b/ssh-keyscan.c index ab46e9ed..ab7f33d0 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -8,7 +8,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.19 2001/03/03 21:19:41 millert Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.20 2001/03/05 15:37:27 deraadt Exp $"); #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #include <sys/queue.h> @@ -91,7 +91,7 @@ typedef struct { void (*errfun) (const char *,...); } Linebuf; -static __inline__ Linebuf * +Linebuf * Linebuf_alloc(const char *filename, void (*errfun) (const char *,...)) { Linebuf *lb; @@ -125,7 +125,7 @@ Linebuf_alloc(const char *filename, void (*errfun) (const char *,...)) return (lb); } -static __inline__ void +void Linebuf_free(Linebuf * lb) { fclose(lb->stream); @@ -133,7 +133,7 @@ Linebuf_free(Linebuf * lb) xfree(lb); } -static __inline__ void +void Linebuf_restart(Linebuf * lb) { clearerr(lb->stream); @@ -141,13 +141,13 @@ Linebuf_restart(Linebuf * lb) lb->lineno = 0; } -static __inline__ int +int Linebuf_lineno(Linebuf * lb) { return (lb->lineno); } -static __inline__ char * +char * Linebuf_getline(Linebuf * lb) { int n = 0; @@ -184,7 +184,7 @@ Linebuf_getline(Linebuf * lb) } } -static int +int fdlim_get(int hard) { #if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) @@ -203,7 +203,7 @@ fdlim_get(int hard) #endif } -static int +int fdlim_set(int lim) { #if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) @@ -228,7 +228,7 @@ fdlim_set(int lim) * separators. This is the same as the 4.4BSD strsep, but different from the * one in the GNU libc. */ -static __inline__ char * +char * xstrsep(char **str, const char *delim) { char *s, *e; @@ -574,7 +574,7 @@ nexthost(int argc, char **argv) } } -static void +void usage(void) { fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname); |