From 7a09aa52502e5c4598eda224db8dd8e132773449 Mon Sep 17 00:00:00 2001 From: inoguchi <> Date: Sat, 9 Feb 2019 06:27:37 +0000 Subject: Summarize the 4 same name functions and move it to apps.c ok tb@ jsing@ --- src/usr.bin/openssl/enc.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/usr.bin/openssl/enc.c') diff --git a/src/usr.bin/openssl/enc.c b/src/usr.bin/openssl/enc.c index 7daeafe9d7..863a048c12 100644 --- a/src/usr.bin/openssl/enc.c +++ b/src/usr.bin/openssl/enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc.c,v 1.16 2019/01/18 22:47:34 naddy Exp $ */ +/* $OpenBSD: enc.c,v 1.17 2019/02/09 06:27:37 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include #include #include #include @@ -304,17 +303,6 @@ static struct option enc_options[] = { { NULL }, }; -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 enc_usage(void) { @@ -328,7 +316,7 @@ enc_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"); } -- cgit v1.2.3-55-g6feb