From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 5 Mar 2026 13:29:19 +0000 (-0500)
Subject: use consistent names
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecd3999705aad7d91cbf143e5eb0a832ec584fd1;p=thirdparty%2Ffreeradius-server.git

use consistent names

'conn' is the #fr_connection_t

'c' is the DB connection handle
---

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 79b53f005f5..a2b374a4d0a 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
@@ -851,16 +851,16 @@ static int sql_affected_rows(fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t
 static ssize_t sql_escape_func(request_t *request, char *out, size_t outlen, char const *in, void *arg)
 {
 	size_t			inlen;
-	connection_t		*c = talloc_get_type_abort(arg, connection_t);
-	rlm_sql_mysql_conn_t	*conn;
-	char const		*log_prefix = c->name;
+	connection_t		*conn = talloc_get_type_abort(arg, connection_t);
+	rlm_sql_mysql_conn_t	*c;
+	char const		*log_prefix = conn->name;
 
-	if ((c->state == CONNECTION_STATE_HALTED) || (c->state == CONNECTION_STATE_CLOSED)) {
+	if ((conn->state == CONNECTION_STATE_HALTED) || (conn->state == CONNECTION_STATE_CLOSED)) {
 		ROPTIONAL(RERROR, ERROR, "Connection not available for escaping");
 		return -1;
 	}
 
-	conn = talloc_get_type_abort(c->h, rlm_sql_mysql_conn_t);
+	c = talloc_get_type_abort(conn->h, rlm_sql_mysql_conn_t);
 
 	/* Check for potential buffer overflow */
 	inlen = strlen(in);
@@ -868,7 +868,7 @@ static ssize_t sql_escape_func(request_t *request, char *out, size_t outlen, cha
 	/* Prevent integer overflow */
 	if ((inlen * 2 + 1) <= inlen) return 0;
 
-	return mysql_real_escape_string(&conn->db, out, in, inlen);
+	return mysql_real_escape_string(&c->db, out, in, inlen);
 }
 
 SQL_TRUNK_CONNECTION_ALLOC
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 47493b2afd6..3b67c56102e 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
@@ -696,16 +696,16 @@ static int sql_affected_rows(fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t
 static ssize_t sql_escape_func(request_t *request, char *out, size_t outlen, char const *in, void *arg)
 {
 	size_t			inlen, ret;
-	connection_t		*c = talloc_get_type_abort(arg, connection_t);
-	rlm_sql_postgres_conn_t	*conn;
+	connection_t		*conn = talloc_get_type_abort(arg, connection_t);
+	rlm_sql_postgres_conn_t	*c;
 	int			err;
 
-	if ((c->state == CONNECTION_STATE_HALTED) || (c->state == CONNECTION_STATE_CLOSED)) {
+	if ((conn->state == CONNECTION_STATE_HALTED) || (conn->state == CONNECTION_STATE_CLOSED)) {
 		ROPTIONAL(RERROR, ERROR, "Connection not available for escaping");
 		return -1;
 	}
 
-	conn = talloc_get_type_abort(c->h, rlm_sql_postgres_conn_t);
+	c = talloc_get_type_abort(conn->h, rlm_sql_postgres_conn_t);
 
 	/* Check for potential buffer overflow */
 	inlen = strlen(in);
@@ -713,9 +713,9 @@ static ssize_t sql_escape_func(request_t *request, char *out, size_t outlen, cha
 	/* Prevent integer overflow */
 	if ((inlen * 2 + 1) <= inlen) return 0;
 
-	ret = PQescapeStringConn(conn->db, out, in, inlen, &err);
+	ret = PQescapeStringConn(c->db, out, in, inlen, &err);
 	if (err) {
-		ROPTIONAL(REDEBUG, ERROR, "Error escaping string \"%s\": %s", in, PQerrorMessage(conn->db));
+		ROPTIONAL(REDEBUG, ERROR, "Error escaping string \"%s\": %s", in, PQerrorMessage(c->db));
 		return 0;
 	}