From 218811da1b417c8ac1640a6bc0dcbe38da2e1e0a Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Wed, 16 Nov 2016 20:22:21 +0000
Subject: [PATCH] Use the CJSON module to generate JSON formatting instead of
 hand coding it.

---
 packages/base/any/onlp/src/onlplib/.module    |  1 +
 .../any/onlp/src/onlplib/module/src/onie.c    | 67 ++++++++++++-------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/packages/base/any/onlp/src/onlplib/.module b/packages/base/any/onlp/src/onlplib/.module
index 215a822f..7cf3968c 100644
--- a/packages/base/any/onlp/src/onlplib/.module
+++ b/packages/base/any/onlp/src/onlplib/.module
@@ -1 +1,2 @@
 name: onlplib
+depends: cjson
diff --git a/packages/base/any/onlp/src/onlplib/module/src/onie.c b/packages/base/any/onlp/src/onlplib/module/src/onie.c
index 2ce139f2..eecd5feb 100644
--- a/packages/base/any/onlp/src/onlplib/module/src/onie.c
+++ b/packages/base/any/onlp/src/onlplib/module/src/onie.c
@@ -395,38 +395,53 @@ onlp_onie_show(onlp_onie_info_t* info, aim_pvs_t* pvs)
     }
 }
 
+#include <cjson/cJSON.h>
+
 void
 onlp_onie_show_json(onlp_onie_info_t* info, aim_pvs_t* pvs)
 {
-    aim_printf(pvs, "{\n");
+    cJSON* cj = cJSON_CreateObject();
 
-#define STROUT(_name, _member)                                   \
-    do {                                                         \
-        aim_printf(pvs, "    \"%s\" : ", #_name);                 \
-        if(info-> _member) {                                     \
-            aim_printf(pvs, "\"%s\",\n", info->_member);         \
-        }                                                        \
-        else {                                                   \
-            aim_printf(pvs, "null,\n");                          \
-        }                                                        \
+#define _S(_name, _member)                                              \
+    do {                                                                \
+        if(info-> _member) {                                            \
+            cJSON_AddStringToObject(cj, #_name, info-> _member);        \
+        } else {                                                        \
+            cJSON_AddNullToObject(cj, #_name);                          \
+        }                                                               \
     } while(0)
 
-    STROUT(Product Name, product_name);
-    STROUT(Part Number, part_number);
-    STROUT(Serial Number, serial_number);
-    aim_printf(pvs, "    \"MAC\": \"%{mac}\", ", info->mac);
-    aim_printf(pvs, "    \"MAC Range\": %d,\n", info->mac_range);
-    STROUT(Manufacture Date,manufacture_date);
-    STROUT(Vendor,vendor);
-    STROUT(Platform Name,platform_name);
-    aim_printf(pvs, "    \"Device Version\": %u,\n", info->device_version);
-    STROUT(Label Revision,label_revision);
-    STROUT(Country Code,country_code);
-    STROUT(Diag Version,diag_version);
-    STROUT(Service Tag,service_tag);
-    STROUT(ONIE Version,onie_version);
-    aim_printf(pvs, "    \"CRC\": \"0x%x\"\n", info->crc);
-    aim_printf(pvs, "}\n");
+#define _N(_name, _member)                                      \
+    do {                                                        \
+        cJSON_AddNumberToObject(cj, #_name, info-> _member);    \
+    } while(0)
+
+    _S(Product Name, product_name);
+    _S(Part Number, part_number);
+    _S(Serial Number, serial_number);
+    {
+        char* mac = aim_dfstrdup("%{mac}", info->mac);
+        cJSON_AddStringToObject(cj, "MAC", mac);
+        aim_free(mac);
+    }
+    _S(Manufacture Date,manufacture_date);
+    _S(Vendor,vendor);
+    _S(Platform Name,platform_name);
+    _S(Label Revision,label_revision);
+    _S(Country Code,country_code);
+    _S(Diag Version,diag_version);
+    _S(Service Tag,service_tag);
+    _S(ONIE Version,onie_version);
+    _N(Device Version, device_version);
+    {
+        char* crc = aim_fstrdup("0x%x", info->crc);
+        cJSON_AddStringToObject(cj, "CRC", crc);
+        aim_free(crc);
+    }
+    char* out = cJSON_Print(cj);
+    aim_printf(pvs, "%s\n", out);
+    free(out);
+    cJSON_Delete(cj);
 }