X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/ea067773e7c51e90cd791dc3946834dd804fa844..6c3ccf07bc067c974783b2b46c3d7be13796cf41:/misc.h

diff --git a/misc.h b/misc.h
index 4aab2ca0..798d80fb 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.19 2004/12/06 11:41:03 dtucker Exp $	*/
+/*	$OpenBSD: misc.h,v 1.22 2005/04/09 04:32:54 djm Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,9 +20,11 @@ int	 set_nonblock(int);
 int	 unset_nonblock(int);
 void	 set_nodelay(int);
 int	 a2port(const char *);
+char	*hpdelim(char **);
 char	*cleanhostname(char *);
 char	*colon(char *);
 long	 convtime(const char *);
+char	*tilde_expand_filename(const char *, uid_t);
 
 struct passwd *pwcopy(struct passwd *);
 
@@ -34,10 +36,6 @@ struct arglist {
 };
 void	 addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
 
-/* tildexpand.c */
-
-char	*tilde_expand_filename(const char *, uid_t);
-
 /* readpass.c */
 
 #define RP_ECHO			0x0001
@@ -47,4 +45,4 @@ char	*tilde_expand_filename(const char *, uid_t);
 
 char	*read_passphrase(const char *, int);
 int	 ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
-int	 read_keyfile_line(FILE *, const char *, char *, size_t, int *);
+int	 read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);