From 70842b5acaff666c8cfe4e0a37523e0a4122681a Mon Sep 17 00:00:00 2001 From: jsg Date: Sun, 11 Jun 2023 13:02:10 +0000 Subject: [PATCH] remove unused args_st struct ok tb@ --- usr.bin/openssl/apps.h | 7 +------ usr.bin/openssl/openssl.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/usr.bin/openssl/apps.h b/usr.bin/openssl/apps.h index addc6b031f5..8556dc14bb9 100644 --- a/usr.bin/openssl/apps.h +++ b/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.33 2023/06/11 12:35:00 jsg Exp $ */ +/* $OpenBSD: apps.h,v 1.34 2023/06/11 13:02:10 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -133,11 +133,6 @@ extern CONF *config; extern char *default_config_file; extern BIO *bio_err; -typedef struct args_st { - char **data; - int count; -} ARGS; - #define PW_MIN_LENGTH 4 typedef struct pw_cb_data { const void *password; diff --git a/usr.bin/openssl/openssl.c b/usr.bin/openssl/openssl.c index 9e2ba547558..e5ff31a2c5a 100644 --- a/usr.bin/openssl/openssl.c +++ b/usr.bin/openssl/openssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openssl.c,v 1.34 2023/06/11 05:45:20 tb Exp $ */ +/* $OpenBSD: openssl.c,v 1.35 2023/06/11 13:02:10 jsg Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -378,16 +378,12 @@ openssl_shutdown(void) int main(int argc, char **argv) { - ARGS arg; char *to_free = NULL; int i, ret = 0; char *p; LHASH_OF(FUNCTION) * prog = NULL; long errline; - arg.data = NULL; - arg.count = 0; - if (pledge("stdio cpath wpath rpath inet dns proc flock tty", NULL) == -1) { fprintf(stderr, "openssl: pledge: %s\n", strerror(errno)); exit(1); @@ -467,7 +463,6 @@ main(int argc, char **argv) } if (prog != NULL) lh_FUNCTION_free(prog); - free(arg.data); openssl_shutdown(); -- 2.20.1