NDOize safeputs() and safeputchar()

[tcpdump] / print-lldp.c

diff --git a/print-lldp.c b/print-lldp.c
index e6cad7eb66f409b08430f56aea62d0c084ab47f2..f569da1eb364251f74155d594d3cb9ef3894e392 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -679,7 +679,7 @@ lldp_private_8021_print(const u_char *tptr, u_int tlv_len)
             return hexdump;
         }
         printf("\n\t    vlan name: ");
-        safeputs((const char *)tptr+7, sublen);
+        safeputs(gndo, tptr + 7, sublen);
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_IDENTITY:
         if (tlv_len < 5) {
@@ -690,7 +690,7 @@ lldp_private_8021_print(const u_char *tptr, u_int tlv_len)
             return hexdump;
         }
         printf("\n\t    protocol identity: ");
-        safeputs((const char *)tptr+5, sublen);
+        safeputs(gndo, tptr + 5, sublen);
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION_LENGTH){
@@ -1006,7 +1006,7 @@ lldp_private_tia_print(const u_char *tptr, u_int tlv_len)
                    *(tptr+6));
 
             /* Country code */
-            safeputs((const char *)(tptr+7), 2);
+            safeputs(gndo, tptr + 7, 2);
 
             lci_len = lci_len-3;
             tptr = tptr + 9;
@@ -1034,7 +1034,7 @@ lldp_private_tia_print(const u_char *tptr, u_int tlv_len)
                    return hexdump;
                }
 
-                safeputs((const char *)tptr, ca_len);
+                safeputs(gndo, tptr, ca_len);
                 tptr += ca_len;
                 lci_len -= ca_len;
             }
@@ -1042,7 +1042,7 @@ lldp_private_tia_print(const u_char *tptr, u_int tlv_len)
 
         case LLDP_TIA_LOCATION_DATA_FORMAT_ECS_ELIN:
             printf("\n\t    ECS ELIN id ");
-            safeputs((const char *)tptr+5, tlv_len-5);
+            safeputs(gndo, tptr + 5, tlv_len - 5);
             break;
 
         default:
@@ -1079,7 +1079,7 @@ lldp_private_tia_print(const u_char *tptr, u_int tlv_len)
     case LLDP_PRIVATE_TIA_SUBTYPE_INVENTORY_ASSET_ID:
         printf("\n\t  %s ",
                tok2str(lldp_tia_inventory_values, "unknown", subtype));
-        safeputs((const char *)tptr+4, tlv_len-4);
+        safeputs(gndo, tptr + 4, tlv_len - 4);
         break;
 
     default:
@@ -1352,7 +1352,7 @@ lldp_mgmt_addr_tlv_print(const u_char *pptr, u_int len) {
         }
         if (oid_len) {
             printf("\n\t  OID length %u", oid_len);
-            safeputs((const char *)tptr+1, oid_len);
+            safeputs(gndo, tptr + 1, oid_len);
         }
     }
 
@@ -1427,7 +1427,7 @@ lldp_print(register const u_char *pptr, register u_int len) {
                 case LLDP_CHASSIS_CHASSIS_COMP_SUBTYPE:
                 case LLDP_CHASSIS_INTF_ALIAS_SUBTYPE:
                 case LLDP_CHASSIS_PORT_COMP_SUBTYPE:
-                    safeputs((const char *)tptr+1, tlv_len-1);
+                    safeputs(gndo, tptr + 1, tlv_len - 1);
                     break;
 
                 case LLDP_CHASSIS_NETWORK_ADDR_SUBTYPE:
@@ -1468,7 +1468,7 @@ lldp_print(register const u_char *pptr, register u_int len) {
                 case LLDP_PORT_AGENT_CIRC_ID_SUBTYPE:
                 case LLDP_PORT_INTF_ALIAS_SUBTYPE:
                 case LLDP_PORT_PORT_COMP_SUBTYPE:
-                    safeputs((const char *)tptr+1, tlv_len-1);
+                    safeputs(gndo, tptr + 1, tlv_len - 1);
                     break;
 
                 case LLDP_PORT_NETWORK_ADDR_SUBTYPE:
@@ -1498,7 +1498,7 @@ lldp_print(register const u_char *pptr, register u_int len) {
         case LLDP_PORT_DESCR_TLV:
             if (vflag) {
                 printf(": ");
-                safeputs((const char *)tptr, tlv_len);
+                safeputs(gndo, tptr, tlv_len);
             }
             break;
 
@@ -1508,13 +1508,13 @@ lldp_print(register const u_char *pptr, register u_int len) {
              * similar to the CDP printer.
              */
             printf(": ");
-            safeputs((const char *)tptr, tlv_len);
+            safeputs(gndo, tptr, tlv_len);
             break;
 
         case LLDP_SYSTEM_DESCR_TLV:
             if (vflag) {
                 printf("\n\t  ");
-                safeputs((const char *)tptr, tlv_len);
+                safeputs(gndo, tptr, tlv_len);
             }
             break;