diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-06-03 23:59:56 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-06-03 23:59:56 +0000 |
| commit | e05f7acda57fbbbad555df38fef89aa70447b590 (patch) | |
| tree | eeb77582446b28c0b89f2415f8a0a34eef3e1fc4 /lib/sg_cmds_basic.c | |
| parent | 14a6fbe3500a5ead474126ded5e0f1df8dd88ade (diff) | |
| download | sg3_utils-e05f7acda57fbbbad555df38fef89aa70447b590.tar.gz | |
sg_decode sense: add --err=ES; sg_dd, sgp_dd, sgm_dd: add --dry-run and --verbose options; introduce SG3_UTILS_DSENSE environment variable; sg_lib: add sg_nvme_desc2sense(), sg_build_sense_buffer(), and pr2ws()
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@777 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib/sg_cmds_basic.c')
| -rw-r--r-- | lib/sg_cmds_basic.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/lib/sg_cmds_basic.c b/lib/sg_cmds_basic.c index 4b91ec57..ad298896 100644 --- a/lib/sg_cmds_basic.c +++ b/lib/sg_cmds_basic.c @@ -30,6 +30,7 @@ #include "sg_cmds_basic.h" #include "sg_pt.h" #include "sg_unaligned.h" +#include "sg_pr2serr.h" /* Needs to be after config.h */ #ifdef SG_LIB_LINUX @@ -37,7 +38,7 @@ #endif -static const char * const version_str = "1.87 20180522"; +static const char * const version_str = "1.88 20180603"; #define SENSE_BUFF_LEN 64 /* Arbitrary, could be larger */ @@ -65,26 +66,6 @@ sg_cmds_version() return version_str; } -#if defined(__GNUC__) || defined(__clang__) -static int pr2ws(const char * fmt, ...) - __attribute__ ((format (printf, 1, 2))); -#else -static int pr2ws(const char * fmt, ...); -#endif - - -static int -pr2ws(const char * fmt, ...) -{ - va_list args; - int n; - - va_start(args, fmt); - n = vfprintf(sg_warnings_strm ? sg_warnings_strm : stderr, fmt, args); - va_end(args); - return n; -} - /* Returns file descriptor >= 0 if successful. If error in Unix returns negated errno. */ int |