Typo

[freeradius.git] / src / modules / rlm_sql / drivers / rlm_sql_iodbc / rlm_sql_iodbc.c

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
index ef03dbc..4a4ae5c 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
@@ -58,18 +58,14 @@ static int _sql_socket_destructor(rlm_sql_iodbc_conn_t *conn)
 {
        DEBUG2("rlm_sql_iodbc: Socket destructor called, closing socket");
 
-       if (conn->stmt) {
-               SQLFreeStmt(conn->stmt, SQL_DROP);
-       }
+       if (conn->stmt) SQLFreeStmt(conn->stmt, SQL_DROP);
 
        if (conn->dbc_handle) {
                SQLDisconnect(conn->dbc_handle);
                SQLFreeConnect(conn->dbc_handle);
        }
 
-       if (conn->env_handle) {
-               SQLFreeEnv(conn->env_handle);
-       }
+       if (conn->env_handle) SQLFreeEnv(conn->env_handle);
 
        return 0;
 }
@@ -89,7 +85,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
                ERROR("rlm_sql_iodbc: SQLAllocEnv failed");
                if (sql_error(NULL, &entry, 1, handle, config) > 0) ERROR("rlm_sql_iodbc: %s", entry.msg);
 
-               return -1;
+               return RLM_SQL_ERROR;
        }
 
        rcode = SQLAllocConnect(conn->env_handle,
@@ -98,7 +94,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
                ERROR("rlm_sql_iodbc: SQLAllocConnect failed");
                if (sql_error(NULL, &entry, 1, handle, config) > 0) ERROR("rlm_sql_iodbc: %s", entry.msg);
 
-               return -1;
+               return RLM_SQL_ERROR;
        }
 
        /*
@@ -117,7 +113,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
                ERROR("rlm_sql_iodbc: SQLConnectfailed");
                if (sql_error(NULL, &entry, 1, handle, config) > 0) ERROR("rlm_sql_iodbc: %s", entry.msg);
 
-               return -1;
+               return RLM_SQL_ERROR;
        }
 
        return 0;
@@ -129,11 +125,11 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
        SQLRETURN rcode;
 
        rcode = SQLAllocStmt(conn->dbc_handle, &conn->stmt);
-       if (!SQL_SUCCEEDED(rcode)) return -1;
+       if (!SQL_SUCCEEDED(rcode)) return RLM_SQL_ERROR;
 
        if (!conn->dbc_handle) {
                ERROR("rlm_sql_iodbc: Socket not connected");
-               return -1;
+               return RLM_SQL_ERROR;
        }
 
        {
@@ -143,7 +139,7 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
                rcode = SQLExecDirect(conn->stmt, statement, SQL_NTS);
        }
 
-       if (!SQL_SUCCEEDED(rcode)) return -1;
+       if (!SQL_SUCCEEDED(rcode)) return RLM_SQL_ERROR;
 
        return 0;
 }
@@ -156,9 +152,7 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        long len = 0;
        rlm_sql_iodbc_conn_t *conn = handle->conn;
 
-       if(sql_query(handle, config, query) < 0) {
-               return -1;
-       }
+       if (sql_query(handle, config, query) < 0) return RLM_SQL_ERROR;
 
        numfields = sql_num_fields(handle, config);
 
@@ -190,11 +184,6 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        return 0;
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
-{
-       return 0;
-}
-
 static int sql_num_fields(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
 {
 
@@ -251,9 +240,9 @@ static sql_rcode_t sql_fetch_row(rlm_sql_handle_t *handle, UNUSED rlm_sql_config
 
        handle->row = NULL;
 
-       if((rc = SQLFetch(conn->stmt)) == SQL_NO_DATA_FOUND) {
-               return 0;
-       }
+       rc = SQLFetch(conn->stmt);
+       if (rc == SQL_NO_DATA_FOUND) return RLM_SQL_NO_MORE_ROWS;
+
        /* XXX Check rc for database down, if so, return RLM_SQL_RECONNECT */
 
        handle->row = conn->row;
@@ -333,7 +322,6 @@ rlm_sql_module_t rlm_sql_iodbc = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,