all: Replace "JavaScript Object Notation\n" with JSON_STR

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index f3a4eebfd3e8e8e1884962f4e11dff2413d3653f..b29fcb0dd486529fcbf6e61487f3b71866c863a3 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -1051,7 +1051,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_routes,
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Display routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_ipv4 = 6;
   union sockunion su;
@@ -1106,7 +1106,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_routes,
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Display routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_ext_community = 5;
   int idx_ipv4 = 7;
@@ -1178,7 +1178,7 @@ DEFUN (show_ip_bgp_vpnv4_all_neighbor_advertised_routes,
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_ipv4 = 6;
   int ret;
@@ -1232,7 +1232,7 @@ DEFUN (show_ip_bgp_vpnv4_rd_neighbor_advertised_routes,
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Display the routes advertised to a BGP neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_ext_community = 5;
   int idx_ipv4 = 7;

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 821111ade365c598033efe1189b540da900dbed7..6ef31c26933e91a23824da0ac71c92bc1a76f03d 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7895,7 +7895,7 @@ DEFUN (show_ip_bgp_ipv4,
        "Display route and more specific routes\n"
        "IPv6 prefix\n"
        "Display route and more specific routes\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   char *vrf = NULL;
   afi_t afi = AFI_IP6;
@@ -8012,7 +8012,7 @@ DEFUN (show_ip_bgp_route,
        "IPv6 prefix\n"
        "Display only the bestpath\n"
        "Display only multipaths\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int prefix_check = 0;
 
@@ -8143,7 +8143,7 @@ DEFUN (show_ip_bgp_instance_all,
        "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   afi_t afi = AFI_IP;
   safi_t safi = SAFI_UNICAST;
@@ -9059,7 +9059,7 @@ DEFUN (show_ip_bgp_neighbor_prefix_counts,
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
        "Display detailed prefix count information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_peer = 4;
   struct peer *peer;
@@ -9084,7 +9084,7 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts,
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
        "Display detailed prefix count information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_word = 4;
   int idx_peer = 6;
@@ -9109,7 +9109,7 @@ DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
        "Display detailed prefix count information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_peer = 4;
   struct peer *peer;
@@ -9134,7 +9134,7 @@ DEFUN (show_bgp_instance_ipv6_neighbor_prefix_counts,
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
        "Display detailed prefix count information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_word = 3;
   int idx_peer = 6;
@@ -9162,7 +9162,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
        "Display detailed prefix count information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_safi = 4;
   int idx_peer = 6;
@@ -9192,7 +9192,7 @@ DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
        "Display detailed prefix count information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_peer = 6;
   struct peer *peer;
@@ -9215,7 +9215,7 @@ DEFUN (show_ip_bgp_vpnv4_all_route_prefix,
        "Display information about all VPNv4 NLRIs\n"
        "Network in the BGP routing table to display\n"
        "Network in the BGP routing table to display\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx = 0;
   char *network = argv_find (argv, argc, "A.B.C.D", &idx) ? argv[idx]->arg : NULL;
@@ -9487,7 +9487,7 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
        "Display the routes advertised to a BGP neighbor\n"
        "Route-map to modify the attributes\n"
        "Name of the route map\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   afi_t afi = AFI_IP6;
   safi_t safi = SAFI_UNICAST;
@@ -9560,7 +9560,7 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter,
        "Neighbor on BGP configured interface\n"
        "Display information received from a BGP neighbor\n"
        "Display the prefixlist filter\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   afi_t afi = AFI_IP6;
   safi_t safi = SAFI_UNICAST;
@@ -9678,7 +9678,7 @@ DEFUN (show_ip_bgp_neighbor_routes,
        "Display flap statistics of the routes learned from neighbor\n"
        "Display the dampened routes received from neighbor\n"
        "Display routes learned from neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   char *vrf = NULL;
   char *peerstr = NULL;

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 7a72ab0908cfeac686c824dd638b0c7455a42408..fb4e0380725c6052caa72e9ea7267ececcaeeb2e 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -5975,7 +5975,7 @@ DEFUN (show_bgp_vrfs,
        IP_STR
        BGP_STR
        "Show BGP VRFs\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct list *inst = bm->bgp;
   struct listnode *node;
@@ -6668,7 +6668,7 @@ DEFUN (show_ip_bgp_summary,
        "Display information for a route distinguisher\n"
        "VPN Route Distinguisher\n"
        "Summary of BGP neighbor status\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   char *vrf = NULL;
   afi_t afi = AFI_IP6;
@@ -8558,7 +8558,7 @@ DEFUN (show_ip_bgp_neighbors,
        "Neighbor to display information about\n"
        "Neighbor to display information about\n"
        "Neighbor on BGP configured interface\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   char *vrf = NULL;
   char *sh_arg = NULL;

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index ad947103417860721ff2cf6254b873b2d4eab1f9..667bc708d9c139541ecf665e4aaf0542c70c15b7 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3397,7 +3397,7 @@ DEFUN (show_ip_ospf,
        SHOW_STR
        IP_STR
        "OSPF information\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -3415,7 +3415,7 @@ DEFUN (show_ip_ospf_instance,
        IP_STR
        "OSPF information\n"
        "Instance ID\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -3808,7 +3808,7 @@ DEFUN (show_ip_ospf_interface,
        "OSPF information\n"
        "Interface information\n"
        "Interface name\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -3828,7 +3828,7 @@ DEFUN (show_ip_ospf_instance_interface,
        "Instance ID\n"
        "Interface information\n"
        "Interface name\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -3965,7 +3965,7 @@ DEFUN (show_ip_ospf_neighbor,
        IP_STR
        "OSPF information\n"
        "Neighbor list\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -3985,7 +3985,7 @@ DEFUN (show_ip_ospf_instance_neighbor,
        "OSPF information\n"
        "Instance ID\n"
        "Neighbor list\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -4078,7 +4078,7 @@ DEFUN (show_ip_ospf_neighbor_all,
        "OSPF information\n"
        "Neighbor list\n"
        "include down status neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -4098,7 +4098,7 @@ DEFUN (show_ip_ospf_instance_neighbor_all,
        "Instance ID\n"
        "Neighbor list\n"
        "include down status neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -4173,7 +4173,7 @@ DEFUN (show_ip_ospf_neighbor_int,
        "OSPF information\n"
        "Neighbor list\n"
        "Interface name\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -4193,7 +4193,7 @@ DEFUN (show_ip_ospf_instance_neighbor_int,
        "Instance ID\n"
        "Neighbor list\n"
        "Interface name\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -4540,7 +4540,7 @@ DEFUN (show_ip_ospf_neighbor_id,
        "OSPF information\n"
        "Neighbor list\n"
        "Neighbor ID\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -4560,7 +4560,7 @@ DEFUN (show_ip_ospf_instance_neighbor_id,
        "Instance ID\n"
        "Neighbor list\n"
        "Neighbor ID\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -4632,7 +4632,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
        "OSPF information\n"
        "Neighbor list\n"
        "detail of all neighbors\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -4652,7 +4652,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail,
        "Instance ID\n"
        "Neighbor list\n"
        "detail of all neighbors\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -4731,7 +4731,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
        "Neighbor list\n"
        "detail of all neighbors\n"
        "include down status neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -4752,7 +4752,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail_all,
        "Neighbor list\n"
        "detail of all neighbors\n"
        "include down status neighbor\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;
@@ -4834,7 +4834,7 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
        "Neighbor list\n"
        "Interface name\n"
        "detail of all neighbors\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct ospf *ospf;
   u_char uj = use_json(argc, argv);
@@ -4855,7 +4855,7 @@ DEFUN (show_ip_ospf_instance_neighbor_int_detail,
        "Neighbor list\n"
        "Interface name\n"
        "detail of all neighbors\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_number = 3;
   struct ospf *ospf;

diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c
index ff84c59432598bcc1d4c11372fbbfef44d407832..ee7276f315eb932d8154bd2715bccdf7338dd77d 100644 (file)
--- a/zebra/zebra_mpls_vty.c
+++ b/zebra/zebra_mpls_vty.c
@@ -786,7 +786,7 @@ DEFUN (show_mpls_table,
        SHOW_STR
        MPLS_STR
        "MPLS table\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   struct zebra_vrf *zvrf;
   u_char use_json = (argv[3]->arg != NULL);
@@ -803,7 +803,7 @@ DEFUN (show_mpls_table_lsp,
        MPLS_STR
        "MPLS table\n"
        "LSP to display information about\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   u_int32_t label;
   struct zebra_vrf *zvrf;

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 755abd6e34c5d14da9c2680fa08410ee1d46bc3d..d79aca706f1bbcb582042444ffa78bcbfe0d9ea4 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1197,7 +1197,7 @@ DEFUN (show_ip_route,
        SHOW_STR
        IP_STR
        "IP routing table\n"
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   return do_show_ip_route (vty, VRF_DEFAULT_NAME, SAFI_UNICAST, use_json(argc, argv));
 }
@@ -1293,7 +1293,7 @@ DEFUN (show_ip_route_vrf,
        IP_STR
        "IP routing table\n"
        VRF_CMD_HELP_STR
-       "JavaScript Object Notation\n")
+       JSON_STR)
 {
   int idx_vrf = 4;
   u_char uj = use_json(argc, argv);