From: Elvira Khabirova <lineprinter0@gmail.com>
Date: Thu, 20 Aug 2015 18:14:29 +0000 (+0300)
Subject: mq.c: remove repeated code
X-Git-Tag: v4.11~262
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3585b06f79640bbcfb427987e12c6b94fc612012;p=strace

mq.c: remove repeated code

* mq.c (sys_mq_open): Use printmqattr instead of implementing it again.
[HAVE_MQUEUE_H]: Remove.
---

diff --git a/mq.c b/mq.c
index a6d7512d..464045ff 100644
--- a/mq.c
+++ b/mq.c
@@ -29,10 +29,6 @@
 #include "defs.h"
 #include <fcntl.h>
 
-#ifdef HAVE_MQUEUE_H
-# include <mqueue.h>
-#endif
-
 extern void printmqattr(struct tcb *tcp, const long addr);
 
 SYS_FUNC(mq_open)
@@ -44,16 +40,7 @@ SYS_FUNC(mq_open)
 	if (tcp->u_arg[1] & O_CREAT) {
 		/* mode */
 		tprintf(", %#lo, ", tcp->u_arg[2]);
-# ifndef HAVE_MQUEUE_H
-		printaddr(tcp->u_arg[3]);
-# else
-		struct mq_attr attr;
-
-		if (!umove_or_printaddr(tcp, tcp->u_arg[3], &attr))
-			tprintf("{mq_maxmsg=%ld, mq_msgsize=%ld}",
-				(long) attr.mq_maxmsg,
-				(long) attr.mq_msgsize);
-# endif
+		printmqattr(tcp, tcp->u_arg[3]);
 	}
 	return RVAL_DECODED;
 }