Add more nd_print_trunc() calls

Update the output of a test accordingly.

Moreover:
Avoid printing useless '\n'.

diff --git a/smbutil.c b/smbutil.c
index a3a84b99fd1931132296ca0426f9c3148ae21ca9..0d64bd383ae21aa7d65eda0e2ff3f8583cd2ff74 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -318,8 +318,7 @@ smb_data_print(netdissect_options *ndo, const u_char *buf, u_int len)
     return;
 
 trunc:
-    ND_PRINT("\n");
-    ND_PRINT("WARNING: Short packet. Try increasing the snap length\n");
+    nd_print_trunc(ndo);
 }
 
 
@@ -815,8 +814,7 @@ smb_fdata1(netdissect_options *ndo,
     return(buf);
 
 trunc:
-    ND_PRINT("\n");
-    ND_PRINT("WARNING: Short packet. Try increasing the snap length\n");
+    nd_print_trunc(ndo);
     return(NULL);
 }
 

diff --git a/tests/nbns-valgrind.out b/tests/nbns-valgrind.out
index bb9cc4973f01e1f91bba84ca1864e7f9a638cec3..dfd38c70ea84f52cbe6dd67e575af6ec8794c784 100644 (file)
--- a/tests/nbns-valgrind.out
+++ b/tests/nbns-valgrind.out
@@ -10,7 +10,5 @@ AnswerCount=0
 AuthorityCount=0
 AddressRecCount=0
 QuestionRecords:
-Name=
-WARNING: Short packet. Try increasing the snap length
-
+Name= [|nbt_udp137]