json output bugfix

sflow · Jul 17, 2019 · 6c2963b · 6c2963b
1 parent bdd066c
commit 6c2963b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([sflowtool],[5.03])
+AC_INIT([sflowtool],[5.04])
 AC_CONFIG_SRCDIR([src/sflowtool.c])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)

diff --git a/sflowtool.spec b/sflowtool.spec
@@ -1,6 +1,6 @@
 Summary: tool to ascii-print or forward sFlow datagrams
 Name: sflowtool
-Version: 5.03
+Version: 5.04
 Release: 1%{?dist}
 License: https://www.inmon.com/technology/sflowlicense.txt
 Group: Productivity/Networking/Diagnostic

diff --git a/src/sflowtool.c b/src/sflowtool.c
@@ -946,9 +946,11 @@ static void json_indent() {
 }
 
 static void json_start(char *fname, char bracket) {
-  if(sfConfig.jsonStart == NO) {
-    if(sfConfig.jsonListStart == NO)
-      putchar(',');
+  if(sfConfig.jsonStart) {
+    sfConfig.jsonStart = NO;
+  }
+  else if(sfConfig.jsonListStart == NO) {
+    putchar(',');
     json_indent();
   }
   if(fname)