git: 28ceed5f7aa1 - stable/13 - dtrace tests: Rename some test type names to avoid a conflict
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Aug 2022 14:36:23 UTC
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=28ceed5f7aa1d97324b12344c3d9cd6f2b0a2460 commit 28ceed5f7aa1d97324b12344c3d9cd6f2b0a2460 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2022-08-03 00:32:08 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-08-11 14:36:11 +0000 dtrace tests: Rename some test type names to avoid a conflict Sponsored by: The FreeBSD Foundation (cherry picked from commit 6a05f1438145c2d8c3d0e29e1d5e24a05d394453) --- .../test/tst/common/translators/tst.OutputAliasTrans.d | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d index cd4715319913..c6bfff2181e6 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.OutputAliasTrans.d @@ -37,23 +37,23 @@ #pragma D option quiet -struct input_struct { +struct dtrace_input_struct { int ii; char ic; }; -struct output_struct { +struct dtrace_output_struct { int oi; char oc; }; -typedef struct output_struct output_t; +typedef struct dtrace_output_struct dtrace_output_t; -translator output_t < struct input_struct *ivar > +translator dtrace_output_t < struct dtrace_input_struct *ivar > { - oi = ((struct input_struct *) ivar)->ii; - oc = ((struct input_struct *) ivar)->ic; + oi = ((struct dtrace_input_struct *) ivar)->ii; + oc = ((struct dtrace_input_struct *) ivar)->ic; }; BEGIN