Consistent use of sql_rcode_t

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 248b55e8faf9bec0fb13a75fd37814651e5f01d5..51d4e05686c998cd227eff627c72970c00815eba 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
@@ -40,7 +40,7 @@ USES_APPLE_DEPRECATED_API
 #include <sqlext.h>
 
 /* Forward declarations */
-static int sql_check_error(long err_handle, rlm_sql_handle_t *handle, rlm_sql_config_t *config);
+static sql_rcode_t sql_check_error(long err_handle, rlm_sql_handle_t *handle, rlm_sql_config_t *config);
 static sql_rcode_t sql_free_result(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
 static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
 static int sql_num_fields(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
@@ -121,7 +121,7 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, rlm_sql_config_t *config,
 {
        rlm_sql_unixodbc_conn_t *conn = handle->conn;
        long err_handle;
-       int state;
+       sql_rcode_t state;
 
        /* Executing query */
        {
@@ -145,7 +145,7 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        SQLINTEGER i;
        SQLLEN len;
        int colcount;
-       int state;
+       sql_rcode_t state;
 
        /* Only state = 0 means success */
        if ((state = sql_query(handle, config, query))) {
@@ -186,7 +186,7 @@ static sql_rcode_t sql_fetch_row(rlm_sql_handle_t *handle, rlm_sql_config_t *con
 {
        rlm_sql_unixodbc_conn_t *conn = handle->conn;
        long err_handle;
-       int state;
+       sql_rcode_t state;
 
        handle->row = NULL;
 

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 4b65a1fdf3681126a0002854fefe7d2de7d28210..78ab86b04112cdc1789828627b96612950547da6 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -252,7 +252,7 @@ int         sql_dict_init(rlm_sql_handle_t *handle);
 void           CC_HINT(nonnull (1, 2, 4)) rlm_sql_query_log(rlm_sql_t *inst, REQUEST *request, sql_acct_section_t *section, char const *query);
 sql_rcode_t    CC_HINT(nonnull (1, 3, 4)) rlm_sql_select_query(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_t **handle, char const *query);
 sql_rcode_t    CC_HINT(nonnull (1, 3, 4)) rlm_sql_query(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_t **handle, char const *query);
-int            rlm_sql_fetch_row(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_t **handle);
+sql_rcode_t    rlm_sql_fetch_row(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_t **handle);
 void           rlm_sql_print_error(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_t *handle, bool force_debug);
 int            sql_set_user(rlm_sql_t *inst, REQUEST *request, char const *username);
 #endif

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 44093ee66bb4edd2dd617b663b5954762a414ff9..80255e49c5ce43b2498c526146d86d649be1f17d 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -191,7 +191,7 @@ int sql_fr_pair_list_afrom_str(TALLOC_CTX *ctx, REQUEST *request, VALUE_PAIR **h
  */
 sql_rcode_t rlm_sql_fetch_row(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_t **handle)
 {
-       int ret;
+       sql_rcode_t ret;
 
        if (!*handle || !(*handle)->conn) return RLM_SQL_ERROR;