Introduce generic STRINGIFY and STRINGIFY_VAL macros

[strace] / mknod.c

diff --git a/mknod.c b/mknod.c
index d78fa07febf2bd481532f7a0251302991a3a2b84..0a4e342e7c4b35910da0371b0bd05560d6b34f46 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -6,6 +6,7 @@
  * Copyright (c) 2006 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2006 Bernhard Kaindl <bk@suse.de>
  * Copyright (c) 2006-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
@@ -36,27 +37,21 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#ifdef MAJOR_IN_SYSMACROS
-# include <sys/sysmacros.h>
-#endif
-
-#ifdef MAJOR_IN_MKDEV
-# include <sys/mkdev.h>
-#endif
-
 static void
 decode_mknod(struct tcb *tcp, int offset)
 {
-       int mode = tcp->u_arg[offset + 1];
+       unsigned short mode = tcp->u_arg[offset + 1];
        unsigned int dev;
 
        printpath(tcp, tcp->u_arg[offset]);
-       tprintf(", %s", sprintmode(mode));
+       tprints(", ");
+       print_symbolic_mode_t(mode);
        switch (mode & S_IFMT) {
        case S_IFCHR:
        case S_IFBLK:
                dev = tcp->u_arg[offset + 2];
-               tprintf(", makedev(%u, %u)", major(dev), minor(dev));
+               tprints(", ");
+               print_dev_t(dev);
                break;
        }
 }