From 9fbc884d5e7900d4edab95d18dc16d5ca8caa5b5 Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Sun, 20 Dec 2015 16:23:44 +0000 Subject: rescan-scsi-bus.sh: updates from Suse; sg_lib: add 'sense' categories for SCSI statuses; pr2serr() rework; drop SUGGEST_* git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@654 6180dd3e-e324-4e3e-922d-17de1ae2f315 --- src/sg_reset_wp.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'src/sg_reset_wp.c') diff --git a/src/sg_reset_wp.c b/src/sg_reset_wp.c index 8d1acc8c..1e24ebab 100644 --- a/src/sg_reset_wp.c +++ b/src/sg_reset_wp.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -24,6 +23,7 @@ #include "sg_pt.h" #include "sg_cmds_basic.h" #include "sg_unaligned.h" +#include "sg_pr2serr.h" /* A utility program originally written for the Linux OS SCSI subsystem. * @@ -32,7 +32,7 @@ * device. Based on zbc-r04c.pdf . */ -static const char * version_str = "1.03 20151126"; +static const char * version_str = "1.04 20151219"; #define SG_ZONING_OUT_CMDLEN 16 #define RESET_WRITE_POINTER_SA 0x4 @@ -53,26 +53,6 @@ static struct option long_options[] = { }; -#ifdef __GNUC__ -static int pr2serr(const char * fmt, ...) - __attribute__ ((format (printf, 1, 2))); -#else -static int pr2serr(const char * fmt, ...); -#endif - - -static int -pr2serr(const char * fmt, ...) -{ - va_list args; - int n; - - va_start(args, fmt); - n = vfprintf(stderr, fmt, args); - va_end(args); - return n; -} - static void usage() { @@ -182,7 +162,7 @@ main(int argc, char * argv[]) case 'z': ll = sg_get_llnum(optarg); if (-1 == ll) { - fprintf(stderr, "bad argument to '--zone=ID'\n"); + pr2serr("bad argument to '--zone=ID'\n"); return SG_LIB_SYNTAX_ERROR; } zid = (uint64_t)ll; -- cgit v1.2.3