Skip to content

Commit

Permalink
iscsi-target: Remove unused variables in iscsi_target_parameters.c
Browse files Browse the repository at this point in the history 
local_right_val was an obvious case, tmp_ptr is also write-only, but
evades the compiler by being passed to simple_strtoul as char **endp.

Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Jörn Engel authored and Nicholas Bellinger committed Mar 16, 2012
1 parent 2816890 commit a227fb3
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions drivers/target/iscsi/iscsi_target_parameters.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,8 +874,8 @@ static int iscsi_check_numerical_value(struct iscsi_param *param, char *value_pt
static int iscsi_check_numerical_range_value(struct iscsi_param *param, char *value)
{
char *left_val_ptr = NULL, *right_val_ptr = NULL;
char *tilde_ptr = NULL, *tmp_ptr = NULL;
u32 left_val, right_val, local_left_val, local_right_val;
char *tilde_ptr = NULL;
u32 left_val, right_val, local_left_val;

if (strcmp(param->name, IFMARKINT) &&
strcmp(param->name, OFMARKINT)) {
Expand Down Expand Up @@ -903,8 +903,8 @@ static int iscsi_check_numerical_range_value(struct iscsi_param *param, char *va
if (iscsi_check_numerical_value(param, right_val_ptr) < 0)
return -1;

left_val = simple_strtoul(left_val_ptr, &tmp_ptr, 0);
right_val = simple_strtoul(right_val_ptr, &tmp_ptr, 0);
left_val = simple_strtoul(left_val_ptr, NULL, 0);
right_val = simple_strtoul(right_val_ptr, NULL, 0);
*tilde_ptr = '~';

if (right_val < left_val) {
Expand All @@ -928,8 +928,7 @@ static int iscsi_check_numerical_range_value(struct iscsi_param *param, char *va
left_val_ptr = param->value;
right_val_ptr = param->value + strlen(left_val_ptr) + 1;

local_left_val = simple_strtoul(left_val_ptr, &tmp_ptr, 0);
local_right_val = simple_strtoul(right_val_ptr, &tmp_ptr, 0);
local_left_val = simple_strtoul(left_val_ptr, NULL, 0);
*tilde_ptr = '~';

if (param->set_param) {
Expand Down Expand Up @@ -1189,7 +1188,7 @@ static int iscsi_check_proposer_state(struct iscsi_param *param, char *value)
if (IS_TYPE_NUMBER_RANGE(param)) {
u32 left_val = 0, right_val = 0, recieved_value = 0;
char *left_val_ptr = NULL, *right_val_ptr = NULL;
char *tilde_ptr = NULL, *tmp_ptr = NULL;
char *tilde_ptr = NULL;

if (!strcmp(value, IRRELEVANT) || !strcmp(value, REJECT)) {
if (iscsi_update_param_value(param, value) < 0)
Expand All @@ -1213,9 +1212,9 @@ static int iscsi_check_proposer_state(struct iscsi_param *param, char *value)

left_val_ptr = param->value;
right_val_ptr = param->value + strlen(left_val_ptr) + 1;
left_val = simple_strtoul(left_val_ptr, &tmp_ptr, 0);
right_val = simple_strtoul(right_val_ptr, &tmp_ptr, 0);
recieved_value = simple_strtoul(value, &tmp_ptr, 0);
left_val = simple_strtoul(left_val_ptr, NULL, 0);
right_val = simple_strtoul(right_val_ptr, NULL, 0);
recieved_value = simple_strtoul(value, NULL, 0);

*tilde_ptr = '~';

Expand Down

0 comments on commit a227fb3

Please sign in to comment.