Rename struct ${app}_config to plain cfg

All the structs are static and we need to reach into them many times.
Having a shorter name is more concise and results in less visual clutter.
It also avoids many overlong lines and we will be able to get rid of some
unfortunate line wrapping down the road.

Discussed with jsing

1 files changed, 22 insertions, 22 deletions

diff --git a/src/usr.bin/openssl/version.c b/src/usr.bin/openssl/version.c
index 038774ad0c..6ff1860ead 100644
--- a/src/usr.bin/openssl/version.c
+++ b/src/usr.bin/openssl/version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.c,v 1.10 2022/11/11 17:07:39 joshua Exp $ */
+/* $OpenBSD: version.c,v 1.11 2023/03/06 14:32:06 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -142,17 +142,17 @@ static struct {
         int options;
         int platform;
         int version;
-} version_config;
+} cfg;
 
 static int
 version_all_opts(void)
 {
-        version_config.cflags = 1;
-        version_config.date = 1;
-        version_config.dir= 1;
-        version_config.options = 1;
-        version_config.platform = 1;
-        version_config.version = 1;
+        cfg.cflags = 1;
+        cfg.date = 1;
+        cfg.dir= 1;
+        cfg.options = 1;
+        cfg.platform = 1;
+        cfg.version = 1;
 
         return (0);
 }
@@ -168,37 +168,37 @@ static const struct option version_options[] = {
                 .name = "b",
                 .desc = "Date the current version of OpenSSL was built",
                 .type = OPTION_FLAG,
-                .opt.flag = &version_config.date,
+                .opt.flag = &cfg.date,
         },
         {
                 .name = "d",
                 .desc = "OPENSSLDIR value",
                 .type = OPTION_FLAG,
-                .opt.flag = &version_config.dir,
+                .opt.flag = &cfg.dir,
         },
         {
                 .name = "f",
                 .desc = "Compilation flags",
                 .type = OPTION_FLAG,
-                .opt.flag = &version_config.cflags,
+                .opt.flag = &cfg.cflags,
         },
         {
                 .name = "o",
                 .desc = "Option information",
                 .type = OPTION_FLAG,
-                .opt.flag = &version_config.options,
+                .opt.flag = &cfg.options,
         },
         {
                 .name = "p",
                 .desc = "Platform settings",
                 .type = OPTION_FLAG,
-                .opt.flag = &version_config.platform,
+                .opt.flag = &cfg.platform,
         },
         {
                 .name = "v",
                 .desc = "Current OpenSSL version",
                 .type = OPTION_FLAG,
-                .opt.flag = &version_config.version,
+                .opt.flag = &cfg.version,
         },
         {NULL},
 };
@@ -218,7 +218,7 @@ version_main(int argc, char **argv)
                 exit(1);
         }
 
-        memset(&version_config, 0, sizeof(version_config));
+        memset(&cfg, 0, sizeof(cfg));
 
         if (options_parse(argc, argv, version_options, NULL, NULL) != 0) {
                 version_usage();
@@ -226,9 +226,9 @@ version_main(int argc, char **argv)
         }
 
         if (argc == 1)
-                version_config.version = 1;
+                cfg.version = 1;
 
-        if (version_config.version) {
+        if (cfg.version) {
                 if (SSLeay() == SSLEAY_VERSION_NUMBER) {
                         printf("%s\n", SSLeay_version(SSLEAY_VERSION));
                 } else {
@@ -237,11 +237,11 @@ version_main(int argc, char **argv)
                             SSLeay_version(SSLEAY_VERSION));
                 }
         }
-        if (version_config.date)
+        if (cfg.date)
                 printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
-        if (version_config.platform)
+        if (cfg.platform)
                 printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
-        if (version_config.options) {
+        if (cfg.options) {
                 printf("options:  ");
                 printf("%s ", BN_options());
 #ifndef OPENSSL_NO_RC4
@@ -258,9 +258,9 @@ version_main(int argc, char **argv)
 #endif
                 printf("\n");
         }
-        if (version_config.cflags)
+        if (cfg.cflags)
                 printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
-        if (version_config.dir)
+        if (cfg.dir)
                 printf("%s\n", SSLeay_version(SSLEAY_DIR));
 
         return (0);