diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2022-06-25 04:05:14 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2022-06-25 04:05:14 +0000 |
commit | 2e225c87784735360e9619766efe06782179a86a (patch) | |
tree | 1df2832c733c55207261b829ec7f0146287afe82 /testing | |
parent | a3eb530bb4b93949287f19a2b6fb418901f1f699 (diff) | |
download | sg3_utils-2e225c87784735360e9619766efe06782179a86a.tar.gz |
sg_rem_rest_elem: new utility for removing or restoring elements; bug fixes
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@955 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'testing')
-rw-r--r-- | testing/sg_mrq_dd.cpp | 4 | ||||
-rw-r--r-- | testing/sg_tst_json_builder.c | 3 | ||||
-rw-r--r-- | testing/sgh_dd.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/testing/sg_mrq_dd.cpp b/testing/sg_mrq_dd.cpp index 9f17146c..0706f1af 100644 --- a/testing/sg_mrq_dd.cpp +++ b/testing/sg_mrq_dd.cpp @@ -30,7 +30,7 @@ * */ -static const char * version_str = "1.41 20220413"; +static const char * version_str = "1.42 20220615"; #define _XOPEN_SOURCE 600 #ifndef _GNU_SOURCE @@ -1912,7 +1912,7 @@ normal_in_rd(Rq_elem * rep, int64_t lba, int blocks, int d_boff) if (clp->in_flags.zero && clp->in_flags.ff && (rep->bs >= 4)) { uint32_t pos = (uint32_t)lba; - uint off; + uint32_t off; for (k = 0, off = 0; k < blocks; ++k, off += rep->bs, ++pos) { for (j = 0; j < (rep->bs - 3); j += 4) diff --git a/testing/sg_tst_json_builder.c b/testing/sg_tst_json_builder.c index 039c10fe..d48e8cfe 100644 --- a/testing/sg_tst_json_builder.c +++ b/testing/sg_tst_json_builder.c @@ -68,7 +68,8 @@ main(int argc, char * argv[]) printf("jv2p->type=%d\n", jv2p->type); else printf("jv2p is NULL\n"); - ja2p = json_array_push(ja1p, json_string_new("hello world 99")); + ja2p = json_array_push(ja1p, json_string_new( + "test double quote, etc: \" world \\ 99\t\ttwo tabs")); if (ja2p) printf("ja2p->type=%d\n", ja2p->type); else diff --git a/testing/sgh_dd.cpp b/testing/sgh_dd.cpp index 90577f88..0985449a 100644 --- a/testing/sgh_dd.cpp +++ b/testing/sgh_dd.cpp @@ -36,7 +36,7 @@ * renamed [20181221] */ -static const char * version_str = "2.19 20220118"; +static const char * version_str = "2.20 20220616"; #define _XOPEN_SOURCE 600 #ifndef _GNU_SOURCE @@ -1893,7 +1893,7 @@ normal_in_rd(Rq_elem * rep, int blocks) if (clp->in_flags.zero && clp->in_flags.ff && (rep->bs >= 4)) { uint32_t pos = (uint32_t)rep->iblk; - uint off; + uint32_t off; for (k = 0, off = 0; k < blocks; ++k, off += rep->bs, ++pos) { for (j = 0; j < (rep->bs - 3); j += 4) |