Skip to content

Commit

Permalink
Removed some unused variables
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@herwinw @arr2036
herwinw authored and arr2036 committed Oct 18, 2014
1 parent 1920c3b commit 2baae71
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions src/modules/rlm_passwd/rlm_passwd.c
View file
Expand Up @@ -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) {
Expand All @@ -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))
Expand Down
14 changes: 7 additions & 7 deletions src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2baae71

Please sign in to comment.