Summarize the 4 same name functions and move it to apps.c

ok tb@ jsing@

1 files changed, 2 insertions, 14 deletions

diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c
index f2dad6dfef..917a7a15e5 100644
--- a/src/usr.bin/openssl/ec.c
+++ b/src/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */
+/* $OpenBSD: ec.c,v 1.12 2019/02/09 06:27:37 inoguchi Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -60,7 +60,6 @@
 
 #ifndef OPENSSL_NO_EC
 
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -240,17 +239,6 @@ static struct option ec_options[] = {
 };
 
 static void
-show_ciphers(const OBJ_NAME *name, void *arg)
-{
-        static int n;
-
-        if (!islower((unsigned char)*name->name))
-                return;
-
-        fprintf(stderr, " -%-24s%s", name->name, (++n % 3 ? "" : "\n"));
-}
-
-static void
 ec_usage(void)
 {
         fprintf(stderr,
@@ -263,7 +251,7 @@ ec_usage(void)
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_ciphers, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
         fprintf(stderr, "\n");
 }