Remove useless headers; ok deraadt@

5 files changed, 13 insertions, 55 deletions

diff --git a/usr.bin/ssh/sftp-glob.c b/usr.bin/ssh/sftp-glob.c
index cda3b54bf7f..119094c0c1c 100644
--- a/usr.bin/ssh/sftp-glob.c
+++ b/usr.bin/ssh/sftp-glob.c
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-glob.c,v 1.14 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp-glob.c,v 1.15 2004/02/17 07:17:29 djm Exp $");
 
 #include <glob.h>
 
@@ -27,7 +27,9 @@ RCSID("$OpenBSD: sftp-glob.c,v 1.14 2004/02/17 05:39:51 djm Exp $");
 #include "sftp.h"
 #include "sftp-common.h"
 #include "sftp-client.h"
-#include "sftp-glob.h"
+
+int remote_glob(struct sftp_conn *, const char *, int,
+    int (*)(const char *, int), glob_t *);
 
 struct SFTP_OPENDIR {
 	SFTP_DIRENT **dir;
diff --git a/usr.bin/ssh/sftp-glob.h b/usr.bin/ssh/sftp-glob.h
deleted file mode 100644
index 46b3520244c..00000000000
--- a/usr.bin/ssh/sftp-glob.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $OpenBSD: sftp-glob.h,v 1.9 2004/02/17 05:39:51 djm Exp $ */
-
-/*
- * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Remote sftp filename globbing */
-
-#ifndef _SFTP_GLOB_H
-#define _SFTP_GLOB_H
-
-#include "sftp-client.h"
-
-int remote_glob(struct sftp_conn *, const char *, int,
-    int (*)(const char *, int), glob_t *);
-
-#endif
diff --git a/usr.bin/ssh/sftp-int.c b/usr.bin/ssh/sftp-int.c
index e683326371d..f9f868b9716 100644
--- a/usr.bin/ssh/sftp-int.c
+++ b/usr.bin/ssh/sftp-int.c
@@ -17,7 +17,7 @@
 /* XXX: recursive operations */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.68 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.69 2004/02/17 07:17:29 djm Exp $");
 
 #include <glob.h>
 
@@ -28,9 +28,10 @@ RCSID("$OpenBSD: sftp-int.c,v 1.68 2004/02/17 05:39:51 djm Exp $");
 
 #include "sftp.h"
 #include "sftp-common.h"
-#include "sftp-glob.h"
 #include "sftp-client.h"
-#include "sftp-int.h"
+
+int remote_glob(struct sftp_conn *, const char *, int,
+    int (*)(const char *, int), glob_t *); /* sftp-glob.c */
 
 /* File to read commands from */
 extern FILE *infile;
@@ -120,6 +121,8 @@ static const struct CMD cmds[] = {
 	{ NULL,			-1}
 };
 
+int interactive_loop(int fd_in, int fd_out, char *file1, char *file2);
+
 static void
 help(void)
 {
diff --git a/usr.bin/ssh/sftp-int.h b/usr.bin/ssh/sftp-int.h
deleted file mode 100644
index 031eb7aa782..00000000000
--- a/usr.bin/ssh/sftp-int.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $OpenBSD: sftp-int.h,v 1.7 2004/02/17 05:39:51 djm Exp $ */
-
-/*
- * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-int	 interactive_loop(int, int, char *, char *);
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index 3def15c726a..28d9655e077 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.42 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.43 2004/02/17 07:17:29 djm Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -27,7 +27,8 @@ RCSID("$OpenBSD: sftp.c,v 1.42 2004/02/17 05:39:51 djm Exp $");
 #include "sftp.h"
 #include "sftp-common.h"
 #include "sftp-client.h"
-#include "sftp-int.h"
+
+int interactive_loop(int, int, char *, char *); /* sftp-int.c */
 
 FILE* infile;
 int batchmode = 0;