Robustify mpers.awk against invalid input

[strace] / print_mq_attr.c

diff --git a/print_mq_attr.c b/print_mq_attr.c
index 184fff1ca69d16cd8a026387f0b6ea8060dc1521..a43d4376815e7b23c83cfbfada978e7c604df233 100644 (file)
--- a/print_mq_attr.c
+++ b/print_mq_attr.c
@@ -28,17 +28,23 @@
 
 #include "defs.h"
 
+#include DEF_MPERS_TYPE(mq_attr_t)
+
 #ifdef HAVE_MQUEUE_H
 # include <mqueue.h>
+typedef struct mq_attr mq_attr_t;
+#elif defined HAVE_LINUX_MQUEUE_H
+# include <linux/types.h>
+# include <linux/mqueue.h>
+typedef struct mq_attr mq_attr_t;
 #endif
 
-void
-printmqattr(struct tcb *tcp, const long addr)
+#include MPERS_DEFS
+
+MPERS_PRINTER_DECL(void, printmqattr)(struct tcb *tcp, const long addr)
 {
-# ifndef HAVE_MQUEUE_H
-       printaddr(addr);
-# else
-       struct mq_attr attr;
+#if defined HAVE_MQUEUE_H || defined HAVE_LINUX_MQUEUE_H
+       mq_attr_t attr;
        if (umove_or_printaddr(tcp, addr, &attr))
                return;
        tprints("{mq_flags=");
@@ -46,5 +52,7 @@ printmqattr(struct tcb *tcp, const long addr)
        tprintf(", mq_maxmsg=%ld, mq_msgsize=%ld, mq_curmsg=%ld}",
                (long) attr.mq_maxmsg, (long) attr.mq_msgsize,
                (long) attr.mq_curmsgs);
-# endif
+#else
+       printaddr(addr);
+#endif
 }