sql_num_fields is not used

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 84c8981d088d1ea7a6bcf4fc6c025055965f18ca..89b71c605eb754a47aef8507cc4437c70b848028 100644 (file)
--- 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
@@ -983,7 +983,6 @@ rlm_sql_driver_t rlm_sql_cassandra = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,

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 bfd6fb2bf6702849cff10ab2f1b409429b492510..f026de9fec1d41f533270c66610f6737f358b9dd 100644 (file)
--- 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
@@ -291,7 +291,6 @@ rlm_sql_driver_t rlm_sql_db2 = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,
        .sql_fetch_row                  = sql_fetch_row,

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 302b73e64ebdfda065c4965c6b5da11c8b58e9b1..6ca61b5c0c0d6367e802f0eab1216d828a7adead 100644 (file)
--- 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
@@ -25,10 +25,6 @@ RCSID("$Id$")
 #include "sql_fbapi.h"
 #include <freeradius-devel/util/debug.h>
 
-
-/* Forward declarations */
-static int sql_num_fields(rlm_sql_handle_t *handle, rlm_sql_config_t const *config);
-
 static int _sql_socket_destructor(rlm_sql_firebird_conn_t *conn)
 {
        int i;
@@ -155,14 +151,6 @@ static unlang_action_t sql_query(rlm_rcode_t *p_result, UNUSED int *priority, UN
        RETURN_MODULE_OK;
 }
 
-/** Returns number of columns from query.
- *
- */
-static int sql_num_fields(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t const *config)
-{
-       return ((rlm_sql_firebird_conn_t *) handle->conn)->sqlda_out->sqld;
-}
-
 /** Returns name of fields.
  *
  */
@@ -295,7 +283,6 @@ rlm_sql_driver_t rlm_sql_firebird = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_affected_rows,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fetch_row                  = sql_fetch_row,

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 8b070a22a89fcbabc228c99855d1c0fe5488eec3..db903fca88df3ecd981cddae5c091c77e918c33e 100644 (file)
--- 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
@@ -836,7 +836,6 @@ rlm_sql_driver_t rlm_sql_freetds = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_fields                     = sql_fields,
        .sql_affected_rows              = sql_num_rows,

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 645d10db741cbd7b3b6fcdda7a642697db3d31fc..df15d0874cc20ab87e7cd5821825a9d2734ec4cc 100644 (file)
--- 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
@@ -795,7 +795,6 @@ rlm_sql_driver_t rlm_sql_mysql = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c b/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
index 64737f020b6d09e7e35a415d7bb245638cfeb2ac..48964db6eb017f519418e4fd6f5e316a3dcc5598 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
@@ -43,11 +43,6 @@ static unlang_action_t sql_query(rlm_rcode_t *p_result, UNUSED int *priority, UN
        RETURN_MODULE_OK;
 }
 
-static int sql_num_fields(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t const *config)
-{
-       return 0;
-}
-
 static int sql_num_rows(UNUSED fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
 {
        return 0;
@@ -95,7 +90,6 @@ rlm_sql_driver_t rlm_sql_null = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_fetch_row                  = sql_fetch_row,
        .sql_free_result                = sql_free_result,

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 d42718aee10b6498e5ef40a986264a698307db4b..2a8ca3b888875d213d15935a4473e2c96979209f 100644 (file)
--- 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
@@ -646,7 +646,6 @@ rlm_sql_driver_t rlm_sql_oracle = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_num_rows,
        .sql_fetch_row                  = sql_fetch_row,

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 849a7ee89ab638c65f19baada8fb9be1c6c3c3bc..88ef7bb3dc083390f289ff3601980123e1657d0f 100644 (file)
--- 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
@@ -455,16 +455,6 @@ static unlang_action_t sql_fetch_row(rlm_rcode_t *p_result, UNUSED int *priority
        RETURN_MODULE_OK;
 }
 
-static int sql_num_fields(rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t const *config)
-{
-       rlm_sql_postgres_conn_t *conn = handle->conn;
-
-       conn->affected_rows = PQntuples(conn->result);
-       if (conn->result) return PQnfields(conn->result);
-
-       return 0;
-}
-
 static sql_rcode_t sql_free_result(fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
 {
        rlm_sql_postgres_conn_t *conn = query_ctx->handle->conn;
@@ -681,7 +671,6 @@ rlm_sql_driver_t rlm_sql_postgresql = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_fields                     = sql_fields,
        .sql_fetch_row                  = sql_fetch_row,
        .sql_error                      = sql_error,

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 ee9aa588e46569892a37b397d7a8609e3568d2a6..9769f2d47469e8eab2a7c16be500f82da67cf559 100644 (file)
--- 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
@@ -832,7 +832,6 @@ rlm_sql_driver_t rlm_sql_sqlite = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fetch_row                  = sql_fetch_row,
        .sql_fields                     = sql_fields,

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 32427e892d8bc3247272d1adf17d3af452abe670..e4ade741de3a8e1d8b00f7dec9092b53ddf1e8e8 100644 (file)
--- 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
@@ -399,7 +399,6 @@ rlm_sql_driver_t rlm_sql_unixodbc = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_num_fields                 = sql_num_fields,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,
        .sql_fetch_row                  = sql_fetch_row,

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 6eea82ef331016a3da31304018c6f04876a7d686..cc3c7baaf471c4dcc9a74f0463cba1f451a7be9a 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -207,7 +207,6 @@ typedef struct {
        unlang_function_t       sql_query;
        unlang_function_t       sql_select_query;
 
-       int             (*sql_num_fields)(rlm_sql_handle_t *handle, rlm_sql_config_t const *config);
        int             (*sql_num_rows)(fr_sql_query_t *query_ctx, rlm_sql_config_t const *config);
        int             (*sql_affected_rows)(fr_sql_query_t *query_ctx, rlm_sql_config_t const *config);