aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2022-04-21 20:03:55 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2022-04-21 20:03:55 +0000
commit4ffd50ff135b8f3e84bed720bdd3f1b4741a965c (patch)
tree12158aaad221d91829fa524b7da441266d1fed4a
parent2f4aaac54eca71f8c5735e06235ddb9610b465b0 (diff)
downloadsg3_utils-4ffd50ff135b8f3e84bed720bdd3f1b4741a965c.tar.gz
test commit to test 'continuous integration'
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@948 6180dd3e-e324-4e3e-922d-17de1ae2f315
-rw-r--r--ChangeLog2
-rw-r--r--src/sg_opcodes.c2
-rw-r--r--testing/sg_tst_json_builder.c11
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 22234747..a8eda388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 pre-release sg3_utils-1.48 [20220420] [svn: r946]
+Changelog for pre-release sg3_utils-1.48 [20220421] [svn: r948]
- sg_z_act_query: new utility for sending either a
Zone activate or Zone query command
- sg_rep_density: new utility for decoding the response of
diff --git a/src/sg_opcodes.c b/src/sg_opcodes.c
index 14216a5e..8f58a3c3 100644
--- a/src/sg_opcodes.c
+++ b/src/sg_opcodes.c
@@ -33,7 +33,7 @@
#include "sg_pt.h"
-static const char * version_str = "0.75 20220420"; /* spc6r06 */
+static const char * version_str = "0.76 20220421"; /* spc6r06 */
#define MY_NAME "sg_opcodes"
diff --git a/testing/sg_tst_json_builder.c b/testing/sg_tst_json_builder.c
index f91e600a..d887ff6e 100644
--- a/testing/sg_tst_json_builder.c
+++ b/testing/sg_tst_json_builder.c
@@ -19,7 +19,9 @@
#include <stdint.h>
#include "../lib/sg_json_builder.h"
+#include "sg_pr2serr.h"
+#define MY_NAME "sg_tst_json_builder"
static json_serialize_opts out_settings = {
@@ -29,18 +31,19 @@ static json_serialize_opts out_settings = {
};
int
-main(int arnum, char * argv[])
+main(int argc, char * argv[])
{
size_t len;
+ sg_json_state jstate;
+ sg_json_state * jstp = &jstate;
json_value * jv1p;
json_value * jv2p;
json_value * jv3p = json_object_new(0);
- json_value * jvp = json_object_new(0);
+ json_value * jvp = NULL;
json_value * jv4p;
json_value * jv5p;
json_value * ja1p = json_array_new(0);
json_value * ja2p;
- json_value * ja3p;
json_value * jsp = json_string_new("hello world 1");
json_value * js2p = json_string_new("hello world 2");
json_value * js3p = json_string_new("hello world 3");
@@ -49,6 +52,8 @@ main(int arnum, char * argv[])
json_value * js12 = json_string_new("duplicate name 1");
char b[8192];
+ sg_json_init_state(jstp);
+ jvp = sg_json_start(MY_NAME, "0.01 20220421", argc, argv, jstp);
jv1p = json_object_push(jvp, "contents", jsp);
if (jvp == jv1p)