From 5577e44bf4c8f0657f4091f2bf252166da08588e Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 7 Nov 2018 16:56:07 +0000 Subject: [PATCH] Regen after r340221: allow pointer return types. Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17873 --- sys/compat/freebsd32/freebsd32_systrace_args.c | 8 ++++---- sys/kern/systrace_args.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 116d6c40716..745e739ca01 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -8839,7 +8839,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* break */ case 17: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* getpid */ case 20: @@ -9388,7 +9388,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* shmat */ case 228: if (ndx == 0 || ndx == 1) - p = "int"; + p = "void *"; break; /* shmdt */ case 230: @@ -10139,7 +10139,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* freebsd32_mmap */ case 477: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* freebsd32_lseek */ case 478: @@ -10170,7 +10170,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* freebsd32_mmap */ case 477: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* freebsd32_lseek */ case 478: diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 9061b6eb6a8..58e616056d5 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -8788,7 +8788,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* break */ case 17: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* getpid */ case 20: @@ -9357,7 +9357,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* shmat */ case 228: if (ndx == 0 || ndx == 1) - p = "int"; + p = "void *"; break; /* shmdt */ case 230: @@ -10187,7 +10187,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) /* mmap */ case 477: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* lseek */ case 478: