iscsi-target: remove dead code in iscsi_check_valuelist_for_support
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 17 May 2012 07:08:14 +0000 (10:08 +0300)
committerNicholas Bellinger <nab@linux-iscsi.org>
Thu, 17 May 2012 19:04:53 +0000 (12:04 -0700)
Neither "acceptor_values" nor "proposer_values" can be NULL here when
scanning the value lists for incoming iSCSI login parameters such as
HeaderDigest=CRC32C,None.

Smatch complains because we are not allowed to pass NULL pointers to
strchr().  Also I removed a second later check for "!acceptor_values"
because it gets checked on the next line in the do while condition.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/iscsi/iscsi_target_parameters.c

index ad3b3c1..ed5241e 100644 (file)
@@ -1037,13 +1037,6 @@ static char *iscsi_check_valuelist_for_support(
                        tmp2 = strchr(acceptor_values, ',');
                        if (tmp2)
                                *tmp2 = '\0';
-                       if (!acceptor_values || !proposer_values) {
-                               if (tmp1)
-                                       *tmp1 = ',';
-                               if (tmp2)
-                                       *tmp2 = ',';
-                               return NULL;
-                       }
                        if (!strcmp(acceptor_values, proposer_values)) {
                                if (tmp2)
                                        *tmp2 = ',';
@@ -1053,8 +1046,6 @@ static char *iscsi_check_valuelist_for_support(
                                *tmp2++ = ',';
 
                        acceptor_values = tmp2;
-                       if (!acceptor_values)
-                               break;
                } while (acceptor_values);
                if (tmp1)
                        *tmp1++ = ',';