More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index 5aea478d76c3e4ea5f1c5b474032782c3f60b8b5..c40ed3b899ede027e704361512a0e68fd453a85e 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -39,6 +39,8 @@
 #include "interface.h"
 #include "extract.h"
 
+static const char tstr[] = " [|zmtp1]";
+
 /* Maximum number of ZMTP/1.0 frame body bytes (without the flags) to dump in
  * hex and ASCII under a single "-v" flag.
  */
@@ -133,7 +135,7 @@ zmtp1_print_frame(const u_char *cp, const u_char *ep) {
        return cp + header_len + body_len_declared;
 
 trunc:
-       printf(" [|zmtp1]");
+       printf("%s", tstr);
        return ep;
 }
 
@@ -169,7 +171,7 @@ zmtp1_print_intermediate_part(const u_char *cp, const u_int len) {
 
        TCHECK2(*cp, 2);
        frame_offset = EXTRACT_16BITS(cp);
-       printf("\n\t frame offset 0x%04"PRIx16"", frame_offset);
+       printf("\n\t frame offset 0x%04x", frame_offset);
        cp += 2;
        remaining_len = snapend - cp; /* without the frame length */
 
@@ -200,7 +202,7 @@ zmtp1_print_intermediate_part(const u_char *cp, const u_int len) {
        return cp + frame_offset;
 
 trunc:
-       printf(" [|zmtp1]");
+       printf("%s", tstr);
        return cp + len;
 }