diff --git a/include/iscsi-private.h b/include/iscsi-private.h index 9eca824..93d98fc 100644 --- a/include/iscsi-private.h +++ b/include/iscsi-private.h @@ -201,11 +201,11 @@ struct iscsi_scsi_cbdata { struct iscsi_pdu { struct iscsi_pdu *next; -/* There will not be a response to this pdu, so delete it once it is sent on the wire. Dont put it on the wait-queue */ +/* There will not be a response to this pdu, so delete it once it is sent on the wire. Don't put it on the wait-queue */ #define ISCSI_PDU_DELETE_WHEN_SENT 0x00000001 -/* Dont call the CANCEL callback when the context is destroyed */ +/* Don't call the CANCEL callback when the context is destroyed */ #define ISCSI_PDU_NO_CALLBACK 0x00000002 -/* When reconnecting, just drop all these PDUs. Dont re-queue them. +/* When reconnecting, just drop all these PDUs. Don't re-queue them. * This includes any DATA-OUT PDU as well as all NOPs. */ #define ISCSI_PDU_DROP_ON_RECONNECT 0x00000004 diff --git a/lib/connect.c b/lib/connect.c index 4317b7a..f9e9c42 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -70,7 +70,7 @@ iscsi_testunitready_cb(struct iscsi_context *iscsi, int status, } } - /* Dont fail the login just because there is no medium in the device */ + /* Don't fail the login just because there is no medium in the device */ if (status != 0 && task->sense.key == SCSI_SENSE_NOT_READY && (task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT @@ -79,12 +79,12 @@ iscsi_testunitready_cb(struct iscsi_context *iscsi, int status, status = 0; } - /* Dont fail the login just because the medium is reserved */ + /* Don't fail the login just because the medium is reserved */ if (status == SCSI_STATUS_RESERVATION_CONFLICT) { status = 0; } - /* Dont fail the login just because there is a sanitize in progress */ + /* Don't fail the login just because there is a sanitize in progress */ if (status != 0 && task->sense.key == SCSI_SENSE_NOT_READY && task->sense.ascq == SCSI_SENSE_ASCQ_SANITIZE_IN_PROGRESS) { @@ -207,7 +207,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi) SLIST_REMOVE(&iscsi->outqueue, pdu); if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) { /* If an error happened during connect/login, - we dont want to call any of the callbacks. + we don't want to call any of the callbacks. */ if (iscsi->is_loggedin) { pdu->callback(iscsi, SCSI_STATUS_CANCELLED, @@ -219,7 +219,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi) while ((pdu = iscsi->waitpdu)) { SLIST_REMOVE(&iscsi->waitpdu, pdu); /* If an error happened during connect/login, - we dont want to call any of the callbacks. + we don't want to call any of the callbacks. */ if (iscsi->is_loggedin) { pdu->callback(iscsi, SCSI_STATUS_CANCELLED, @@ -329,10 +329,10 @@ try_again: } if (pdu->flags & ISCSI_PDU_DROP_ON_RECONNECT) { - /* We dont want to requeue things like DATA-OUT since these guys + /* We don't want to requeue things like DATA-OUT since these guys * will be reissued automatically anyway once the corresponding * write command is replayed. - * Similarly we dont want to requeue NOPs. + * Similarly we don't want to requeue NOPs. */ iscsi_free_pdu(old_iscsi, pdu); continue; diff --git a/lib/discovery.c b/lib/discovery.c index 2870bd6..fe1ba4f 100644 --- a/lib/discovery.c +++ b/lib/discovery.c @@ -187,7 +187,7 @@ iscsi_process_text_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, return -1; } } else { - iscsi_set_error(iscsi, "Dont know how to handle " + iscsi_set_error(iscsi, "Don't know how to handle " "discovery string : %s", ptr); pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL, pdu->private_data); diff --git a/lib/init.c b/lib/init.c index 1e53751..99437f2 100644 --- a/lib/init.c +++ b/lib/init.c @@ -296,7 +296,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi) while ((pdu = iscsi->outqueue)) { SLIST_REMOVE(&iscsi->outqueue, pdu); if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) { - /* If an error happened during connect/login, we dont want to + /* If an error happened during connect/login, we don't want to call any of the callbacks. */ if (iscsi->is_loggedin) { @@ -308,7 +308,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi) } while ((pdu = iscsi->waitpdu)) { SLIST_REMOVE(&iscsi->waitpdu, pdu); - /* If an error happened during connect/login, we dont want to + /* If an error happened during connect/login, we don't want to call any of the callbacks. */ if (iscsi->is_loggedin) { diff --git a/lib/iscsi-command.c b/lib/iscsi-command.c index f86ccaa..0e24363 100644 --- a/lib/iscsi-command.c +++ b/lib/iscsi-command.c @@ -284,7 +284,7 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun, && pdu->payload_len < (uint32_t)task->expxferlen && pdu->payload_len < iscsi->first_burst_length) { /* We have more data to send, and we are allowed to send - * unsolicited data, so dont flag this PDU as final. + * unsolicited data, so don't flag this PDU as final. */ flags &= ~ISCSI_PDU_SCSI_FINAL; } @@ -518,7 +518,7 @@ iscsi_process_scsi_data_in(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, } dsl = scsi_get_uint32(&in->hdr[4]) & 0x00ffffff; - /* Dont add to reassembly buffer if we already have a user buffer */ + /* Don't add to reassembly buffer if we already have a user buffer */ if (task->iovector_in.iov == NULL) { if (iscsi_add_data(iscsi, &pdu->indata, in->data, dsl, 0) != 0) { iscsi_set_error(iscsi, "Out-of-memory: failed to add data " diff --git a/lib/nop.c b/lib/nop.c index 597fe7c..f228017 100644 --- a/lib/nop.c +++ b/lib/nop.c @@ -42,7 +42,7 @@ iscsi_nop_out_async(struct iscsi_context *iscsi, iscsi_command_cb cb, return -1; } - /* We dont want to requeue these on reconnect */ + /* We don't want to requeue these on reconnect */ pdu->flags |= ISCSI_PDU_DROP_ON_RECONNECT; /* immediate flag */ diff --git a/lib/pdu.c b/lib/pdu.c index 5ae0cc0..99730a3 100644 --- a/lib/pdu.c +++ b/lib/pdu.c @@ -498,7 +498,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in) is_finished = 0; break; default: - iscsi_set_error(iscsi, "Dont know how to handle " + iscsi_set_error(iscsi, "Don't know how to handle " "opcode 0x%02x", opcode); return -1; } diff --git a/lib/socket.c b/lib/socket.c index 4482b61..e48ae36 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -522,7 +522,7 @@ iscsi_read_from_socket(struct iscsi_context *iscsi) } if (in->hdr_pos < ISCSI_HEADER_SIZE) { - /* we dont have the full header yet, so return */ + /* we don't have the full header yet, so return */ return 0; } diff --git a/test-tool/0105_read10_invalid.c b/test-tool/0105_read10_invalid.c index 1acb36c..1440fbb 100644 --- a/test-tool/0105_read10_invalid.c +++ b/test-tool/0105_read10_invalid.c @@ -70,7 +70,7 @@ int T0105_read10_invalid(const char *initiator, const char *url) task->xfer_dir = SCSI_XFER_READ; task->expxferlen = 0; - /* we dont want autoreconnect since some targets will drop the session + /* we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); diff --git a/test-tool/0122_read6_invalid.c b/test-tool/0122_read6_invalid.c index 4c754ad..fb4599c 100644 --- a/test-tool/0122_read6_invalid.c +++ b/test-tool/0122_read6_invalid.c @@ -70,7 +70,7 @@ int T0122_read6_invalid(const char *initiator, const char *url) task->xfer_dir = SCSI_XFER_READ; task->expxferlen = 0; - /* we dont want autoreconnect since some targets will drop the session + /* we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); diff --git a/test-tool/1000_cmdsn_invalid.c b/test-tool/1000_cmdsn_invalid.c index 5b50a56..121ae35 100644 --- a/test-tool/1000_cmdsn_invalid.c +++ b/test-tool/1000_cmdsn_invalid.c @@ -96,7 +96,7 @@ int T1000_cmdsn_invalid(const char *initiator, const char *url) printf("Write 2 blocks with CMDSN > MAXCMDSN ... "); change_cmdsn = 1; - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); @@ -132,7 +132,7 @@ int T1000_cmdsn_invalid(const char *initiator, const char *url) printf("Write 2 blocks with CMDSN == 0 ... ");fflush(stdout); change_cmdsn = 2; - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ diff --git a/test-tool/1010_datasn_invalid.c b/test-tool/1010_datasn_invalid.c index e9e027d..2516f36 100644 --- a/test-tool/1010_datasn_invalid.c +++ b/test-tool/1010_datasn_invalid.c @@ -108,7 +108,7 @@ int T1010_datasn_invalid(const char *initiator, const char *url) local_iscsi_queue_pdu = my_iscsi_queue_pdu; printf("Write 2 DATA-IN with DATASN == 0 ... "); - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); @@ -145,7 +145,7 @@ int T1010_datasn_invalid(const char *initiator, const char *url) iscsi->target_max_recv_data_segment_length = block_size; printf("Write 2 DATA-IN with DATASN == 27 ... "); - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); @@ -182,7 +182,7 @@ int T1010_datasn_invalid(const char *initiator, const char *url) iscsi->target_max_recv_data_segment_length = block_size; printf("Write 2 DATA-IN with DATASN == -1 ... "); - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); @@ -222,7 +222,7 @@ int T1010_datasn_invalid(const char *initiator, const char *url) iscsi->target_max_recv_data_segment_length = block_size; printf("Write 2 DATA-IN with DATASN in reverse order (1, 0) ... "); - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); diff --git a/test-tool/1020_bufferoffset_invalid.c b/test-tool/1020_bufferoffset_invalid.c index 6260dec..8dd6230 100644 --- a/test-tool/1020_bufferoffset_invalid.c +++ b/test-tool/1020_bufferoffset_invalid.c @@ -100,7 +100,7 @@ int T1020_bufferoffset_invalid(const char *initiator, const char *url) local_iscsi_queue_pdu = my_iscsi_queue_pdu; printf("Write 2 DATA-IN with BUFFEROFFSET 1M too high ... "); - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); @@ -137,7 +137,7 @@ int T1020_bufferoffset_invalid(const char *initiator, const char *url) iscsi->target_max_recv_data_segment_length = block_size; printf("Write 2 DATA-IN with BUFFEROFFSET==-%zu ... ", block_size); - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); diff --git a/test-tool/1030_unsolicited_data_overflow.c b/test-tool/1030_unsolicited_data_overflow.c index e49dac6..f646308 100644 --- a/test-tool/1030_unsolicited_data_overflow.c +++ b/test-tool/1030_unsolicited_data_overflow.c @@ -78,7 +78,7 @@ int T1030_unsolicited_data_overflow(const char *initiator, const char *url) buf = malloc(iscsi->first_burst_length); printf("Write too much unsolicited data ... "); - /* we dont want autoreconnect since some targets will drop the session + /* we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); diff --git a/test-tool/1040_saturate_maxcmdsn.c b/test-tool/1040_saturate_maxcmdsn.c index a172f27..49f873b 100644 --- a/test-tool/1040_saturate_maxcmdsn.c +++ b/test-tool/1040_saturate_maxcmdsn.c @@ -80,7 +80,7 @@ int T1040_saturate_maxcmdsn(const char *initiator, const char *url) ret = 0; - /* we dont want autoreconnect since some targets will drop the + /* we don't want autoreconnect since some targets will drop the * on this condition. */ iscsi_set_noautoreconnect(iscsi, 1); diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 2a317cc..d73a7e5 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -161,7 +161,7 @@ wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state * state->finished = 1; state->status = SCSI_STATUS_CANCELLED; state->task->status = SCSI_STATUS_CANCELLED; - /* this may leak memory since we dont free the pdu */ + /* this may leak memory since we don't free the pdu */ while ((pdu = iscsi->outqueue)) { SLIST_REMOVE(&iscsi->outqueue, pdu); } diff --git a/test-tool/test_iscsi_cmdsn_toohigh.c b/test-tool/test_iscsi_cmdsn_toohigh.c index 5a19817..7d24a1a 100644 --- a/test-tool/test_iscsi_cmdsn_toohigh.c +++ b/test-tool/test_iscsi_cmdsn_toohigh.c @@ -58,7 +58,7 @@ void test_iscsi_cmdsn_toohigh(void) iscsic->target_max_recv_data_segment_length = block_size; local_iscsi_queue_pdu = my_iscsi_queue_pdu; change_cmdsn = 1; - /* we dont want autoreconnect since some targets will incorrectly + /* we don't want autoreconnect since some targets will incorrectly * drop the connection on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_iscsi_cmdsn_toolow.c b/test-tool/test_iscsi_cmdsn_toolow.c index e0cbd74..33257ba 100644 --- a/test-tool/test_iscsi_cmdsn_toolow.c +++ b/test-tool/test_iscsi_cmdsn_toolow.c @@ -58,7 +58,7 @@ void test_iscsi_cmdsn_toolow(void) iscsic->target_max_recv_data_segment_length = block_size; local_iscsi_queue_pdu = my_iscsi_queue_pdu; change_cmdsn = 1; - /* we dont want autoreconnect since some targets will incorrectly + /* we don't want autoreconnect since some targets will incorrectly * drop the connection on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_modesense6_residuals.c b/test-tool/test_modesense6_residuals.c index 8124082..fdb2f72 100644 --- a/test-tool/test_modesense6_residuals.c +++ b/test-tool/test_modesense6_residuals.c @@ -35,7 +35,7 @@ test_modesense6_residuals(void) logging(LOG_VERBOSE, "Try a MODESENSE6 command with 4 bytes of " - "transfer length and verify that we dont get residuals."); + "transfer length and verify that we don't get residuals."); if (task != NULL) { scsi_free_scsi_task(task); task = NULL; diff --git a/test-tool/test_read10_invalid.c b/test-tool/test_read10_invalid.c index 56e8504..4de7360 100644 --- a/test-tool/test_read10_invalid.c +++ b/test-tool/test_read10_invalid.c @@ -51,7 +51,7 @@ test_read10_invalid(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_read10_residuals.c b/test-tool/test_read10_residuals.c index aadff5f..f177d44 100644 --- a/test-tool/test_read10_residuals.c +++ b/test-tool/test_read10_residuals.c @@ -52,7 +52,7 @@ test_read10_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_read12_residuals.c b/test-tool/test_read12_residuals.c index 33f346f..38ed3b4 100644 --- a/test-tool/test_read12_residuals.c +++ b/test-tool/test_read12_residuals.c @@ -47,7 +47,7 @@ test_read12_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_read16_residuals.c b/test-tool/test_read16_residuals.c index 127f524..538096e 100644 --- a/test-tool/test_read16_residuals.c +++ b/test-tool/test_read16_residuals.c @@ -47,7 +47,7 @@ test_read16_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_write10_residuals.c b/test-tool/test_write10_residuals.c index 8a1c978..0e8f6c5 100644 --- a/test-tool/test_write10_residuals.c +++ b/test-tool/test_write10_residuals.c @@ -55,7 +55,7 @@ test_write10_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_write12_residuals.c b/test-tool/test_write12_residuals.c index 61be90e..c9e4c78 100644 --- a/test-tool/test_write12_residuals.c +++ b/test-tool/test_write12_residuals.c @@ -55,7 +55,7 @@ test_write12_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_write16_residuals.c b/test-tool/test_write16_residuals.c index 67d0909..e9ecb1c 100644 --- a/test-tool/test_write16_residuals.c +++ b/test-tool/test_write16_residuals.c @@ -55,7 +55,7 @@ test_write16_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_writeverify10_residuals.c b/test-tool/test_writeverify10_residuals.c index cb1b9f4..881da07 100644 --- a/test-tool/test_writeverify10_residuals.c +++ b/test-tool/test_writeverify10_residuals.c @@ -63,7 +63,7 @@ test_writeverify10_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_writeverify12_residuals.c b/test-tool/test_writeverify12_residuals.c index 50a3aec..ac7e731 100644 --- a/test-tool/test_writeverify12_residuals.c +++ b/test-tool/test_writeverify12_residuals.c @@ -63,7 +63,7 @@ test_writeverify12_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1); diff --git a/test-tool/test_writeverify16_residuals.c b/test-tool/test_writeverify16_residuals.c index ad17a36..dc19f03 100644 --- a/test-tool/test_writeverify16_residuals.c +++ b/test-tool/test_writeverify16_residuals.c @@ -64,7 +64,7 @@ test_writeverify16_residuals(void) task->expxferlen = 0; /* - * we dont want autoreconnect since some targets will drop the session + * we don't want autoreconnect since some targets will drop the session * on this condition. */ iscsi_set_noautoreconnect(iscsic, 1);