Merge remote-tracking branch 'origin/stable/3.0'

[mirror_frr.git] / isisd / isis_lsp.c

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 29e5280ce3c2f4271fb738f1a7e902930ca10b2b..48a92bdaafc00aa5c45f63269313c24e2e963c97 100644 (file)
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -842,12 +842,12 @@ lsp_print_mt_reach(struct list *list, struct vty *vty,
       lspid_print(neigh->neigh_id, lspid, dynhost, 0);
       if (mtid == ISIS_MT_IPV4_UNICAST)
         {
-          vty_out(vty, "  Metric      : %-8d IS-Extended   : %s%s",
+          vty_out(vty, "  Metric      : %-8u IS-Extended   : %s%s",
                   GET_TE_METRIC(neigh), lspid, VTY_NEWLINE);
         }
       else
         {
-          vty_out(vty, "  Metric      : %-8d MT-Reach      : %s %s%s",
+          vty_out(vty, "  Metric      : %-8u MT-Reach      : %s %s%s",
                   GET_TE_METRIC(neigh), lspid,
                   isis_mtid2str(mtid), VTY_NEWLINE);
         }
@@ -874,11 +874,11 @@ lsp_print_mt_ipv6_reach(struct list *list, struct vty *vty, uint16_t mtid)
         {
           if ((ipv6_reach->control_info &
                CTRL_INFO_DISTRIBUTION) == DISTRIBUTION_INTERNAL)
-            vty_out (vty, "  Metric      : %-8d IPv6-Internal : %s/%d%s",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-Internal : %s/%d%s",
                      ntohl (ipv6_reach->metric),
                      buff, ipv6_reach->prefix_len, VTY_NEWLINE);
           else
-            vty_out (vty, "  Metric      : %-8d IPv6-External : %s/%d%s",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-External : %s/%d%s",
                      ntohl (ipv6_reach->metric),
                      buff, ipv6_reach->prefix_len, VTY_NEWLINE);
         }
@@ -886,12 +886,12 @@ lsp_print_mt_ipv6_reach(struct list *list, struct vty *vty, uint16_t mtid)
         {
           if ((ipv6_reach->control_info &
                CTRL_INFO_DISTRIBUTION) == DISTRIBUTION_INTERNAL)
-            vty_out (vty, "  Metric      : %-8d IPv6-MT-Int   : %s/%d %s%s",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Int   : %s/%d %s%s",
                      ntohl (ipv6_reach->metric),
                      buff, ipv6_reach->prefix_len,
                      isis_mtid2str(mtid), VTY_NEWLINE);
           else
-            vty_out (vty, "  Metric      : %-8d IPv6-MT-Ext   : %s/%d %s%s",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Ext   : %s/%d %s%s",
                      ntohl (ipv6_reach->metric),
                      buff, ipv6_reach->prefix_len,
                      isis_mtid2str(mtid), VTY_NEWLINE);
@@ -910,7 +910,7 @@ lsp_print_mt_ipv4_reach(struct list *list, struct vty *vty, uint16_t mtid)
       if (mtid == ISIS_MT_IPV4_UNICAST)
         {
           /* FIXME: There should be better way to output this stuff. */
-          vty_out (vty, "  Metric      : %-8d IPv4-Extended : %s/%d%s",
+          vty_out (vty, "  Metric      : %-8" PRIu32 " IPv4-Extended : %s/%d%s",
                    ntohl (te_ipv4_reach->te_metric),
                    inet_ntoa (newprefix2inaddr (&te_ipv4_reach->prefix_start,
                                                 te_ipv4_reach->control)),
@@ -919,7 +919,7 @@ lsp_print_mt_ipv4_reach(struct list *list, struct vty *vty, uint16_t mtid)
       else
         {
           /* FIXME: There should be better way to output this stuff. */
-          vty_out (vty, "  Metric      : %-8d IPv4-MT       : %s/%d %s%s",
+          vty_out (vty, "  Metric      : %-8" PRIu32 " IPv4-MT       : %s/%d %s%s",
                    ntohl (te_ipv4_reach->te_metric),
                    inet_ntoa (newprefix2inaddr (&te_ipv4_reach->prefix_start,
                                                 te_ipv4_reach->control)),
@@ -1025,7 +1025,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
     for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.is_neighs, lnode, is_neigh))
       {
        lspid_print (is_neigh->neigh_id, LSPid, dynhost, 0);
-       vty_out (vty, "  Metric      : %-8d IS            : %s%s",
+       vty_out (vty, "  Metric      : %-8" PRIu8 " IS            : %s%s",
                 is_neigh->metrics.metric_default, LSPid, VTY_NEWLINE);
       }
   
@@ -1038,7 +1038,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
              sizeof (ipv4_reach_prefix));
       memcpy (ipv4_reach_mask, inet_ntoa (ipv4_reach->mask),
              sizeof (ipv4_reach_mask));
-      vty_out (vty, "  Metric      : %-8d IPv4-Internal : %s %s%s",
+      vty_out (vty, "  Metric      : %-8" PRIu8 " IPv4-Internal : %s %s%s",
               ipv4_reach->metrics.metric_default, ipv4_reach_prefix,
               ipv4_reach_mask, VTY_NEWLINE);
     }
@@ -1052,7 +1052,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
              sizeof (ipv4_reach_prefix));
       memcpy (ipv4_reach_mask, inet_ntoa (ipv4_reach->mask),
              sizeof (ipv4_reach_mask));
-      vty_out (vty, "  Metric      : %-8d IPv4-External : %s %s%s",
+      vty_out (vty, "  Metric      : %-8" PRIu8 " IPv4-External : %s %s%s",
               ipv4_reach->metrics.metric_default, ipv4_reach_prefix,
               ipv4_reach_mask, VTY_NEWLINE);
     }