From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 8 Nov 2021 19:56:30 +0000 (-0500)
Subject: don't bother using "rlm_" prefixes everywhere.  They're not needed
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3640acdb31c6285247be60b7b56176957e920fc6;p=thirdparty%2Ffreeradius-server.git

don't bother using "rlm_" prefixes everywhere.  They're not needed

use "foo - bar" for names, as that's being used elsewhere, too

and the output looks cleaner.
---

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index 23ff48213e4..87d0815a23d 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -22,7 +22,7 @@
  * @copyright 2014 The FreeRADIUS server project
  */
 
-#define LOG_PREFIX "rlm_cache_memcached"
+#define LOG_PREFIX "cache - memcached"
 
 #include <libmemcached/memcached.h>
 
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index 1b03e1529dd..9edc7a586bf 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "rlm_cache_redis"
+#define LOG_PREFIX "cache - redis"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_couchbase/couchbase.c b/src/modules/rlm_couchbase/couchbase.c
index b33f43ba079..801c3652c88 100644
--- a/src/modules/rlm_couchbase/couchbase.c
+++ b/src/modules/rlm_couchbase/couchbase.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase"
+#define LOG_PREFIX "couchbase"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/json/base.h>
diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index b1a16e0032a..f05033b0744 100644
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase"
+#define LOG_PREFIX "couchbase"
 
 #include <freeradius-devel/json/base.h>
 #include <freeradius-devel/server/base.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 1982ffdc166..aa6482c3f28 100644
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_gtc"
+#define LOG_PREFIX "eap - gtc"
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
index c0b30e57e38..f88984135a9 100644
--- a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
@@ -36,7 +36,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_md5"
+#define LOG_PREFIX "eap - md5"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index 8c075a72c70..c396e249521 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -22,7 +22,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_peap"
+#define LOG_PREFIX "eap - peap"
 
 #include <freeradius-devel/eap/tls.h>
 #include "eap_peap.h"
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index 253ff664fcd..65093a2f125 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -33,7 +33,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_pwd"
+#define LOG_PREFIX "eap - pwd"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 1b6874631d3..054365532d9 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_tls"
+#define LOG_PREFIX "eap - tls"
 
 #ifdef HAVE_OPENSSL_RAND_H
 #  include <openssl/rand.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index 37697d839af..83d3e3877dd 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -26,7 +26,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_ttls"
+#define LOG_PREFIX "eap - ttls"
 
 #include <freeradius-devel/eap/tls.h>
 #include "eap_ttls.h"
diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index 52b561a88f0..258ddfd0cb5 100644
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_passwd"
+#define LOG_PREFIX "passwd"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 3c016a6b9d9..d445858ee83 100644
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_perl"
+#define LOG_PREFIX "perl"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_securid/mem.c b/src/modules/rlm_securid/mem.c
index f48294f29f4..7c38b5e1d40 100644
--- a/src/modules/rlm_securid/mem.c
+++ b/src/modules/rlm_securid/mem.c
@@ -19,7 +19,7 @@
  * @copyright 2012 Alan DeKok (aland@networkradius.com)
  */
 
-#define LOG_PREFIX "rlm_securid"
+#define LOG_PREFIX "securid"
 
 #include <stdio.h>
 #include "rlm_securid.h"
diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index ce7bb848b98..d7bbce2e1f3 100644
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define LOG_PREFIX "rlm_sigtran"
+#define LOG_PREFIX "sigtran"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sigtran/event.c b/src/modules/rlm_sigtran/event.c
index 4655a15ce97..1cd2298d258 100644
--- a/src/modules/rlm_sigtran/event.c
+++ b/src/modules/rlm_sigtran/event.c
@@ -56,7 +56,7 @@
  *
  * @copyright 2016 Network RADIUS SARL (license@networkradius.com)
  */
-#define LOG_PREFIX "rlm_sigtran"
+#define LOG_PREFIX "sigtran"
 
 #include <osmocom/core/talloc.h>
 
diff --git a/src/modules/rlm_sigtran/log.c b/src/modules/rlm_sigtran/log.c
index f603b77d2ec..79c92db84e8 100644
--- a/src/modules/rlm_sigtran/log.c
+++ b/src/modules/rlm_sigtran/log.c
@@ -30,7 +30,7 @@
  * @file rlm_sigtran/log.c
  * @brief Interface libosmo with FreeRADIUS logging
  */
-#define LOG_PREFIX "rlm_sigtran"
+#define LOG_PREFIX "sigtran"
 
 #include <freeradius-devel/server/base.h>
 #include <osmocom/core/logging.h>
diff --git a/src/modules/rlm_sigtran/sccp.c b/src/modules/rlm_sigtran/sccp.c
index 70d3f9f5612..e1502646d03 100644
--- a/src/modules/rlm_sigtran/sccp.c
+++ b/src/modules/rlm_sigtran/sccp.c
@@ -34,7 +34,7 @@
  *
  * @copyright 2016 Network RADIUS SARL (license@networkradius.com)
  */
-#define LOG_PREFIX "rlm_sigtran - osmocom thread"
+#define LOG_PREFIX "sigtran - osmocom thread"
 
 #include <osmocom/core/talloc.h>
 
diff --git a/src/modules/rlm_sigtran/sigtran.c b/src/modules/rlm_sigtran/sigtran.c
index ecd2cafee2b..037af2466cb 100644
--- a/src/modules/rlm_sigtran/sigtran.c
+++ b/src/modules/rlm_sigtran/sigtran.c
@@ -30,7 +30,7 @@
  * @file rlm_sigtran/sigtran.c
  * @brief Miscellaneous functions.
  */
-#define LOG_PREFIX "rlm_sigtran"
+#define LOG_PREFIX "sigtran"
 
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/talloc.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index ef705fac436..0aa219fd868 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -33,7 +33,7 @@
  * @author Linnaea Von Lavia (le.concorde.4590@gmail.com)
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "rlm_sql_cassandra"
+#define LOG_PREFIX "sql - cassandra"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
index 9f09a636c73..7da52fb0507 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
@@ -29,7 +29,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_db2"
+#define LOG_PREFIX "sql - db2"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
index b5783424511..531ddbd2b2a 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
@@ -20,7 +20,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_firebird"
+#define LOG_PREFIX "sql - firebird"
 
 #include "sql_fbapi.h"
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
index 9314c712b42..33cf105bd48 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
@@ -26,7 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_freetds"
+#define LOG_PREFIX "sql - freetds"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index b2eb664eed0..2d143c8bce2 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -26,7 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_mysql"
+#define LOG_PREFIX "sql - mysql"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 4e11f4423aa..84289ee29d1 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -22,7 +22,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_oracle"
+#define LOG_PREFIX "sql - oracle"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 363d55a908e..1eac7fb7193 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -39,7 +39,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_postgresql"
+#define LOG_PREFIX "sql - postgresql"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 3a810865002..a1a43b96aea 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_sqlite"
+#define LOG_PREFIX "sql - sqlite"
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
 
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
index 91d760c0501..3482c854b6c 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
@@ -21,7 +21,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "rlm_sql_unixodbc"
+#define LOG_PREFIX "sql - unixodbc"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index ebd53d0e093..a6adfbc9b42 100644
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sqlcounter"
+#define LOG_PREFIX "sqlcounter"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_unbound/io.c b/src/modules/rlm_unbound/io.c
index 2f0de566517..b0b16e0b9b2 100644
--- a/src/modules/rlm_unbound/io.c
+++ b/src/modules/rlm_unbound/io.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound"
+#define LOG_PREFIX "unbound"
 
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/util/event.h>
diff --git a/src/modules/rlm_unbound/log.c b/src/modules/rlm_unbound/log.c
index 1000fd47122..43a2fa5c147 100644
--- a/src/modules/rlm_unbound/log.c
+++ b/src/modules/rlm_unbound/log.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound"
+#define LOG_PREFIX "unbound"
 
 #include <freeradius-devel/util/syserror.h>
 #include "log.h"
diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index cd16e972a79..11199682473 100644
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_wimax"
+#define LOG_PREFIX "wimax"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>