diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2013-06-04 20:33:26 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2013-06-04 20:33:26 +0000 |
| commit | 5667f0c5f1da0038ea9afe75b098fe632c857bc0 (patch) | |
| tree | 33aee328ac9213c59893213c9c5bdbe3248e29c9 /lib | |
| parent | dac0bec87054e0a862033d9304c45c9ecbe248c6 (diff) | |
| download | sg3_utils-5667f0c5f1da0038ea9afe75b098fe632c857bc0.tar.gz | |
sg_compare_and_write: fix wrprotect bug
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@498 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/Makefile.in | 5 | ||||
| -rw-r--r-- | lib/sg_lib.c | 4 | ||||
| -rw-r--r-- | lib/sg_lib_data.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index f23668f9..18f57dd9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -138,12 +138,14 @@ EXTRA_libsgutils2_la_SOURCES = \ endif -# For C++ testing -# CC = g++ +# For C++/clang testing +## CC = g++ -std=c++11 +## CC = g++ +## CC = clang # -std=<s> can be c99, c11, gnu11, etc. Default is gnu89 (gnu90 is the same) AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99 +# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c11 lib_LTLIBRARIES = libsgutils2.la diff --git a/lib/Makefile.in b/lib/Makefile.in index f315a8b9..41c057fd 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -397,12 +397,11 @@ top_srcdir = @top_srcdir@ @OS_WIN32_MINGW_TRUE@ getopt_long.c -# For C++ testing -# CC = g++ +# For C++/clang testing # -std=<s> can be c99, c11, gnu11, etc. Default is gnu89 (gnu90 is the same) AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c99 +# AM_CFLAGS = -I ../include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -pedantic -std=c11 lib_LTLIBRARIES = libsgutils2.la libsgutils2_la_LDFLAGS = -version-info 2:0:0 libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@ diff --git a/lib/sg_lib.c b/lib/sg_lib.c index 3284ee97..cfc2fd28 100644 --- a/lib/sg_lib.c +++ b/lib/sg_lib.c @@ -468,7 +468,7 @@ uds_referral_descriptor_str(char * b, int blen, const unsigned char * dp, ull <<= 8; ull |= dp[4 + j]; } - n += my_snprintf(b + n, blen - n, " first uds LBA: 0x%"PRIx64 + n += my_snprintf(b + n, blen - n, " first uds LBA: 0x%" PRIx64 "\n", ull); ull = 0; for (j = 0; j < 8; ++j) { @@ -476,7 +476,7 @@ uds_referral_descriptor_str(char * b, int blen, const unsigned char * dp, ull <<= 8; ull |= dp[12 + j]; } - n += my_snprintf(b + n, blen - n, " last uds LBA: 0x%"PRIx64 + n += my_snprintf(b + n, blen - n, " last uds LBA: 0x%" PRIx64 "\n", ull); for (j = 0; j < tpgd; ++j) { tp = dp + 20 + (j * 4); diff --git a/lib/sg_lib_data.c b/lib/sg_lib_data.c index c2330ad4..e884848a 100644 --- a/lib/sg_lib_data.c +++ b/lib/sg_lib_data.c @@ -15,7 +15,7 @@ #endif -const char * sg_lib_version_str = "1.83 20130530"; /* spc4r36, sbc3r32 */ +const char * sg_lib_version_str = "1.84 20130603"; /* spc4r36, sbc3r32 */ #ifdef SG_SCSI_STRINGS struct sg_lib_value_name_t sg_lib_normal_opcodes[] = { |