Rename local functions _sql_*() to rlm_sql_*() to look nicer.

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index c208cc2..e4c177d 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -128,13 +128,13 @@ static int sql_xlat(void *instance, REQUEST *request, char *fmt, char *out, int
        sqlsocket = sql_get_socket(inst);
        if (sqlsocket == NULL)
                return 0;
-       if (_sql_select_query(sqlsocket,inst,querystr)){
+       if (rlm_sql_select_query(sqlsocket,inst,querystr)){
                radlog(L_ERR, "rlm_sql: database query error");
                sql_release_socket(inst,sqlsocket);
                return 0;
        }
 
-       ret = _sql_fetch_row(sqlsocket, inst);
+       ret = rlm_sql_fetch_row(sqlsocket, inst);
 
        (inst->module->sql_finish_select_query)(sqlsocket, inst->config);
        sql_release_socket(inst,sqlsocket);
@@ -462,12 +462,12 @@ static int rlm_sql_authorize(void *instance, REQUEST * request) {
                /* Remove the username we (maybe) added above */
                pairdelete(&request->packet->vps, PW_SQL_USER_NAME);
 
-               if (_sql_select_query(sqlsocket, inst, querystr)) {
+               if (rlm_sql_select_query(sqlsocket, inst, querystr)) {
                        radlog(L_ERR, "rlm_sql_authorize: database query error");
                        sql_release_socket(inst, sqlsocket);
                        return RLM_MODULE_FAIL;
                }
-               ret = _sql_fetch_row(sqlsocket, inst);
+               ret = rlm_sql_fetch_row(sqlsocket, inst);
 
                (inst->module->sql_finish_select_query)(sqlsocket, inst->config);
                sql_release_socket(inst, sqlsocket);
@@ -545,7 +545,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) {
                        if (sqlsocket == NULL)
                                return(RLM_MODULE_FAIL);
                        if (querystr) {
-                               if (_sql_query(sqlsocket, inst, querystr))
+                               if (rlm_sql_query(sqlsocket, inst, querystr))
                                        radlog(L_ERR, "rlm_sql: Couldn't update SQL accounting for Acct On/Off packet - %s", (char *)(inst->module->sql_error)(sqlsocket, inst->config));
                                (inst->module->sql_finish_query)(sqlsocket, inst->config);
                        }
@@ -569,7 +569,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) {
                        if (sqlsocket == NULL)
                                return(RLM_MODULE_FAIL);
                        if (querystr) {
-                               if (_sql_query(sqlsocket, inst, querystr))
+                               if (rlm_sql_query(sqlsocket, inst, querystr))
                                        radlog(L_ERR, "rlm_sql: Couldn't update SQL accounting for ALIVE packet - %s", (char *)(inst->module->sql_error)(sqlsocket, inst->config));
                                (inst->module->sql_finish_query)(sqlsocket, inst->config);
                        }
@@ -593,7 +593,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) {
                        if (sqlsocket == NULL)
                                return(RLM_MODULE_FAIL);
                        if (querystr) {
-                               if (_sql_query(sqlsocket, inst, querystr)) {
+                               if (rlm_sql_query(sqlsocket, inst, querystr)) {
                                        radlog(L_ERR, "rlm_sql: Couldn't update SQL accounting" " for START packet - %s", (char *)(inst->module->sql_error)(sqlsocket, inst->config));
 
                                        /*
@@ -605,7 +605,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) {
                                        query_log(inst, querystr);
 
                                        if (querystr) {
-                                               if (_sql_query(sqlsocket, inst, querystr)) {
+                                               if (rlm_sql_query(sqlsocket, inst, querystr)) {
                                                        radlog(L_ERR, "rlm_sql: Couldn't update SQL" "accounting START record - %s", (char *)(inst->module->sql_error)(sqlsocket, inst->config));
                                                }
                                                (inst->module->sql_finish_query)(sqlsocket, inst->config);
@@ -632,7 +632,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) {
                        if (sqlsocket == NULL)
                                return(RLM_MODULE_FAIL);
                        if (querystr) {
-                               if (_sql_query(sqlsocket, inst, querystr)) {
+                               if (rlm_sql_query(sqlsocket, inst, querystr)) {
                                        radlog(L_ERR, "rlm_sql: Couldn't update SQL accounting STOP record - %s", (char *)(inst->module->sql_error)(sqlsocket, inst->config));
                                }
                                else {
@@ -666,7 +666,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) {
                                                query_log(inst, querystr);
 
                                                if (querystr) {
-                                                       if (_sql_query(sqlsocket, inst, querystr)) {
+                                                       if (rlm_sql_query(sqlsocket, inst, querystr)) {
                                                                radlog(L_ERR, "rlm_sql: Couldn't insert SQL accounting STOP record - %s", (char *)(inst->module->sql_error)(sqlsocket, inst->config));
                                                        }
                                                        (inst->module->sql_finish_query)(sqlsocket, inst->config);
@@ -724,13 +724,13 @@ static int rlm_sql_checksimul(void *instance, REQUEST * request) {
                return RLM_MODULE_FAIL;
 
        radius_xlat(querystr, MAX_QUERY_LEN, inst->config->simul_count_query, request, NULL);
-       if(_sql_select_query(sqlsocket, inst, querystr)) {
+       if(rlm_sql_select_query(sqlsocket, inst, querystr)) {
                radlog(L_ERR, "sql_checksimul: Database query failed");
                sql_release_socket(inst, sqlsocket);
                return RLM_MODULE_FAIL;
        }
 
-       ret = _sql_fetch_row(sqlsocket, inst);
+       ret = rlm_sql_fetch_row(sqlsocket, inst);
 
        if (ret == 0) {
                row = sqlsocket->row;
@@ -762,7 +762,7 @@ static int rlm_sql_checksimul(void *instance, REQUEST * request) {
        }
 
        radius_xlat(querystr, MAX_QUERY_LEN, inst->config->simul_verify_query, request, NULL);
-       if(_sql_select_query(sqlsocket, inst, querystr)) {
+       if(rlm_sql_select_query(sqlsocket, inst, querystr)) {
                radlog(L_ERR, "sql_checksimul: Database query error");
                sql_release_socket(inst, sqlsocket);
                return RLM_MODULE_FAIL;
@@ -779,7 +779,7 @@ static int rlm_sql_checksimul(void *instance, REQUEST * request) {
                 call_num = vp->strvalue;        
 
 
-       while (_sql_fetch_row(sqlsocket, inst) == 0) {
+       while (rlm_sql_fetch_row(sqlsocket, inst) == 0) {
                row = sqlsocket->row;
                if (row == NULL)
                        break;
@@ -815,7 +815,7 @@ static int rlm_sql_checksimul(void *instance, REQUEST * request) {
                                                                row[1],row[3],row[4]);
                                sqlsocket1 = sql_get_socket(inst);
                                sprintf(querystr, inst->config->simul_zap_query, row[0]);
-                               if (_sql_query(sqlsocket1, inst, querystr)) {
+                               if (rlm_sql_query(sqlsocket1, inst, querystr)) {
                                        radlog(L_ERR, "rlm_sql: Deletion of stale session [%s] failed",
                                                                row[1]);
                                }

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 524887a..eb17367 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -93,7 +93,7 @@ int     sql_read_naslist(SQLSOCK * sqlsocket);
 int     sql_read_clients(SQLSOCK * sqlsocket);
 int     sql_dict_init(SQLSOCK * sqlsocket);
 void    query_log(SQL_INST * inst, char *querystr);
-int    _sql_select_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query);
-int    _sql_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query);
-int    _sql_fetch_row(SQLSOCK *sqlsocket, SQL_INST *inst);
+int    rlm_sql_select_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query);
+int    rlm_sql_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query);
+int    rlm_sql_fetch_row(SQLSOCK *sqlsocket, SQL_INST *inst);
 #endif

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index be52b69..87f3f42 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -310,12 +310,12 @@ int sql_userparse(VALUE_PAIR ** first_pair, SQL_ROW row, int querymode) {
 
 /*************************************************************************
  *
- *     Function: _sql_fetch_row
+ *     Function: rlm_sql_fetch_row
  *
  *     Purpose: call the module's sql_fetch_row and implement re-connect
  *
  *************************************************************************/
-int _sql_fetch_row(SQLSOCK *sqlsocket, SQL_INST *inst) {
+int rlm_sql_fetch_row(SQLSOCK *sqlsocket, SQL_INST *inst) {
        int ret;
 
        ret = (inst->module->sql_fetch_row)(sqlsocket, inst->config);
@@ -339,12 +339,12 @@ int _sql_fetch_row(SQLSOCK *sqlsocket, SQL_INST *inst) {
 
 /*************************************************************************
  *
- *     Function: _sql_query
+ *     Function: rlm_sql_query
  *
  *     Purpose: call the module's sql_query and implement re-connect
  *
  *************************************************************************/
-int _sql_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query) {
+int rlm_sql_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query) {
        int ret;
 
        ret = (inst->module->sql_query)(sqlsocket, inst->config, query);
@@ -368,12 +368,12 @@ int _sql_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query) {
 
 /*************************************************************************
  *
- *     Function: _sql_select_query
+ *     Function: rlm_sql_select_query
  *
  *     Purpose: call the module's sql_select_query and implement re-connect
  *
  *************************************************************************/
-int _sql_select_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query) {
+int rlm_sql_select_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query) {
        int ret;
 
        ret = (inst->module->sql_select_query)(sqlsocket, inst->config, query);
@@ -408,11 +408,11 @@ int sql_getvpdata(SQL_INST * inst, SQLSOCK * sqlsocket, VALUE_PAIR **pair, char
        SQL_ROW row;
        int     rows = 0;
 
-       if (_sql_select_query(sqlsocket, inst, query)) {
+       if (rlm_sql_select_query(sqlsocket, inst, query)) {
                radlog(L_ERR, "rlm_sql_getvpdata: database query error");
                return -1;
        }
-       while (_sql_fetch_row(sqlsocket, inst)==0) {
+       while (rlm_sql_fetch_row(sqlsocket, inst)==0) {
                row = sqlsocket->row;
                if (!row)
                        break;
@@ -543,12 +543,12 @@ int sql_check_multi(SQL_INST * inst, SQLSOCK * sqlsocket, char *name, VALUE_PAIR
        sprintf(querystr, "SELECT COUNT(*) FROM %s WHERE %s AND AcctStopTime = 0", inst->config->sql_acct_table, authstr);
        
 
-       if (_sql_select_query(sqlsocket, inst, querystr)) {
+       if (rlm_sql_select_query(sqlsocket, inst, querystr)) {
                radlog(L_ERR, "sql_check_multi: database query error");
                return -1;
        }
 
-       if (_sql_fetch_row(sqlsocket, inst->config)) {
+       if (rlm_sql_fetch_row(sqlsocket, inst->config)) {
                (inst->module->sql_finish_select_query)(sqlsocket, inst->config);
                return -1;
        }
@@ -573,11 +573,11 @@ int sql_check_multi(SQL_INST * inst, SQLSOCK * sqlsocket, char *name, VALUE_PAIR
        count = 0;
        sprintf(querystr, "SELECT * FROM %s WHERE %s AND AcctStopTime = 0", inst->config->sql_acct_table, authstr);
 
-       if (_sql_select_query(sqlsocket, inst, querystr)) {
+       if (rlm_sql_select_query(sqlsocket, inst, querystr)) {
                radlog(L_ERR, "sql_check_multi: database query error");
                return -1;
        }
-       while (_sql_fetch_row(sqlsocket, inst) == 0) {
+       while (rlm_sql_fetch_row(sqlsocket, inst) == 0) {
                int     check;
                row = sqlsocket->row;
                if (row == NULL) {
@@ -604,7 +604,7 @@ int sql_check_multi(SQL_INST * inst, SQLSOCK * sqlsocket, char *name, VALUE_PAIR
                                radlog(L_ERR, "rlm_sql:  Deleteing stale session [%s] (from nas %s/%s)", row[2], row[4], row[5]);
                                sqlsocket1 = sql_get_socket(inst);
                                sprintf(querystr, "DELETE FROM %s WHERE RadAcctId = '%s'", inst->config->sql_acct_table, row[0]);
-                               if(_sql_query(sqlsocket1, inst, querystr)) {
+                               if(rlm_sql_query(sqlsocket1, inst, querystr)) {
                                        radlog(L_ERR, "rlm_sql: database query error");
                                } else {
                                        (inst->module->sql_finish_query)(sqlsocket1, inst->config);