Module Name:    src
Committed By:   joerg
Date:           Sat Nov 15 01:15:45 UTC 2014

Modified Files:
        src/external/bsd/iscsi/dist/src/lib: parameters.c target.c

Log Message:
Drop pointer checks that are always true.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/iscsi/dist/src/lib/parameters.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/iscsi/dist/src/lib/target.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/lib/parameters.c
diff -u src/external/bsd/iscsi/dist/src/lib/parameters.c:1.3 src/external/bsd/iscsi/dist/src/lib/parameters.c:1.4
--- src/external/bsd/iscsi/dist/src/lib/parameters.c:1.3	Thu Mar 15 04:06:54 2012
+++ src/external/bsd/iscsi/dist/src/lib/parameters.c	Sat Nov 15 01:15:45 2014
@@ -919,12 +919,7 @@ answer:
 		if (strcmp(value, "?") == 0) {
 			iscsi_trace(TRACE_ISCSI_PARAM, "got inquiry for param \"%s\"\n", param->key);
 			if (param->value_l) {
-				if (param->value_l->value) {
-					(void) strlcpy(param->answer_tx, param->value_l->value, sizeof(param->answer_tx));
-				} else {
-					iscsi_err(__FILE__, __LINE__, "param \"%s\" has NULL value_l->value\n", param->key);
-					param->answer_tx[0] = 0x0;
-				}
+				(void) strlcpy(param->answer_tx, param->value_l->value, sizeof(param->answer_tx));
 			} else {
 				iscsi_err(__FILE__, __LINE__, "param \"%s\" has NULL value_l\n", param->key);
 				param->answer_tx[0] = 0x0;

Index: src/external/bsd/iscsi/dist/src/lib/target.c
diff -u src/external/bsd/iscsi/dist/src/lib/target.c:1.8 src/external/bsd/iscsi/dist/src/lib/target.c:1.9
--- src/external/bsd/iscsi/dist/src/lib/target.c:1.8	Tue Sep 30 15:24:15 2014
+++ src/external/bsd/iscsi/dist/src/lib/target.c	Sat Nov 15 01:15:45 2014
@@ -762,8 +762,7 @@ text_command_t(target_session_t * sess, 
 			return -1;
 		}
 		if (ptr->rx_offer) {
-			if (ptr->offer_rx &&
-			    strcmp(ptr->offer_rx, "All") == 0 &&
+			if (strcmp(ptr->offer_rx, "All") == 0 &&
 			    !param_equiv(sess->params, "SessionType",
 			    	"Discovery")) {
 				iscsi_trace(TRACE_ISCSI_DEBUG,

Reply via email to