From: tb <tb@openbsd.org>
Date: Wed, 20 Mar 2024 22:08:22 +0000 (+0000)
Subject: pmod -> mod in CONF_IMODULE
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=482e134a3f5cae0935b5e42467654950372782e5;p=openbsd

pmod -> mod in CONF_IMODULE

Hungarian notation occasionally helps, but only if it is done consistently.
Steve and consistency... cf e.g the last few commits. Accordingly,
Hensonian Hungarian notation is a complete disaster. Start cleaning this
mess up.
---

diff --git a/lib/libcrypto/conf/conf_mod.c b/lib/libcrypto/conf/conf_mod.c
index 4e4dd7d466a..887d9c73414 100644
--- a/lib/libcrypto/conf/conf_mod.c
+++ b/lib/libcrypto/conf/conf_mod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_mod.c,v 1.34 2024/03/20 21:53:57 tb Exp $ */
+/* $OpenBSD: conf_mod.c,v 1.35 2024/03/20 22:08:22 tb Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -86,7 +86,7 @@ struct conf_module_st {
  */
 
 struct conf_imodule_st {
-	CONF_MODULE *pmod;
+	CONF_MODULE *mod;
 	char *name;
 	char *value;
 	unsigned long flags;
@@ -288,7 +288,7 @@ module_init(CONF_MODULE *pmod, char *name, char *value, const CONF *cnf)
 	if (!imod)
 		goto err;
 
-	imod->pmod = pmod;
+	imod->mod = pmod;
 	imod->name = name ? strdup(name) : NULL;
 	imod->value = value ? strdup(value) : NULL;
 	imod->usr_data = NULL;
@@ -407,9 +407,9 @@ CONF_modules_finish(void)
 static void
 module_finish(CONF_IMODULE *imod)
 {
-	if (imod->pmod->finish)
-		imod->pmod->finish(imod);
-	imod->pmod->links--;
+	if (imod->mod->finish)
+		imod->mod->finish(imod);
+	imod->mod->links--;
 
 	imodule_free(imod);
 }
@@ -458,7 +458,7 @@ CONF_imodule_set_usr_data(CONF_IMODULE *imod, void *usr_data)
 CONF_MODULE *
 CONF_imodule_get_module(const CONF_IMODULE *imod)
 {
-	return imod->pmod;
+	return imod->mod;
 }
 
 unsigned long