Remove all duplicate prototypes for *_main functions (these are already

provided by progs.h). Also, move the FUNCTION type (and flags) into
openssl.c since that is the only place of use. Lastly, remove pointless
'extern' from the prototypes and use char **argv instead of char *argv[]
(the former is used elsewhere).

ok deraadt@ doug@

1 files changed, 1 insertions, 3 deletions

diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index aa803e8baa..dcda13f46c 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.15 2015/08/11 05:01:03 landry Exp $ */
+/* $OpenBSD: s_client.c,v 1.16 2015/08/22 16:36:05 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -321,8 +321,6 @@ enum {
         PROTO_XMPP
 };
 
-int s_client_main(int, char **);
-
 int
 s_client_main(int argc, char **argv)
 {