print_inet_addr: print nameless and named addresses using the same style

[strace] / sysmips.c

diff --git a/sysmips.c b/sysmips.c
index d7d5455e1dcb11bdb489b5a2ee33f674d0ce5410..e095cb3617226a98ec32f16ea678eb2e0baa17e2 100644 (file)
--- a/sysmips.c
+++ b/sysmips.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 2001 Wichert Akkerman <wichert@deephackmode.org>
+ * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
 
 #ifdef MIPS
@@ -17,30 +46,35 @@
 
 SYS_FUNC(sysmips)
 {
-       if (entering(tcp)) {
-               printxval(sysmips_operations, tcp->u_arg[0], "???");
-               if (!verbose(tcp)) {
-                       tprintf("%ld, %ld, %ld", tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
-               } else if (tcp->u_arg[0] == SETNAME) {
-                       char nodename[__NEW_UTS_LEN + 1];
-                       tprints(", ");
-                       if (umovestr(tcp, tcp->u_arg[1], (__NEW_UTS_LEN + 1),
-                                    nodename) < 0) {
-                               tprintf("%#lx", tcp->u_arg[1]);
-                       } else {
-                               print_quoted_string(nodename, __NEW_UTS_LEN + 1,
-                                                   QUOTE_0_TERMINATED);
-                       }
-               } else if (tcp->u_arg[0] == MIPS_ATOMIC_SET) {
-                       tprintf(", %#lx, 0x%lx", tcp->u_arg[1], tcp->u_arg[2]);
-               } else if (tcp->u_arg[0] == MIPS_FIXADE) {
-                       tprintf(", 0x%lx", tcp->u_arg[1]);
+       printxval64(sysmips_operations, tcp->u_arg[0], "???");
+       tprints(", ");
+
+       switch (tcp->u_arg[0]) {
+       case SETNAME: {
+               char nodename[__NEW_UTS_LEN + 1];
+
+               if (!verbose(tcp))
+                       break;
+               if (umovestr(tcp, tcp->u_arg[1], (__NEW_UTS_LEN + 1),
+                            nodename) < 0) {
+                       printaddr(tcp->u_arg[1]);
                } else {
-                       tprintf("%ld, %ld, %ld", tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
+                       print_quoted_cstring(nodename, __NEW_UTS_LEN + 1);
                }
+               return RVAL_DECODED;
+       }
+       case MIPS_ATOMIC_SET:
+               printaddr(tcp->u_arg[1]);
+               tprintf(", %#" PRI_klx, tcp->u_arg[2]);
+               return RVAL_DECODED;
+       case MIPS_FIXADE:
+               tprintf("%#" PRI_klx, tcp->u_arg[1]);
+               return RVAL_DECODED;
        }
 
-       return 0;
+       tprintf("%" PRI_kld ", %" PRI_kld ", %" PRI_kld,
+               tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
+       return RVAL_DECODED;
 }
 
 #endif /* MIPS */