aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2013-11-11 01:29:11 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2013-11-11 01:29:11 +0000
commit276c367208df998426db24b311c8f5236a4d4f81 (patch)
treea54947f7cb6e003b7f7b94ee3c46167780ccb688 /examples
parent423983fbe2fa47b627a429b7e0594792ee15b6d9 (diff)
downloadsg3_utils-276c367208df998426db24b311c8f5236a4d4f81.tar.gz
fiddle with sg_tst_excl2 and sg_tst_excl3
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@531 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'examples')
-rw-r--r--examples/sg_tst_excl2.cpp7
-rw-r--r--examples/sg_tst_excl3.cpp7
2 files changed, 6 insertions, 8 deletions
diff --git a/examples/sg_tst_excl2.cpp b/examples/sg_tst_excl2.cpp
index bf014528..cec1c9e3 100644
--- a/examples/sg_tst_excl2.cpp
+++ b/examples/sg_tst_excl2.cpp
@@ -138,8 +138,7 @@ static int
pt_err(int res)
{
if (res < 0)
- fprintf(stderr, " pass through os error: %s\n",
- safe_strerror(-res));
+ fprintf(stderr, " pass through os error: %s\n", safe_strerror(-res));
else if (SCSI_PT_DO_BAD_PARAMS == res)
fprintf(stderr, " bad pass through setup\n");
else if (SCSI_PT_DO_TIMEOUT == res)
@@ -247,8 +246,8 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
if (res) {
console_mutex.lock();
fprintf(stderr, "READ_16 do_scsi_pt() submission error\n");
- console_mutex.unlock();
res = pt_err(res);
+ console_mutex.unlock();
goto err;
}
cat = get_scsi_pt_result_category(ptp);
@@ -286,8 +285,8 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
if (res) {
console_mutex.lock();
fprintf(stderr, "WRITE_16 do_scsi_pt() submission error\n");
- console_mutex.unlock();
res = pt_err(res);
+ console_mutex.unlock();
goto err;
}
cat = get_scsi_pt_result_category(ptp);
diff --git a/examples/sg_tst_excl3.cpp b/examples/sg_tst_excl3.cpp
index 078b1184..c4052a90 100644
--- a/examples/sg_tst_excl3.cpp
+++ b/examples/sg_tst_excl3.cpp
@@ -144,8 +144,7 @@ static int
pt_err(int res)
{
if (res < 0)
- fprintf(stderr, " pass through os error: %s\n",
- safe_strerror(-res));
+ fprintf(stderr, " pass through os error: %s\n", safe_strerror(-res));
else if (SCSI_PT_DO_BAD_PARAMS == res)
fprintf(stderr, " bad pass through setup\n");
else if (SCSI_PT_DO_TIMEOUT == res)
@@ -253,8 +252,8 @@ do_rd_inc_wr_twice(const char * dev_name, int read_only, unsigned int lba,
if (res) {
console_mutex.lock();
fprintf(stderr, "READ_16 do_scsi_pt() submission error\n");
- console_mutex.unlock();
res = pt_err(res);
+ console_mutex.unlock();
goto err;
}
cat = get_scsi_pt_result_category(ptp);
@@ -295,8 +294,8 @@ do_rd_inc_wr_twice(const char * dev_name, int read_only, unsigned int lba,
if (res) {
console_mutex.lock();
fprintf(stderr, "WRITE_16 do_scsi_pt() submission error\n");
- console_mutex.unlock();
res = pt_err(res);
+ console_mutex.unlock();
goto err;
}
cat = get_scsi_pt_result_category(ptp);