From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 25 Apr 2014 23:39:20 +0000 (+0000)
Subject: Rename several xlat structures to avoid collisions
X-Git-Tag: v4.9~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=297b59401c998a2154b2fd1af7b234e2fa3a9305;p=strace

Rename several xlat structures to avoid collisions

* bjm.c (which): Rename to qm_which.
* ipc.c (msg_flags): Rename to ipc_msg_flags.
* time.c (which): Rename to itimer_which.
---

diff --git a/bjm.c b/bjm.c
index d7acff0d..6fe6f5a4 100644
--- a/bjm.c
+++ b/bjm.c
@@ -69,7 +69,7 @@ struct module_info
 	long usecount;
 };
 
-static const struct xlat which[] = {
+static const struct xlat qm_which[] = {
 	XLAT(0),
 	XLAT(QM_MODULES),
 	XLAT(QM_DEPS),
@@ -96,7 +96,7 @@ sys_query_module(struct tcb *tcp)
 	if (entering(tcp)) {
 		printstr(tcp, tcp->u_arg[0], -1);
 		tprints(", ");
-		printxval(which, tcp->u_arg[1], "QM_???");
+		printxval(qm_which, tcp->u_arg[1], "QM_???");
 		tprints(", ");
 	} else {
 		size_t ret;
diff --git a/ipc.c b/ipc.c
index 144c52bb..f1af8562 100644
--- a/ipc.c
+++ b/ipc.c
@@ -129,7 +129,7 @@ static const struct xlat shm_flags[] = {
 	XLAT_END
 };
 
-static const struct xlat msg_flags[] = {
+static const struct xlat ipc_msg_flags[] = {
 	XLAT(MSG_NOERROR),
 	XLAT(MSG_EXCEPT),
 	XLAT(IPC_NOWAIT),
@@ -203,7 +203,7 @@ tprint_msgsnd(struct tcb *tcp, long addr, unsigned long count,
 		tprints("}");
 	}
 	tprintf(", %lu, ", count);
-	printflags(msg_flags, flags, "MSG_???");
+	printflags(ipc_msg_flags, flags, "MSG_???");
 }
 
 int sys_msgsnd(struct tcb *tcp)
@@ -254,11 +254,11 @@ int sys_msgrcv(struct tcb *tcp)
 				tprint_msgrcv(tcp, (long) tmp.msgp,
 					tcp->u_arg[1], tmp.msgtyp);
 			}
-			printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+			printflags(ipc_msg_flags, tcp->u_arg[2], "MSG_???");
 		} else {
 			tprint_msgrcv(tcp, tcp->u_arg[1],
 				tcp->u_arg[2], tcp->u_arg[3]);
-			printflags(msg_flags, tcp->u_arg[4], "MSG_???");
+			printflags(ipc_msg_flags, tcp->u_arg[4], "MSG_???");
 		}
 	}
 	return 0;
diff --git a/time.c b/time.c
index 174e2fcc..3909d519 100644
--- a/time.c
+++ b/time.c
@@ -279,7 +279,7 @@ sys_nanosleep(struct tcb *tcp)
 	return 0;
 }
 
-static const struct xlat which[] = {
+static const struct xlat itimer_which[] = {
 	XLAT(ITIMER_REAL),
 	XLAT(ITIMER_VIRTUAL),
 	XLAT(ITIMER_PROF),
@@ -338,7 +338,7 @@ int
 sys_getitimer(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		printxval(which, tcp->u_arg[0], "ITIMER_???");
+		printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
 		tprints(", ");
 	} else {
 		if (syserror(tcp))
@@ -354,7 +354,7 @@ int
 sys_osf_getitimer(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		printxval(which, tcp->u_arg[0], "ITIMER_???");
+		printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
 		tprints(", ");
 	} else {
 		if (syserror(tcp))
@@ -370,7 +370,7 @@ int
 sys_setitimer(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		printxval(which, tcp->u_arg[0], "ITIMER_???");
+		printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
 		tprints(", ");
 		printitv(tcp, tcp->u_arg[1]);
 		tprints(", ");
@@ -388,7 +388,7 @@ int
 sys_osf_setitimer(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		printxval(which, tcp->u_arg[0], "ITIMER_???");
+		printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
 		tprints(", ");
 		printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
 		tprints(", ");