summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2006-08-18 10:27:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2006-08-18 10:27:17 +0000
commit99168fcea7ffa2dd8b341e95f2023a72e1d07a45 (patch)
tree4ec9d39be81c06d283ac88e4e21742c77f0a09b8
parentbcadf760f778448cbabd449e141fcf498789d550 (diff)
reorder so prototypes are sorted by the files they refer to; no
binary change
-rw-r--r--usr.bin/ssh/misc.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h
index 072470badd5..f175b4426e5 100644
--- a/usr.bin/ssh/misc.h
+++ b/usr.bin/ssh/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: misc.h,v 1.36 2006/08/18 10:27:16 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -48,17 +48,6 @@ void replacearg(arglist *, u_int, char *, ...)
__attribute__((format(printf, 3, 4)));
void freeargs(arglist *);
-/* readpass.c */
-
-#define RP_ECHO 0x0001
-#define RP_ALLOW_STDIN 0x0002
-#define RP_ALLOW_EOF 0x0004
-#define RP_USE_ASKPASS 0x0008
-
-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, u_long *);
-
int tun_open(int, int);
/* Common definitions for ssh tunnel device forwarding */
@@ -86,5 +75,16 @@ void put_u32(void *, u_int32_t)
void put_u16(void *, u_int16_t)
__attribute__((__bounded__( __minbytes__, 1, 2)));
-#endif /* _MISC_H */
+/* readpass.c */
+
+#define RP_ECHO 0x0001
+#define RP_ALLOW_STDIN 0x0002
+#define RP_ALLOW_EOF 0x0004
+#define RP_USE_ASKPASS 0x0008
+
+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, u_long *);
+
+#endif /* _MISC_H */