Removed some unused variables

This fixes the following messages of cppcheck:

[src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c:290]: (style) Variable 'ret' is assigned a value that is never used.
[src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c:492]: (style) Variable 'ret' is assigned a value that is never used.
[src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c:573]: (style) Variable 'ret' is assigned a value that is never used.
[src/modules/rlm_passwd/rlm_passwd.c:284]: (style) Variable 'len' is assigned a value that is never used.

diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index c296ca2..2583a67 100644 (file)
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -260,7 +260,6 @@ static struct mypasswd * get_next(char *name, struct hashtable *ht,
        struct mypasswd * passwd;
        struct mypasswd * hashentry;
        char buffer[1024];
-       int len;
        char *list, *nextlist;
 
        if (ht->tablesize > 0) {
@@ -281,7 +280,7 @@ static struct mypasswd * get_next(char *name, struct hashtable *ht,
        passwd = (struct mypasswd *) ht->buffer;
 
        while (fgets(buffer, 1024,ht->fp)) {
-               if(*buffer && *buffer!='\n' && (len = string_to_entry(buffer, ht->nfields, ht->delimiter, passwd, sizeof(ht->buffer)-1)) &&
+               if(*buffer && *buffer!='\n' && string_to_entry(buffer, ht->nfields, ht->delimiter, passwd, sizeof(ht->buffer)-1) &&
                   (!ht->ignorenis || (*buffer !='-' && *buffer != '+') ) ){
                        if(!ht->islist) {
                                if(!strcmp(passwd->field[ht->keyfield], name))

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 f5023ee..2a93854 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
@@ -192,7 +192,7 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
 {
        rlm_sql_freetds_conn_t *conn = handle->conn;
 
-       CS_RETCODE      ret, results_ret;
+       CS_RETCODE      results_ret;
        CS_INT          result_type;
 
        if (ct_cmd_alloc(conn->db, &conn->command) != CS_SUCCEED) {
@@ -236,7 +236,7 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
                case CS_FAIL: /* Serious failure, freetds requires us to cancel and maybe even close db */
                        ERROR("rlm_sql_freetds: failure retrieving query results");
 
-                       if ((ret = ct_cancel(NULL, conn->command, CS_CANCEL_ALL)) == CS_FAIL) {
+                       if (ct_cancel(NULL, conn->command, CS_CANCEL_ALL) == CS_FAIL) {
                                INFO("rlm_sql_freetds: cleaning up");
 
                                return RLM_SQL_RECONNECT;
@@ -265,7 +265,7 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
                switch (results_ret) {
                case CS_FAIL: /* Serious failure, freetds requires us to cancel and maybe even close db */
                        ERROR("rlm_sql_freetds: failure retrieving query results");
-                       if ((ret = ct_cancel(NULL, conn->command, CS_CANCEL_ALL)) == CS_FAIL) {
+                       if (ct_cancel(NULL, conn->command, CS_CANCEL_ALL) == CS_FAIL) {
                                INFO("rlm_sql_freetds: cleaning up");
 
                                return RLM_SQL_RECONNECT;
@@ -287,7 +287,7 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
        switch (results_ret) {
        case CS_FAIL: /* Serious failure, freetds requires us to cancel and maybe even close db */
                ERROR("rlm_sql_freetds: failure retrieving query results");
-               if ((ret = ct_cancel(NULL, conn->command, CS_CANCEL_ALL)) == CS_FAIL) {
+               if (ct_cancel(NULL, conn->command, CS_CANCEL_ALL) == CS_FAIL) {
                        INFO("rlm_sql_freetds: cleaning up");
 
                        return RLM_SQL_RECONNECT;
@@ -389,7 +389,7 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
 {
        rlm_sql_freetds_conn_t *conn = handle->conn;
 
-       CS_RETCODE      ret, results_ret;
+       CS_RETCODE      results_ret;
        CS_INT          result_type;
        CS_DATAFMT      descriptor;
 
@@ -489,7 +489,7 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
 
                ERROR("rlm_sql_freetds: failure retrieving query results");
 
-               if ((ret = ct_cancel(NULL, conn->command, CS_CANCEL_ALL)) == CS_FAIL) {
+               if (ct_cancel(NULL, conn->command, CS_CANCEL_ALL) == CS_FAIL) {
                        ERROR("rlm_sql_freetds: cleaning up");
 
                        return RLM_SQL_RECONNECT;
@@ -570,7 +570,7 @@ static sql_rcode_t sql_fetch_row(rlm_sql_handle_t *handle, UNUSED rlm_sql_config
                 *      Serious failure, freetds requires us to cancel the results and maybe even close the db.
                 */
                ERROR("rlm_sql_freetds: failure fetching row data");
-               if ((ret = ct_cancel(NULL, conn->command, CS_CANCEL_ALL)) == CS_FAIL) {
+               if (ct_cancel(NULL, conn->command, CS_CANCEL_ALL) == CS_FAIL) {
                        ERROR("rlm_sql_freetds: cleaning up");
                } else {
                        conn->command = NULL;