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 d7acff0dee0cc5686d1b0ad959b29603896fffc5..6fe6f5a4b01b88a65c7a3281a8a0ef6a87cc5cc0 100644 (file)
--- 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 144c52bb0ab30d5559b3af61ded744e31ff241a1..f1af8562e441b8fb2eb071d19ebd69fac53f8d6c 100644 (file)
--- 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 174e2fccf486a0175d26f0d6c34a96d6b1d85842..3909d5192b1c80cd3cc7789d1850af1f4d4f7a8f 100644 (file)
--- 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(", ");