Rename PRINT_FIELD_QUOTED_STRING to PRINT_FIELD_STRING

[strace] / print_fields.h

diff --git a/print_fields.h b/print_fields.h
index abf2cf616eb973f678f8311a01e276a2f1d39f74..4d486d3535a5f6e418a9799024e532cc86a25a50 100644 (file)
--- a/print_fields.h
+++ b/print_fields.h
@@ -48,6 +48,11 @@
        STRACE_PRINTF("%s%s=%#llx", (prefix_), #field_,                 \
                      zero_extend_signed_to_ull((where_).field_))
 
+#define PRINT_FIELD_0X(prefix_, where_, field_)                                \
+       STRACE_PRINTF("%s%s=%#0*llx", (prefix_), #field_,               \
+                     (int) sizeof((where_).field_) * 2,                \
+                     zero_extend_signed_to_ull((where_).field_))
+
 #define PRINT_FIELD_COOKIE(prefix_, where_, field_)                    \
        STRACE_PRINTF("%s%s=[%llu, %llu]", (prefix_), #field_,          \
                      zero_extend_signed_to_ull((where_).field_[0]),    \
@@ -74,10 +79,44 @@
                                      zero_extend_signed_to_ull((where_).field_));      \
        } while (0)
 
-#define PRINT_FIELD_QUOTED_STRING(prefix_, where_, field_, len_, style_)               \
+#define PRINT_FIELD_STRING(prefix_, where_, field_, len_, style_)                      \
        do {                                                                            \
                STRACE_PRINTF("%s%s=", (prefix_), #field_);                             \
                print_quoted_string((const char *)(where_).field_, len_, style_);       \
        } while (0)
 
+#define PRINT_FIELD_INET_ADDR(prefix_, where_, field_, af_)            \
+       do {                                                            \
+               STRACE_PRINTF(prefix_);                                 \
+               print_inet_addr((af_), &(where_).field_,                \
+                               sizeof((where_).field_), #field_);      \
+       } while (0)
+
+#define PRINT_FIELD_INET4_ADDR(prefix_, where_, field_)                        \
+       STRACE_PRINTF("%s%s=inet_addr(\"%s\")", (prefix_), #field_,     \
+                     inet_ntoa((where_).field_))
+
+#define PRINT_FIELD_NET_PORT(prefix_, where_, field_)                  \
+       STRACE_PRINTF("%s%s=htons(%u)", (prefix_), #field_,             \
+                     ntohs((where_).field_))
+
+#define PRINT_FIELD_IFINDEX(prefix_, where_, field_)                   \
+       do {                                                            \
+               STRACE_PRINTF("%s%s=", (prefix_), #field_);             \
+               print_ifindex((where_).field_);                         \
+       } while (0)
+
+#define PRINT_FIELD_SOCKADDR(prefix_, where_, field_)                  \
+       do {                                                            \
+               STRACE_PRINTF("%s%s=", (prefix_), #field_);             \
+               print_sockaddr(&(where_).field_,                        \
+                              sizeof((where_).field_));                \
+       } while (0)
+
+#define PRINT_FIELD_DEV(prefix_, where_, field_)                       \
+       do {                                                            \
+               STRACE_PRINTF("%s%s=", (prefix_), #field_);             \
+               print_dev_t((where_).field_);                           \
+       } while (0)
+
 #endif /* !STRACE_PRINT_FIELDS_H */