diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | examples/sg_tst_excl2.cpp | 7 | ||||
| -rw-r--r-- | examples/sg_tst_excl3.cpp | 7 |
3 files changed, 7 insertions, 9 deletions
@@ -2,7 +2,7 @@ Each utility has its own version number, date of last change and some description at the top of its ".c" file. All utilities in the main directory have their own "man" pages. There is also a sg3_utils man page. -Changelog for sg3_utils-1.38 [20131110] [svn: r530] +Changelog for sg3_utils-1.38 [20131110] [svn: r531] - sg_ses: add --dev-slot-num= and --sas-addr= - sg_inq: add --block=0|1 option to control opens - sg_luns: guard against garbage response 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); |