travis: add build environment information to the travis log

[strace] / uid.c

diff --git a/uid.c b/uid.c
index 815a414491740c1a92248460069062bbf8b13d97..0fb810c8b6b9cab6c11356576397b6a2859e891e 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -34,9 +34,9 @@
 #  error invalid STRACE_UID_SIZE
 # endif
 
-# define SIZEIFY(x)            SIZEIFY_(x,STRACE_UID_SIZE)
-# define SIZEIFY_(x,size)      SIZEIFY__(x,size)
-# define SIZEIFY__(x,size)     x ## size
+# define SIZEIFY(x)            SIZEIFY_(x, STRACE_UID_SIZE)
+# define SIZEIFY_(x, size)     SIZEIFY__(x, size)
+# define SIZEIFY__(x, size)    x ## size
 
 # define printuid      SIZEIFY(printuid)
 # define sys_chown     SIZEIFY(sys_chown)
@@ -88,7 +88,8 @@ SYS_FUNC(setuid)
 }
 
 static void
-get_print_uid(struct tcb *tcp, const char *prefix, const long addr)
+get_print_uid(struct tcb *const tcp, const char *const prefix,
+             const kernel_ulong_t addr)
 {
        uid_t uid;
 
@@ -158,13 +159,14 @@ printuid(const char *text, const unsigned int uid)
 static bool
 print_gid(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       printuid("", (* (uid_t *) elem_buf));
+       printuid("", (*(uid_t *) elem_buf));
 
        return true;
 }
 
 static void
-print_groups(struct tcb *tcp, const unsigned int len, const unsigned long addr)
+print_groups(struct tcb *const tcp, const unsigned int len,
+            const kernel_ulong_t addr)
 {
        static unsigned long ngroups_max;
        if (!ngroups_max)