[DTrace-devel] [PATCH v2] Refactoring for greater stylistic consistency
eugene.loh at oracle.com
eugene.loh at oracle.com
Wed Jan 6 12:30:40 PST 2021
From: Eugene Loh <eugene.loh at oracle.com>
Make stylistic changes for greater consistency. Where possible:
- eliminate "(void)" on function calls
- eliminate parentheses on "return" argument
- eliminate {} on single-statement "if" and "else" blocks
(this was not done exhaustively)
- eliminate space in "sizeof ()"
- eliminate space in "(typecast) foo"
- eliminate spaces immediately inside parentheses
- consolidate to fewer lines
(e.g., where the above changes made lines sufficiently shorter)
Update copyright notices of impacted files.
Add a document listing these and other coding-style guidelines.
Code in libbpf/ was not touched, since we expect not to retain
that code long term.
---
CODING-STYLE | 96 +++
bpf/get_bvar.c | 10 +-
cmd/ctf_module_dump.c | 4 +-
cmd/dtrace.c | 231 +++---
include/dtrace/actions_defines.h | 6 +-
include/dtrace/dif.h | 4 +-
include/dtrace/dif_defines.h | 4 +-
include/dtrace/metadesc.h | 8 +-
include/sys/bitmap.h | 6 +-
libdtrace/dt_as.c | 18 +-
libdtrace/dt_buf.c | 16 +-
libdtrace/dt_cc.c | 161 ++--
libdtrace/dt_cg.c | 40 +-
libdtrace/dt_consume.c | 320 ++++----
libdtrace/dt_decl.c | 134 ++--
libdtrace/dt_dis.c | 12 +-
libdtrace/dt_dlibs.c | 6 +-
libdtrace/dt_dof.c | 233 +++---
libdtrace/dt_error.c | 30 +-
libdtrace/dt_grammar.y | 8 +-
libdtrace/dt_handle.c | 113 ++-
libdtrace/dt_ident.c | 121 ++-
libdtrace/dt_kernel_module.c | 18 +-
libdtrace/dt_lex.l | 314 ++++----
libdtrace/dt_link.c | 385 +++++----
libdtrace/dt_module.c | 181 +++--
libdtrace/dt_open.c | 110 +--
libdtrace/dt_options.c | 298 +++----
libdtrace/dt_parser.c | 754 +++++++++---------
libdtrace/dt_pcap.c | 50 +-
libdtrace/dt_pcb.c | 18 +-
libdtrace/dt_pid.c | 91 +--
libdtrace/dt_pragma.c | 15 +-
libdtrace/dt_printf.c | 379 +++++----
libdtrace/dt_probe.c | 70 +-
libdtrace/dt_proc.c | 126 +--
libdtrace/dt_program.c | 92 +--
libdtrace/dt_provider.c | 18 +-
libdtrace/dt_regset.c | 2 +-
libdtrace/dt_string.c | 31 +-
libdtrace/dt_strtab.c | 54 +-
libdtrace/dt_subr.c | 225 +++---
libdtrace/dt_symbol_modops.h | 27 +-
libdtrace/dt_symtab.c | 38 +-
libdtrace/dt_work.c | 20 +-
libdtrace/dt_xlator.c | 44 +-
libdtrace/ip.d | 6 +-
libdtrace/mkerrtags.sh | 8 +-
libdtrace/mknames.sh | 8 +-
libport/gmatch.c | 2 +-
libport/p_online.c | 4 +-
libport/strlcat.c | 8 +-
libport/strlcpy.c | 8 +-
libproc/Pcontrol.c | 196 ++---
libproc/Pcontrol.h | 4 +-
libproc/Psymtab.c | 244 +++---
libproc/arm64/isadep.c | 12 +-
libproc/arm64/isadep.h | 6 +-
libproc/elfish.c | 20 +-
libproc/elfish_64.c | 22 +-
libproc/i386/isadep.c | 26 +-
libproc/i386/isadep.h | 12 +-
libproc/isadep_dispatch.c | 6 +-
libproc/libproc.h | 8 +-
libproc/mkoffsets.sh | 12 +-
libproc/rtld_db.c | 52 +-
libproc/sparc/isadep.c | 12 +-
test/demo/struct/kstat.d | 4 +-
test/stress/misc/tst.roch.d | 10 +-
test/triggers/bogus-ioctl.c | 17 +-
test/triggers/libproc-consistency.c | 24 +-
test/triggers/libproc-execing-bkpts-victim.c | 2 +-
test/triggers/libproc-execing-bkpts.c | 6 +-
test/triggers/libproc-lookup-by-name.c | 4 +-
test/triggers/libproc-lookup-victim.c | 2 +-
test/triggers/libproc-pldd.c | 34 +-
test/triggers/pid-tst-args1.c | 6 +-
test/triggers/pid-tst-float.c | 6 +-
test/triggers/pid-tst-fork.c | 10 +-
test/triggers/pid-tst-gcc.c | 13 +-
test/triggers/pid-tst-ret1.c | 8 +-
test/triggers/pid-tst-ret2.c | 6 +-
test/triggers/pid-tst-vfork.c | 8 +-
test/triggers/pid-tst-weak1.c | 6 +-
test/triggers/pid-tst-weak2.c | 6 +-
test/triggers/proc-tst-sigwait.c | 16 +-
test/triggers/profile-tst-ufuncsort.c | 4 +-
test/triggers/raise-tst-raise1.c | 14 +-
test/triggers/raise-tst-raise2.c | 9 +-
test/triggers/raise-tst-raise3.c | 9 +-
test/triggers/syscall-tst-args.c | 9 +-
test/triggers/usdt-tst-argmap.c | 4 +-
test/triggers/usdt-tst-args.c | 4 +-
test/triggers/usdt-tst-forker.c | 6 +-
test/triggers/ustack-tst-bigstack.c | 4 +-
test/triggers/ustack-tst-mtspin.c | 12 +-
test/triggers/ustack-tst-spin.c | 12 +-
.../aggs/err.D_LQUANT_MISMATCH.lqbadarg2.d | 2 +-
test/unittest/aggs/tst.aggmod_full2.sh | 2 +-
test/unittest/aggs/tst.lquantize.d | 2 +-
test/unittest/aggs/tst.subr.d | 8 +-
test/unittest/arithmetic/tst.basics.d | 2 +-
.../err.D_SIZEOF_BITFIELD.SizeofBitfield.d | 6 +-
test/unittest/bitfields/tst.SizeofBitField.d | 24 +-
test/unittest/bitfields/tst.SizeofBitField.r | 18 +-
.../builtinvar/tst.psinfo-bug21984854.d | 8 +-
test/unittest/consumer/addr2str-null.c | 4 +-
.../consumer/tst.merge_ranges_bug25767469.c | 37 +-
test/unittest/consumer/tst.symbols.c | 36 +-
test/unittest/error/tst.DTRACEFLT_BADADDR2.d | 4 +-
test/unittest/error/tst.DTRACEFLT_UNKNOWN.d | 2 +-
test/unittest/funcs/err.badalloca.d | 6 +-
test/unittest/funcs/err.badbcopy.d | 6 +-
test/unittest/funcs/err.badbcopy1.d | 4 +-
test/unittest/funcs/err.badbcopy2.d | 4 +-
test/unittest/funcs/err.badbcopy3.d | 4 +-
test/unittest/funcs/err.badbcopy4.d | 4 +-
test/unittest/funcs/err.badbcopy5.d | 4 +-
test/unittest/funcs/err.copyoutbadaddr.sh | 8 +-
test/unittest/funcs/err.copyoutstrbadaddr.sh | 8 +-
test/unittest/funcs/err.inet_ntopbadarg.d | 4 +-
test/unittest/funcs/err.link_ntopbadarg.d | 4 +-
test/unittest/funcs/tst.bcopy.d | 4 +-
test/unittest/funcs/tst.copyin.d | 4 +-
test/unittest/funcs/tst.copyinto.d | 8 +-
test/unittest/funcs/tst.ddi_pathname.d | 10 +-
test/unittest/funcs/tst.inet_ntoa.d | 8 +-
test/unittest/funcs/tst.inet_ntoa6.d | 14 +-
test/unittest/funcs/tst.inet_ntop.d | 24 +-
test/unittest/funcs/tst.link_ntop.d | 2 +-
test/unittest/misc/tst.haslam.d | 2 +-
test/unittest/pid/tst.provregex1.sh | 2 +-
test/unittest/pid/tst.provregex2.sh | 6 +-
test/unittest/pid/tst.provregex4.sh | 6 +-
test/unittest/pointers/err.BadAlign.d | 2 +-
.../err.D_OP_INCOMPAT.VoidPointerArith.d | 6 +-
.../pointers/err.D_OP_LVAL.AddressChange.d | 4 +-
test/unittest/pointers/err.InvalidAddress1.d | 2 +-
test/unittest/pointers/err.InvalidAddress2.d | 4 +-
test/unittest/pointers/err.InvalidAddress3.d | 2 +-
test/unittest/pointers/err.InvalidAddress4.d | 8 +-
test/unittest/pointers/err.InvalidAddress5.d | 8 +-
test/unittest/pointers/tst.ArrayPointer1.d | 64 +-
test/unittest/pointers/tst.GlobalVar.d | 2 +-
.../pointers/tst.IntegerArithmetic1.d | 8 +-
.../pointers/tst.PointerArithmetic1.d | 8 +-
.../pointers/tst.PointerArithmetic3.d | 4 +-
test/unittest/pointers/tst.ValidPointer1.d | 8 +-
test/unittest/pointers/tst.ValidPointer2.d | 8 +-
test/unittest/pointers/tst.VoidCast.d | 2 +-
test/unittest/pointers/tst.basic1.d | 2 +-
test/unittest/pointers/tst.basic2.d | 2 +-
.../sizeof/err.D_IDENT_BADREF.SizeofAssoc.d | 10 +-
.../sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d | 4 +-
test/unittest/sizeof/err.D_SIZEOF_TYPE.d | 4 +-
.../sizeof/err.D_SYNTAX.SizeofBadType.d | 4 +-
test/unittest/sizeof/tst.SizeofArray.d | 12 +-
test/unittest/sizeof/tst.SizeofArray.r | 8 +-
test/unittest/sizeof/tst.SizeofDataTypes.d | 48 +-
test/unittest/sizeof/tst.SizeofDataTypes.r | 32 +-
test/unittest/sizeof/tst.SizeofExpression.d | 28 +-
test/unittest/sizeof/tst.SizeofExpression.r | 16 +-
test/unittest/sizeof/tst.SizeofNULL.d | 4 +-
test/unittest/sizeof/tst.SizeofNULL.r | 2 +-
test/unittest/sizeof/tst.SizeofStrConst.d | 2 +-
test/unittest/sizeof/tst.SizeofString1.d | 8 +-
test/unittest/sizeof/tst.SizeofString1.r | 4 +-
test/unittest/sizeof/tst.SizeofString2.d | 2 +-
test/unittest/sizeof/tst.SizeofString2.r | 2 +-
.../err.D_ACT_SPEC.SpeculateWithCopyOut.d | 2 +-
.../err.D_ACT_SPEC.SpeculateWithCopyOutStr.d | 2 +-
test/unittest/tracemem/tst.three_arg.sh | 17 +-
.../err.D_DECL_TYPERED.BadTransDecl.d | 4 +-
.../err.D_OP_INCOMPLETE.NonExistentInput1.d | 4 +-
.../translators/err.D_SYNTAX.BadTransDecl1.d | 6 +-
.../translators/err.D_SYNTAX.BadTransDecl3.d | 4 +-
.../translators/err.D_SYNTAX.BadTransDecl4.d | 4 +-
.../err.D_TYPE_MEMBER.NonExistentInput2.d | 4 +-
.../err.D_XLATE_INCOMPAT.BadInputType1.d | 4 +-
.../err.D_XLATE_MEMB.NonExistentOutput2.d | 4 +-
.../err.D_XLATE_NONE.BadTransDecl6.d | 4 +-
.../err.D_XLATE_REDECL.RepeatTransDecl.d | 8 +-
.../err.D_XLATE_SOU.NonExistentOutput1.d | 4 +-
.../translators/tst.CircularTransDecl.d | 8 +-
test/unittest/translators/tst.ForwardTag.d | 4 +-
.../translators/tst.InputAliasTrans.d | 4 +-
test/unittest/translators/tst.InputIntTrans.d | 4 +-
.../translators/tst.OutputAliasTrans.d | 4 +-
.../translators/tst.PartialDereferencing.d | 4 +-
.../translators/tst.PartialOutputTransDefn.d | 2 +-
.../translators/tst.RepeatDeclaration.d | 8 +-
.../translators/tst.SimultaneousTranslators.d | 4 +-
.../translators/tst.StructureAssignment.d | 2 +-
.../translators/tst.TransNonPointer.d | 4 +-
.../translators/tst.TransOutputPointer.d | 4 +-
test/unittest/translators/tst.TransPointer.d | 4 +-
test/unittest/translators/tst.TranslateSelf.d | 4 +-
.../translators/tst.UnionInputTrans.d | 4 +-
.../translators/tst.UnionOutputTrans.d | 4 +-
test/unittest/types/tst.basics.d | 29 +-
test/unittest/types/tst.basics.r | 28 +-
test/unittest/types/tst.complex.d | 2 +-
test/unittest/types/tst.intops.d | 4 +-
test/unittest/types/tst.inttypes.d | 20 +-
test/unittest/types/tst.inttypes.r | 20 +-
test/unittest/types/tst.ptrops.d | 4 +-
test/unittest/types/tst.struct.d | 2 +-
test/unittest/types/tst.typedef.d | 2 +-
test/unittest/usdt/tst.dlclose1.sh | 6 +-
test/unittest/usdt/tst.dlclose2.sh | 12 +-
test/unittest/usdt/tst.dlclose3.sh | 8 +-
test/unittest/usdt/tst.eliminate.sh | 4 +-
test/unittest/usdt/tst.enabled2.sh | 6 +-
test/unittest/usdt/tst.fork.sh | 6 +-
test/unittest/usdt/tst.multiple.sh | 2 +-
test/unittest/usdt/tst.onlyenabled.sh | 6 +-
test/unittest/usdt/tst.user.sh | 4 +-
test/unittest/ustack/tst.frames.sh | 122 +--
test/utils/baddof.c | 4 +-
test/utils/badioctl.c | 6 +-
220 files changed, 3489 insertions(+), 3474 deletions(-)
create mode 100644 CODING-STYLE
diff --git a/CODING-STYLE b/CODING-STYLE
new file mode 100644
index 00000000..e7d7f2cf
--- /dev/null
+++ b/CODING-STYLE
@@ -0,0 +1,96 @@
+Here are guidelines for the typical, preferred coding style. The guidelines
+can grow with time. Typically, it is safe simply to mimic the existing code.
+
+Lines should be at most 80 characters wide. Indentation styles for continuing
+lines vary, but continued lines should be shorter and start further to the
+right than their parents. Ideally, user-visible strings will only be split
+such that one can still grep for them in the source code.
+
+Statements should be indented with tab characters. Align case labels with
+their switch statements.
+
+There should generally be neither whitespace at the ends of lines nor blank
+lines at the ends of files. (A common exception to the blank-line rule is
+.r results files in the test suite.)
+
+An opening brace should be last on its line and a closing brace first. E.g.,
+ if (foo) {
+ bar1();
+ bar2();
+ }
+
+While this guideline applies to non-function statement blocks (if, switch, for,
+while, do), functions should have their opening brace alone on its own line.
+Function definitions should also have their name at the beginning of the line.
+E.g.,
+ uint_t
+ dt_cg_tramp_prologue(dt_pcb_t *pcb)
+ {
+ return dt_cg_tramp_prologue_act(pcb, DT_ACTIVITY_ACTIVE);
+ }
+
+Braces should typically be avoided on single-statement branches. E.g.,
+ if (foo1) {
+ bar1();
+ bar2();
+ } else
+ bar3();
+
+A space should appear:
+
+ - after these keywords: if, switch, case, for, do, while
+
+ - on each side of most binary and ternary operators, such as:
+ = + - < > * / % | & ^ <= >= == != ? :
+
+A space should NOT appear:
+
+ - immediately inside parentheses in C code or D scripts; e.g.,
+ (foo > 0) good
+ ( foo > 0 ) bad
+
+ - after unary operators, such as & * + - ~ !
+
+ - after sizeof typeof alignof __attribute__ defined
+
+ - after typecast operators -- e.g.,
+ (int)x good
+ (int) x bad
+
+ - after the unary prefix operators ++ and --
+
+ - before the unary postfix operators ++ and --
+
+ - around the . and -> structure member operators
+
+When declaring pointers, the * should be adjacent to the pointer name, not
+to the type name. E.g.,
+ char *dd_name;
+ void *dt_buf_ptr(const dt_buf_t *bp);
+
+This * rule is for declaration. For a function definition, the function
+name remains at the beginning of the line, as previously mentioned. E.g.,
+ void *
+ dt_buf_ptr(const dt_buf_t *bp)
+ {
+ return bp->dbu_buf;
+ }
+
+Macros with multiple statements should be enclosed in a do-while(0) block:
+ #define DT_CG_AGG_SET_STORAGE(aid, sz) \
+ do { \
+ if ((aid)->di_offset == -1) \
+ dt_ident_set_storage((aid), 2 * (sz)); \
+ } while (0)
+Note there is no final semicolon.
+
+Function calls should not unnecessarily be cast to void. E.g.,
+ printf("hello world\n"); good
+ (void) printf("hello world\n"); bad
+
+The return argument typically needs no parentheses. E.g.,
+ return 0; good
+ return (0); bad
+
+Code in libbpf/ need not conform to the guidelines in this document, since
+we expect not to retain that code in the long term.
diff --git a/bpf/get_bvar.c b/bpf/get_bvar.c
index 1ae10f97..174626f9 100644
--- a/bpf/get_bvar.c
+++ b/bpf/get_bvar.c
@@ -76,14 +76,14 @@ noinline uint64_t dt_get_bvar(dt_mstate_t *mst, uint32_t id)
ptr = bpf_get_current_task();
if (ptr == 0)
return -1;
- if (bpf_probe_read((void *) &ptr, 8,
- (const void *) (ptr + *parent_off)))
+ if (bpf_probe_read((void *)&ptr, 8,
+ (const void *)(ptr + *parent_off)))
return -1;
- if (bpf_probe_read((void *) &val, 4,
- (const void *) (ptr + *tgid_off)))
+ if (bpf_probe_read((void *)&val, 4,
+ (const void *)(ptr + *tgid_off)))
return -1;
- return (uint64_t) val;
+ return (uint64_t)val;
}
case DIF_VAR_UID: {
uint64_t val = bpf_get_current_uid_gid();
diff --git a/cmd/ctf_module_dump.c b/cmd/ctf_module_dump.c
index 607587a6..b3111043 100644
--- a/cmd/ctf_module_dump.c
+++ b/cmd/ctf_module_dump.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -291,7 +291,7 @@ main(int argc, char *argv[])
* searching code happy.
*/
dtp->dt_kernpathbuckets = BUCKETS;
- dtp->dt_kernpaths = calloc(dtp->dt_kernpathbuckets, sizeof (dt_kern_path_t *));
+ dtp->dt_kernpaths = calloc(dtp->dt_kernpathbuckets, sizeof(dt_kern_path_t *));
dtp->dt_module_path = strdup(modpath);
if (dtp->dt_kernpaths == NULL ||
diff --git a/cmd/dtrace.c b/cmd/dtrace.c
index e9e25a47..7e43e0f1 100644
--- a/cmd/dtrace.c
+++ b/cmd/dtrace.c
@@ -83,7 +83,7 @@ usage(FILE *fp)
{
static const char predact[] = "[[ predicate ] action ]";
- (void) fprintf(fp, "Usage: %s [-32|-64] [-CeFGhHlqSvVwZ] "
+ fprintf(fp, "Usage: %s [-32|-64] [-CeFGhHlqSvVwZ] "
"[-b bufsz] [-c cmd] [-D name[=def]]\n\t[-I path] [-L path] "
"[-o output] [-p pid] [-s script] [-U name]\n\t"
"[-x opt[=val]] [-X a|c|s|t]\n\n"
@@ -94,10 +94,10 @@ usage(FILE *fp)
"\t[-i probe-id %s] [ args ... ]\n\n", g_pname,
predact, predact, predact, predact, predact);
- (void) fprintf(fp, "\tpredicate -> '/' D-expression '/'\n");
- (void) fprintf(fp, "\t action -> '{' D-statements '}'\n");
+ fprintf(fp, "\tpredicate -> '/' D-expression '/'\n");
+ fprintf(fp, "\t action -> '{' D-statements '}'\n");
- (void) fprintf(fp, "\n"
+ fprintf(fp, "\n"
"\t-32 generate 32-bit D programs and ELF files\n"
"\t-64 generate 64-bit D programs and ELF files\n\n"
"\t-b set trace buffer size\n"
@@ -130,7 +130,7 @@ usage(FILE *fp)
"\t-X specify ISO C conformance settings for preprocessor\n"
"\t-Z permit probe descriptions that match zero probes\n");
- return (E_USAGE);
+ return E_USAGE;
}
static void
@@ -138,11 +138,11 @@ verror(const char *fmt, va_list ap)
{
int error = errno;
- (void) fprintf(stderr, "%s: ", g_pname);
- (void) vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "%s: ", g_pname);
+ vfprintf(stderr, fmt, ap);
if (fmt[strlen(fmt) - 1] != '\n')
- (void) fprintf(stderr, ": %s\n", strerror(error));
+ fprintf(stderr, ": %s\n", strerror(error));
}
/*PRINTFLIKE1*/
@@ -174,19 +174,18 @@ dfatal(const char *fmt, ...)
va_start(ap, fmt);
- (void) fprintf(stderr, "%s: ", g_pname);
+ fprintf(stderr, "%s: ", g_pname);
if (fmt != NULL)
- (void) vfprintf(stderr, fmt, ap);
+ vfprintf(stderr, fmt, ap);
va_end(ap);
- if (fmt != NULL && fmt[strlen(fmt) - 1] != '\n') {
- (void) fprintf(stderr, ": %s\n",
+ if (fmt != NULL && fmt[strlen(fmt) - 1] != '\n')
+ fprintf(stderr, ": %s\n",
dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
- } else if (fmt == NULL) {
- (void) fprintf(stderr, "%s\n",
+ else if (fmt == NULL)
+ fprintf(stderr, "%s\n",
dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
- }
/*
* Close the DTrace handle to ensure that any controlled processes are
@@ -252,12 +251,12 @@ static char **
make_argv(char *s)
{
const char *ws = "\f\n\r\t\v ";
- char **argv = malloc(sizeof (char *) * (strlen(s) / 2 + 1));
+ char **argv = malloc(sizeof(char *) * (strlen(s) / 2 + 1));
int argc = 0;
char *p = s;
if (argv == NULL)
- return (NULL);
+ return NULL;
for (p = strtok(s, ws); p != NULL; p = strtok(NULL, ws))
argv[argc++] = p;
@@ -266,7 +265,7 @@ make_argv(char *s)
argv[argc++] = s;
argv[argc] = NULL;
- return (argv);
+ return argv;
}
static void
@@ -297,8 +296,8 @@ print_probe_info(const dtrace_probeinfo_t *p)
for (i = 0; i < p->dtp_argc; i++) {
if (ctf_type_name(p->dtp_argv[i].dtt_ctfp,
- p->dtp_argv[i].dtt_type, buf, sizeof (buf)) == NULL)
- (void) strlcpy(buf, "(unknown)", sizeof (buf));
+ p->dtp_argv[i].dtt_type, buf, sizeof(buf)) == NULL)
+ strlcpy(buf, "(unknown)", sizeof(buf));
oprintf("\t\targs[%d]: %s\n", i, buf);
}
@@ -318,7 +317,7 @@ info_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
dtrace_probeinfo_t p;
if (edp == *last)
- return (0);
+ return 0;
oprintf("\n%s:%s:%s:%s\n", pdp->prv, pdp->mod, pdp->fun, pdp->prb);
@@ -326,7 +325,7 @@ info_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
print_probe_info(&p);
*last = edp;
- return (0);
+ return 0;
}
/*
@@ -371,10 +370,10 @@ exec_prog(const dtrace_cmd_t *dcp)
oprintf("\t\tDependency Class: %s\n",
dtrace_class_name(dpi.dpi_stmtattr.dtat_class));
- if (!g_exec) {
- (void) dtrace_stmt_iter(g_dtp, dcp->dc_prog,
+ if (!g_exec)
+ dtrace_stmt_iter(g_dtp, dcp->dc_prog,
(dtrace_stmt_f *)info_stmt, &last);
- } else
+ else
oprintf("\n");
}
@@ -394,16 +393,15 @@ link_prog(dtrace_cmd_t *dcp)
char *p;
if (g_cmdc == 1 && g_ofile != NULL) {
- (void) strlcpy(dcp->dc_ofile, g_ofile, sizeof (dcp->dc_ofile));
+ strlcpy(dcp->dc_ofile, g_ofile, sizeof(dcp->dc_ofile));
} else if ((p = strrchr(dcp->dc_arg, '.')) != NULL &&
strcmp(p, ".d") == 0) {
p[0] = '\0'; /* strip .d suffix */
- (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile),
+ snprintf(dcp->dc_ofile, sizeof(dcp->dc_ofile),
"%s.o", basename(dcp->dc_arg));
- } else {
- (void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile),
+ } else
+ snprintf(dcp->dc_ofile, sizeof(dcp->dc_ofile),
g_cmdc > 1 ? "%s.%d" : "%s", "d.out", (int)(dcp - g_cmdv));
- }
if (dtrace_program_link(g_dtp, dcp->dc_prog, DTRACE_D_PROBES,
dcp->dc_ofile, g_objc, g_objv) != 0)
@@ -422,7 +420,7 @@ list_probe(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp, void *arg)
if (g_verbose && dtrace_probe_info(dtp, pdp, &p) == 0)
print_probe_info(&p);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -433,7 +431,7 @@ list_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
dtrace_ecbdesc_t *edp = stp->dtsd_ecbdesc;
if (edp == *last)
- return (0);
+ return 0;
if (dtrace_probe_iter(g_dtp, &edp->dted_probe, list_probe, NULL) < 0) {
error("failed to match %s:%s:%s:%s: %s\n",
@@ -443,7 +441,7 @@ list_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
}
*last = edp;
- return (0);
+ return 0;
}
/*
@@ -455,7 +453,7 @@ list_prog(const dtrace_cmd_t *dcp)
{
dtrace_ecbdesc_t *last = NULL;
- (void) dtrace_stmt_iter(g_dtp, dcp->dc_prog,
+ dtrace_stmt_iter(g_dtp, dcp->dc_prog,
(dtrace_stmt_f *)list_stmt, &last);
}
@@ -476,7 +474,7 @@ compile_file(dtrace_cmd_t *dcp)
dfatal("failed to compile script %s", dcp->dc_arg);
g_argv[0] = arg0;
- (void) fclose(fp);
+ fclose(fp);
dcp->dc_desc = "script";
dcp->dc_name = dcp->dc_arg;
@@ -524,7 +522,7 @@ static int
errhandler(const dtrace_errdata_t *data, void *arg)
{
error(data->dteda_msg);
- return (DTRACE_HANDLE_OK);
+ return DTRACE_HANDLE_OK;
}
/*ARGSUSED*/
@@ -532,7 +530,7 @@ static int
drophandler(const dtrace_dropdata_t *data, void *arg)
{
error(data->dtdda_msg);
- return (DTRACE_HANDLE_OK);
+ return DTRACE_HANDLE_OK;
}
/*ARGSUSED*/
@@ -545,39 +543,38 @@ setopthandler(const dtrace_setoptdata_t *data, void *arg)
if (strcmp(data->dtsda_option, "flowindent") == 0)
g_flowindent = data->dtsda_newval != DTRACEOPT_UNSET;
- return (DTRACE_HANDLE_OK);
+ return DTRACE_HANDLE_OK;
}
#define BUFDUMPHDR(hdr) \
- (void) printf("%s: %s%s\n", g_pname, hdr, strlen(hdr) > 0 ? ":" : "");
+ printf("%s: %s%s\n", g_pname, hdr, strlen(hdr) > 0 ? ":" : "");
#define BUFDUMPSTR(ptr, field) \
- (void) printf("%s: %20s => ", g_pname, #field); \
+ printf("%s: %20s => ", g_pname, #field); \
if ((ptr)->field != NULL) { \
const char *c = (ptr)->field; \
- (void) printf("\""); \
+ printf("\""); \
do { \
if (*c == '\n') { \
- (void) printf("\\n"); \
+ printf("\\n"); \
continue; \
} \
\
- (void) printf("%c", *c); \
+ printf("%c", *c); \
} while (*c++ != '\0'); \
- (void) printf("\"\n"); \
- } else { \
- (void) printf("<NULL>\n"); \
- }
+ printf("\"\n"); \
+ } else \
+ printf("<NULL>\n");
#define BUFDUMPASSTR(ptr, field, str) \
- (void) printf("%s: %20s => %s\n", g_pname, #field, str);
+ printf("%s: %20s => %s\n", g_pname, #field, str);
#define BUFDUMP(ptr, field) \
- (void) printf("%s: %20s => %lld\n", g_pname, #field, \
+ printf("%s: %20s => %lld\n", g_pname, #field, \
(long long)(ptr)->field);
#define BUFDUMPPTR(ptr, field) \
- (void) printf("%s: %20s => %s\n", g_pname, #field, \
+ printf("%s: %20s => %s\n", g_pname, #field, \
(ptr)->field != NULL ? "<non-NULL>" : "<NULL>");
/*ARGSUSED*/
@@ -588,7 +585,7 @@ bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
const dtrace_recdesc_t *rec = bufdata->dtbda_recdesc;
const dtrace_probedesc_t *pd;
uint32_t flags = bufdata->dtbda_flags;
- char buf[512], *c = buf, *end = c + sizeof (buf);
+ char buf[512], *c = buf, *end = c + sizeof(buf);
int i, printed;
struct {
@@ -617,21 +614,21 @@ bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
BUFDUMPPTR(bufdata, dtbda_aggdata);
BUFDUMPPTR(bufdata, dtbda_recdesc);
- (void) snprintf(c, end - c, "0x%x ", bufdata->dtbda_flags);
+ snprintf(c, end - c, "0x%x ", bufdata->dtbda_flags);
c += strlen(c);
for (i = 0, printed = 0; flagnames[i].name != NULL; i++) {
if (!(flags & flagnames[i].value))
continue;
- (void) snprintf(c, end - c,
+ snprintf(c, end - c,
"%s%s", printed++ ? " | " : "(", flagnames[i].name);
c += strlen(c);
flags &= ~flagnames[i].value;
}
if (printed)
- (void) snprintf(c, end - c, ")");
+ snprintf(c, end - c, ")");
BUFDUMPASSTR(bufdata, dtbda_flags, buf);
BUFDUMPHDR("");
@@ -654,21 +651,21 @@ bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
uint8_t *data;
int lim = rec->dtrd_size;
- (void) sprintf(buf, "%d (data: ", rec->dtrd_offset);
+ sprintf(buf, "%d (data: ", rec->dtrd_offset);
c = buf + strlen(buf);
- if (lim > sizeof (uint64_t))
- lim = sizeof (uint64_t);
+ if (lim > sizeof(uint64_t))
+ lim = sizeof(uint64_t);
data = (uint8_t *)agg->dtada_data + rec->dtrd_offset;
for (i = 0; i < lim; i++) {
- (void) snprintf(c, end - c, "%s%02x",
+ snprintf(c, end - c, "%s%02x",
i == 0 ? "" : " ", *data++);
c += strlen(c);
}
- (void) snprintf(c, end - c,
+ snprintf(c, end - c,
"%s)", lim < rec->dtrd_size ? " ..." : "");
BUFDUMPASSTR(rec, dtrd_offset, buf);
} else {
@@ -689,7 +686,7 @@ bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
BUFDUMPHDR("");
}
- return (DTRACE_HANDLE_OK);
+ return DTRACE_HANDLE_OK;
}
/*ARGSUSED*/
@@ -707,7 +704,7 @@ chewrec(const dtrace_probedata_t *data, const dtrace_recdesc_t *rec, void *arg)
if (!g_quiet)
oprintf("\n");
- return (DTRACE_CONSUME_NEXT);
+ return DTRACE_CONSUME_NEXT;
}
act = rec->dtrd_action;
@@ -715,10 +712,10 @@ chewrec(const dtrace_probedata_t *data, const dtrace_recdesc_t *rec, void *arg)
if (act == DTRACEACT_EXIT) {
g_status = *((uint32_t *)addr);
- return (DTRACE_CONSUME_NEXT);
+ return DTRACE_CONSUME_NEXT;
}
- return (DTRACE_CONSUME_THIS);
+ return DTRACE_CONSUME_THIS;
}
/*ARGSUSED*/
@@ -731,7 +728,7 @@ chew(const dtrace_probedata_t *data, void *arg)
if (g_impatient) {
g_newline = 0;
- return (DTRACE_CONSUME_ABORT);
+ return DTRACE_CONSUME_ABORT;
}
if (heading == 0) {
@@ -793,7 +790,7 @@ chew(const dtrace_probedata_t *data, void *arg)
}
}
- return (DTRACE_CONSUME_THIS);
+ return DTRACE_CONSUME_THIS;
}
static void
@@ -831,7 +828,7 @@ go(void)
if (dtrace_go(g_dtp, g_cflags) == -1)
dfatal("could not enable tracing");
- (void) dtrace_getopt(g_dtp, "quietresize", &quiet);
+ dtrace_getopt(g_dtp, "quietresize", &quiet);
if (quiet != DTRACEOPT_UNSET)
return;
@@ -843,12 +840,12 @@ go(void)
if (bufs[i].val == DTRACEOPT_UNSET)
continue;
- (void) dtrace_getopt(g_dtp, bufs[i].optname, &nsize);
+ dtrace_getopt(g_dtp, bufs[i].optname, &nsize);
if (nsize == DTRACEOPT_UNSET || nsize == 0)
continue;
- if (nsize >= bufs[i].val - sizeof (uint64_t))
+ if (nsize >= bufs[i].val - sizeof(uint64_t))
continue;
for (; (INT64_C(1) << mul) <= nsize; j++, mul += 10)
@@ -870,7 +867,7 @@ go(void)
if (rates[i].val == DTRACEOPT_UNSET)
continue;
- (void) dtrace_getopt(g_dtp, rates[i].optname, &nval);
+ dtrace_getopt(g_dtp, rates[i].optname, &nval);
if (nval == DTRACEOPT_UNSET || nval == 0)
continue;
@@ -929,18 +926,18 @@ main(int argc, char *argv[])
g_pname = basename(argv[0]);
if (argc == 1)
- return (usage(stderr));
+ return usage(stderr);
- if ((g_argv = malloc(sizeof (char *) * argc)) == NULL ||
- (g_cmdv = malloc(sizeof (dtrace_cmd_t) * argc)) == NULL ||
- (g_psv = malloc(sizeof (struct dtrace_proc *) * argc)) == NULL)
+ if ((g_argv = malloc(sizeof(char *) * argc)) == NULL ||
+ (g_cmdv = malloc(sizeof(dtrace_cmd_t) * argc)) == NULL ||
+ (g_psv = malloc(sizeof(struct dtrace_proc *) * argc)) == NULL)
fatal("failed to allocate memory for arguments");
g_argv[g_argc++] = argv[0]; /* propagate argv[0] to D as $0/$$0 */
argv[0] = g_pname; /* rewrite argv[0] for getopt errors */
- memset(status, 0, sizeof (status));
- memset(&buf, 0, sizeof (buf));
+ memset(status, 0, sizeof(status));
+ memset(&buf, 0, sizeof(buf));
/*
* Make an initial pass through argv[] processing any arguments that
@@ -953,10 +950,10 @@ main(int argc, char *argv[])
switch (c) {
case '3':
if (strcmp(optarg, "2") != 0) {
- (void) fprintf(stderr,
+ fprintf(stderr,
"%s: illegal option -- 3%s\n",
argv[0], optarg);
- return (usage(stderr));
+ return usage(stderr);
}
g_oflags &= ~DTRACE_O_LP64;
g_oflags |= DTRACE_O_ILP32;
@@ -964,10 +961,10 @@ main(int argc, char *argv[])
case '6':
if (strcmp(optarg, "4") != 0) {
- (void) fprintf(stderr,
+ fprintf(stderr,
"%s: illegal option -- 6%s\n",
argv[0], optarg);
- return (usage(stderr));
+ return usage(stderr);
}
g_oflags &= ~DTRACE_O_ILP32;
g_oflags |= DTRACE_O_LP64;
@@ -1009,7 +1006,7 @@ main(int argc, char *argv[])
default:
if (strchr(DTRACE_OPTSTR, c) == NULL)
- return (usage(stderr));
+ return usage(stderr);
}
}
@@ -1018,19 +1015,19 @@ main(int argc, char *argv[])
}
if (mode > 1) {
- (void) fprintf(stderr, "%s: only one of the [-GhlV] options "
+ fprintf(stderr, "%s: only one of the [-GhlV] options "
"can be specified at a time\n", g_pname);
- return (E_USAGE);
+ return E_USAGE;
}
if (g_mode == DMODE_VERS) {
if (!g_verbose)
- return (printf("%s: %s\n", g_pname, _dtrace_version) <= 0);
+ return printf("%s: %s\n", g_pname, _dtrace_version) <= 0;
else {
printf("%s: %s\n", g_pname, _dtrace_version);
printf("This is DTrace %s\n", _DT_VERSION);
printf("dtrace(1) version-control ID: %s\n", DT_GIT_VERSION);
- return(printf("libdtrace version-control ID: %s\n", _libdtrace_vcs_version) <= 0);
+ return printf("libdtrace version-control ID: %s\n", _libdtrace_vcs_version) <= 0;
}
}
@@ -1052,19 +1049,19 @@ main(int argc, char *argv[])
break;
if ((elf = elf_begin(fd, ELF_C_READ, NULL)) == NULL) {
- (void) close(fd);
+ close(fd);
break;
}
if (elf_kind(elf) != ELF_K_ELF ||
gelf_getehdr(elf, &ehdr) == NULL) {
- (void) close(fd);
- (void) elf_end(elf);
+ close(fd);
+ elf_end(elf);
break;
}
- (void) close(fd);
- (void) elf_end(elf);
+ close(fd);
+ elf_end(elf);
if (ehdr.e_ident[EI_CLASS] == ELFCLASS64) {
if (g_oflags & DTRACE_O_ILP32) {
@@ -1111,8 +1108,8 @@ main(int argc, char *argv[])
* references to undefined symbols to remain as unresolved relocations.
*/
if (g_mode == DMODE_LINK) {
- (void) dtrace_setopt(g_dtp, "linkmode", "dynamic");
- (void) dtrace_setopt(g_dtp, "unodefs", NULL);
+ dtrace_setopt(g_dtp, "linkmode", "dynamic");
+ dtrace_setopt(g_dtp, "unodefs", NULL);
/*
* Use the remaining arguments as the list of object files
@@ -1259,21 +1256,21 @@ main(int argc, char *argv[])
default:
if (strchr(DTRACE_OPTSTR, c) == NULL)
- return (usage(stderr));
+ return usage(stderr);
}
}
}
if (g_ofp == NULL && g_mode != DMODE_EXEC) {
- (void) fprintf(stderr, "%s: -B not valid in combination"
+ fprintf(stderr, "%s: -B not valid in combination"
" with [-Gl] options\n", g_pname);
- return (E_USAGE);
+ return E_USAGE;
}
if (g_ofp == NULL && g_ofile != NULL) {
- (void) fprintf(stderr, "%s: -B not valid in combination"
+ fprintf(stderr, "%s: -B not valid in combination"
" with -o option\n", g_pname);
- return (E_USAGE);
+ return E_USAGE;
}
/*
@@ -1284,7 +1281,7 @@ main(int argc, char *argv[])
if (getenv("_DTRACE_TESTING") != NULL) {
g_testing = 1;
if (dtrace_setopt(g_dtp, "quietresize", 0) != 0)
- (void) fprintf(stderr, "%s: cannot set quietresize for "
+ fprintf(stderr, "%s: cannot set quietresize for "
"testing", g_pname);
}
@@ -1356,10 +1353,10 @@ main(int argc, char *argv[])
dfatal("failed to establish buffered handler");
}
- (void) dtrace_getopt(g_dtp, "flowindent", &opt);
+ dtrace_getopt(g_dtp, "flowindent", &opt);
g_flowindent = opt != DTRACEOPT_UNSET;
- (void) dtrace_getopt(g_dtp, "quiet", &opt);
+ dtrace_getopt(g_dtp, "quiet", &opt);
g_quiet = opt != DTRACEOPT_UNSET;
/*
@@ -1387,23 +1384,23 @@ main(int argc, char *argv[])
if (done || g_intr) {
dtrace_close(g_dtp);
- return (g_status);
+ return g_status;
}
break;
case DMODE_LINK:
if (g_cmdc == 0) {
- (void) fprintf(stderr, "%s: -G requires one or more "
+ fprintf(stderr, "%s: -G requires one or more "
"scripts or enabling options\n", g_pname);
dtrace_close(g_dtp);
- return (E_USAGE);
+ return E_USAGE;
}
for (i = 0; i < g_cmdc; i++)
link_prog(&g_cmdv[i]);
if (g_cmdc > 1 && g_ofile != NULL) {
- char **objv = alloca(g_cmdc * sizeof (char *));
+ char **objv = alloca(g_cmdc * sizeof(char *));
for (i = 0; i < g_cmdc; i++)
objv[i] = g_cmdv[i].dc_ofile;
@@ -1414,7 +1411,7 @@ main(int argc, char *argv[])
}
dtrace_close(g_dtp);
- return (g_status);
+ return g_status;
case DMODE_LIST:
if (g_ofile != NULL && (g_ofp = fopen(g_ofile, "a")) == NULL)
@@ -1430,39 +1427,39 @@ main(int argc, char *argv[])
dtrace_probe_iter(g_dtp, NULL, list_probe, NULL);
dtrace_close(g_dtp);
- return (g_status);
+ return g_status;
case DMODE_HEADER:
if (g_cmdc == 0) {
- (void) fprintf(stderr, "%s: -h requires one or more "
+ fprintf(stderr, "%s: -h requires one or more "
"scripts or enabling options\n", g_pname);
dtrace_close(g_dtp);
- return (E_USAGE);
+ return E_USAGE;
}
if (g_ofile == NULL) {
char *p;
if (g_cmdc > 1) {
- (void) fprintf(stderr, "%s: -h requires an "
+ fprintf(stderr, "%s: -h requires an "
"output file if multiple scripts are "
"specified\n", g_pname);
dtrace_close(g_dtp);
- return (E_USAGE);
+ return E_USAGE;
}
if ((p = strrchr(g_cmdv[0].dc_arg, '.')) == NULL ||
strcmp(p, ".d") != 0) {
- (void) fprintf(stderr, "%s: -h requires an "
+ fprintf(stderr, "%s: -h requires an "
"output file if no scripts are "
"specified\n", g_pname);
dtrace_close(g_dtp);
- return (E_USAGE);
+ return E_USAGE;
}
p[0] = '\0'; /* strip .d suffix */
g_ofile = p = g_cmdv[0].dc_ofile;
- (void) snprintf(p, sizeof (g_cmdv[0].dc_ofile),
+ snprintf(p, sizeof(g_cmdv[0].dc_ofile),
"%s.h", basename(g_cmdv[0].dc_arg));
}
@@ -1476,7 +1473,7 @@ main(int argc, char *argv[])
dfatal("failed to create header file %s", g_ofile);
dtrace_close(g_dtp);
- return (g_status);
+ return g_status;
}
/*
@@ -1493,13 +1490,13 @@ main(int argc, char *argv[])
goto out;
go();
- (void) dtrace_getopt(g_dtp, "flowindent", &opt);
+ dtrace_getopt(g_dtp, "flowindent", &opt);
g_flowindent = opt != DTRACEOPT_UNSET;
- (void) dtrace_getopt(g_dtp, "quiet", &opt);
+ dtrace_getopt(g_dtp, "quiet", &opt);
g_quiet = opt != DTRACEOPT_UNSET;
- (void) dtrace_getopt(g_dtp, "destructive", &opt);
+ dtrace_getopt(g_dtp, "destructive", &opt);
if (opt != DTRACEOPT_UNSET)
notice("allowing destructive actions\n");
@@ -1570,5 +1567,5 @@ out:
free(g_cmdv);
free(g_psv);
- return (g_status);
+ return g_status;
}
diff --git a/include/dtrace/actions_defines.h b/include/dtrace/actions_defines.h
index e9c68e1e..3dcf25cf 100644
--- a/include/dtrace/actions_defines.h
+++ b/include/dtrace/actions_defines.h
@@ -2,7 +2,7 @@
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
*/
/*
@@ -108,9 +108,9 @@
#define DTRACEAGG_LLQUANTIZE (DTRACEACT_AGGREGATION + 9)
#define DTRACE_QUANTIZE_NBUCKETS \
- (((sizeof (uint64_t) * NBBY) - 1) * 2 + 1)
+ (((sizeof(uint64_t) * NBBY) - 1) * 2 + 1)
-#define DTRACE_QUANTIZE_ZEROBUCKET ((sizeof (uint64_t) * NBBY) - 1)
+#define DTRACE_QUANTIZE_ZEROBUCKET ((sizeof(uint64_t) * NBBY) - 1)
#define DTRACE_QUANTIZE_BUCKETVAL(buck) \
(int64_t)((buck) < DTRACE_QUANTIZE_ZEROBUCKET ? \
diff --git a/include/dtrace/dif.h b/include/dtrace/dif.h
index c96180dd..ad4d2f3a 100644
--- a/include/dtrace/dif.h
+++ b/include/dtrace/dif.h
@@ -2,7 +2,7 @@
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
*/
/*
@@ -44,7 +44,7 @@ typedef struct dtrace_diftype {
* A DTrace Intermediate Format variable record is used to describe each of the
* variables referenced by a given DIF object. It contains an integer variable
* identifier along with variable scope and properties, as shown below. The
- * size of this structure must be sizeof (int) aligned.
+ * size of this structure must be sizeof(int) aligned.
*/
typedef struct dtrace_difv {
diff --git a/include/dtrace/dif_defines.h b/include/dtrace/dif_defines.h
index 216bce42..bca9c630 100644
--- a/include/dtrace/dif_defines.h
+++ b/include/dtrace/dif_defines.h
@@ -2,7 +2,7 @@
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
*/
/*
@@ -270,7 +270,7 @@ typedef uint32_t dif_instr_t;
* A DTrace Intermediate Format variable record is used to describe each of the
* variables referenced by a given DIF object. It contains an integer variable
* identifier along with variable scope and properties, as shown below. The
- * size of this structure must be sizeof (int) aligned.
+ * size of this structure must be sizeof(int) aligned.
*/
#define DIFV_KIND_ARRAY 0
diff --git a/include/dtrace/metadesc.h b/include/dtrace/metadesc.h
index 7b29c107..76d08697 100644
--- a/include/dtrace/metadesc.h
+++ b/include/dtrace/metadesc.h
@@ -68,11 +68,11 @@ typedef struct dtrace_fmtdesc {
} dtrace_fmtdesc_t;
#define DTRACE_SIZEOF_EPROBEDESC(desc) \
- (sizeof (dtrace_eprobedesc_t) + ((desc)->dtdd_nrecs ? \
- (((desc)->dtdd_nrecs - 1) * sizeof (dtrace_recdesc_t)) : 0))
+ (sizeof(dtrace_eprobedesc_t) + ((desc)->dtdd_nrecs ? \
+ (((desc)->dtdd_nrecs - 1) * sizeof(dtrace_recdesc_t)) : 0))
#define DTRACE_SIZEOF_AGGDESC(desc) \
- (sizeof (dtrace_aggdesc_t) + ((desc)->dtagd_nrecs ? \
- (((desc)->dtagd_nrecs - 1) * sizeof (dtrace_recdesc_t)) : 0))
+ (sizeof(dtrace_aggdesc_t) + ((desc)->dtagd_nrecs ? \
+ (((desc)->dtagd_nrecs - 1) * sizeof(dtrace_recdesc_t)) : 0))
#endif /* _DTRACE_METADESC_H */
diff --git a/include/sys/bitmap.h b/include/sys/bitmap.h
index c553eb4a..ea23c4d2 100644
--- a/include/sys/bitmap.h
+++ b/include/sys/bitmap.h
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -75,7 +75,7 @@ extern "C" {
#define BT_BITOUL(nbits) \
(((nbits) + BT_NBIPUL - 1l) / BT_NBIPUL)
#define BT_SIZEOFMAP(nbits) \
- (BT_BITOUL(nbits) * sizeof (ulong_t))
+ (BT_BITOUL(nbits) * sizeof(ulong_t))
#define BT_TEST(bitmap, bitindex) \
((BT_WIM((bitmap), (bitindex)) & BT_BIW(bitindex)) ? 1 : 0)
#define BT_SET(bitmap, bitindex) \
@@ -87,7 +87,7 @@ extern "C" {
#define BT_BITOUL32(nbits) \
(((nbits) + BT_NBIPUL32 - 1l) / BT_NBIPUL32)
#define BT_SIZEOFMAP32(nbits) \
- (BT_BITOUL32(nbits) * sizeof (uint_t))
+ (BT_BITOUL32(nbits) * sizeof(uint_t))
#define BT_TEST32(bitmap, bitindex) \
((BT_WIM32((bitmap), (bitindex)) & BT_BIW32(bitindex)) ? 1 : 0)
#define BT_SET32(bitmap, bitindex) \
diff --git a/libdtrace/dt_as.c b/libdtrace/dt_as.c
index 437a2d86..6f749336 100644
--- a/libdtrace/dt_as.c
+++ b/libdtrace/dt_as.c
@@ -19,7 +19,7 @@
void
dt_irlist_create(dt_irlist_t *dlp)
{
- memset(dlp, 0, sizeof (dt_irlist_t));
+ memset(dlp, 0, sizeof(dt_irlist_t));
dlp->dl_label = 1;
}
@@ -51,7 +51,7 @@ dt_irlist_append(dt_irlist_t *dlp, dt_irnode_t *dip)
uint_t
dt_irlist_label(dt_irlist_t *dlp)
{
- return (dlp->dl_label++);
+ return dlp->dl_label++;
}
/*ARGSUSED*/
@@ -65,7 +65,7 @@ dt_countvar(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
else if (idp->di_kind == DT_IDENT_AGG)
(*np)++; /* include variable in vartab */
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -121,12 +121,12 @@ dt_copyvar(dt_idhash_t *dhp, dt_ident_t *idp, dtrace_hdl_t *dtp)
if (idp->di_flags & DT_IDFLG_DIFW)
dvp->dtdv_flags |= DIFV_F_MOD;
- memset(&dn, 0, sizeof (dn));
+ memset(&dn, 0, sizeof(dn));
dt_node_type_assign(&dn, idp->di_ctfp, idp->di_type);
dt_node_diftype(pcb->pcb_hdl, &dn, &dvp->dtdv_type);
idp->di_flags &= ~(DT_IDFLG_DIFR | DT_IDFLG_DIFW);
- return (0);
+ return 0;
}
#ifdef FIXME
@@ -245,7 +245,7 @@ dt_as(dt_pcb_t *pcb)
}
assert(pcb->pcb_difo == NULL);
- pcb->pcb_difo = dt_zalloc(dtp, sizeof (dtrace_difo_t));
+ pcb->pcb_difo = dt_zalloc(dtp, sizeof(dtrace_difo_t));
if ((dp = pcb->pcb_difo) == NULL)
longjmp(pcb->pcb_jmpbuf, EDT_NOMEM);
@@ -512,7 +512,7 @@ fail:
* Relocation for BPF identifier.
*/
rp->dofr_name = (dof_stridx_t)soff;
- rp->dofr_offset = (i - 1) * sizeof (uint64_t);
+ rp->dofr_offset = (i - 1) * sizeof(uint64_t);
/*
* BPF built-in functions (predicate and
@@ -536,7 +536,7 @@ fail:
*/
assert(idp->di_data != NULL);
rp->dofr_name = (dof_stridx_t)soff;
- rp->dofr_offset = (i - 1) * sizeof (uint64_t);
+ rp->dofr_offset = (i - 1) * sizeof(uint64_t);
rp->dofr_data =
((dtrace_syminfo_t *)idp->di_data)->id;
}
@@ -599,5 +599,5 @@ fail:
if (dp->dtdo_reclen > dtp->dt_maxreclen)
dtp->dt_maxreclen = dp->dtdo_reclen;
- return (dp);
+ return dp;
}
diff --git a/libdtrace/dt_buf.c b/libdtrace/dt_buf.c
index cf5540e4..4e9f2ece 100644
--- a/libdtrace/dt_buf.c
+++ b/libdtrace/dt_buf.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -65,7 +65,7 @@ dt_buf_write(dtrace_hdl_t *dtp, dt_buf_t *bp,
size_t adj = roundup(off, align) - off;
if (bp->dbu_err != 0) {
- (void) dt_set_errno(dtp, bp->dbu_err);
+ dt_set_errno(dtp, bp->dbu_err);
return; /* write silently fails */
}
@@ -103,7 +103,7 @@ dt_buf_concat(dtrace_hdl_t *dtp, dt_buf_t *dst,
const dt_buf_t *src, size_t align)
{
if (dst->dbu_err == 0 && src->dbu_err != 0) {
- (void) dt_set_errno(dtp, src->dbu_err);
+ dt_set_errno(dtp, src->dbu_err);
dst->dbu_err = src->dbu_err;
} else {
dt_buf_write(dtp, dst, src->dbu_buf,
@@ -115,25 +115,25 @@ size_t
dt_buf_offset(const dt_buf_t *bp, size_t align)
{
size_t off = (size_t)(bp->dbu_ptr - bp->dbu_buf);
- return (roundup(off, align));
+ return roundup(off, align);
}
size_t
dt_buf_len(const dt_buf_t *bp)
{
- return (bp->dbu_ptr - bp->dbu_buf);
+ return bp->dbu_ptr - bp->dbu_buf;
}
int
dt_buf_error(const dt_buf_t *bp)
{
- return (bp->dbu_err);
+ return bp->dbu_err;
}
void *
dt_buf_ptr(const dt_buf_t *bp)
{
- return (bp->dbu_buf);
+ return bp->dbu_buf;
}
void *
@@ -149,5 +149,5 @@ dt_buf_claim(dtrace_hdl_t *dtp, dt_buf_t *bp)
bp->dbu_buf = bp->dbu_ptr = NULL;
bp->dbu_len = 0;
- return (buf);
+ return buf;
}
diff --git a/libdtrace/dt_cc.c b/libdtrace/dt_cc.c
index ce1fb4db..0f8f7af9 100644
--- a/libdtrace/dt_cc.c
+++ b/libdtrace/dt_cc.c
@@ -101,7 +101,7 @@ dt_idreset(dt_idhash_t *dhp, dt_ident_t *idp, void *ignored)
{
idp->di_flags &= ~(DT_IDFLG_REF | DT_IDFLG_MOD |
DT_IDFLG_DIFR | DT_IDFLG_DIFW);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -110,7 +110,7 @@ dt_idpragma(dt_idhash_t *dhp, dt_ident_t *idp, void *ignored)
{
yylineno = idp->di_lineno;
xyerror(D_PRAGMA_UNUSED, "unused #pragma %s\n", (char *)idp->di_iarg);
- return (0);
+ return 0;
}
static dtrace_stmtdesc_t *
@@ -129,7 +129,7 @@ dt_stmt_create(dtrace_hdl_t *dtp, dtrace_ecbdesc_t *edp,
sdp->dtsd_descattr = descattr;
sdp->dtsd_stmtattr = stmtattr;
- return (sdp);
+ return sdp;
}
#ifdef FIXME
@@ -265,7 +265,7 @@ static void
dt_action_difconst(dtrace_actdesc_t *ap, uint_t id, dtrace_actkind_t kind)
{
dtrace_hdl_t *dtp = yypcb->pcb_hdl;
- dtrace_difo_t *dp = dt_zalloc(dtp, sizeof (dtrace_difo_t));
+ dtrace_difo_t *dp = dt_zalloc(dtp, sizeof(dtrace_difo_t));
if (dp == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -312,7 +312,7 @@ dt_action_clear(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
"%s( ) argument #1 is incompatible with prototype:\n"
"\tprototype: aggregation\n\t argument: %s\n",
dnp->dn_ident->di_name,
- dt_node_type_name(anp, n, sizeof (n)));
+ dt_node_type_name(anp, n, sizeof(n)));
}
aid = anp->dn_ident;
@@ -355,7 +355,7 @@ dt_action_normalize(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
"%s( ) argument #1 is incompatible with prototype:\n"
"\tprototype: aggregation\n\t argument: %s\n",
dnp->dn_ident->di_name,
- dt_node_type_name(anp, n, sizeof (n)));
+ dt_node_type_name(anp, n, sizeof(n)));
}
if ((normal = anp->dn_list) != NULL && !dt_node_is_scalar(normal)) {
@@ -419,7 +419,7 @@ dt_action_trunc(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
"%s( ) argument #1 is incompatible with prototype:\n"
"\tprototype: aggregation\n\t argument: %s\n",
dnp->dn_ident->di_name,
- dt_node_type_name(anp, n, sizeof (n)));
+ dt_node_type_name(anp, n, sizeof(n)));
}
if (argc == 2) {
@@ -501,7 +501,7 @@ dt_action_printa(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
"%s( ) argument #%d is incompatible with "
"prototype:\n\tprototype: aggregation\n"
"\t argument: %s\n", dnp->dn_ident->di_name, argr,
- dt_node_type_name(anp, n, sizeof (n)));
+ dt_node_type_name(anp, n, sizeof(n)));
}
aid = anp->dn_ident;
@@ -557,7 +557,7 @@ dt_action_printflike(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp,
"%s( ) argument #1 is incompatible with prototype:\n"
"\tprototype: string constant\n\t argument: %s\n",
dnp->dn_ident->di_name,
- dt_node_type_name(dnp->dn_args, n, sizeof (n)));
+ dt_node_type_name(dnp->dn_args, n, sizeof(n)));
}
arg1 = dnp->dn_args->dn_list;
@@ -601,8 +601,8 @@ dt_action_printflike(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp,
struct bpf_insn *dbuf;
dtrace_difo_t *dp;
- if ((dbuf = dt_alloc(dtp, sizeof (struct bpf_insn))) == NULL ||
- (dp = dt_zalloc(dtp, sizeof (dtrace_difo_t))) == NULL) {
+ if ((dbuf = dt_alloc(dtp, sizeof(struct bpf_insn))) == NULL ||
+ (dp = dt_zalloc(dtp, sizeof(dtrace_difo_t))) == NULL) {
dt_free(dtp, dbuf);
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
}
@@ -663,7 +663,7 @@ dt_action_tracemem(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
"tracemem( ) argument #1 is incompatible with "
"prototype:\n\tprototype: pointer or integer\n"
"\t argument: %s\n",
- dt_node_type_name(addr, n, sizeof (n)));
+ dt_node_type_name(addr, n, sizeof(n)));
}
if (dt_node_is_posconst(size) == 0) {
@@ -841,7 +841,7 @@ dt_action_symmod_args(dtrace_hdl_t *dtp, dtrace_actdesc_t *ap,
dt_cg(yypcb, dnp);
ap->dtad_difo = dt_as(yypcb);
ap->dtad_kind = kind;
- ap->dtad_difo->dtdo_rtype.dtdt_size = sizeof (uint64_t);
+ ap->dtad_difo->dtdo_rtype.dtdt_size = sizeof(uint64_t);
}
static void
@@ -921,7 +921,7 @@ dt_action_pcap(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
"pcap( ) argument #1 is incompatible with "
"prototype:\n\tprototype: pointer or integer\n"
"\t argument: %s\n",
- dt_node_type_name(addr, n, sizeof (n)));
+ dt_node_type_name(addr, n, sizeof(n)));
}
proto = addr->dn_list;
@@ -936,7 +936,7 @@ dt_action_pcap(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
* Enough space for 64-bit timestamp, len and pkt data.
*/
- ap->dtad_difo->dtdo_rtype.dtdt_size = (2 * sizeof (uint64_t)) +
+ ap->dtad_difo->dtdo_rtype.dtdt_size = (2 * sizeof(uint64_t)) +
DT_PCAPSIZE(dtp->dt_options[DTRACEOPT_PCAPSIZE]);
ap->dtad_arg = 0;
@@ -974,7 +974,7 @@ dt_action_exit(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
dt_cg(yypcb, dnp->dn_args);
ap->dtad_difo = dt_as(yypcb);
ap->dtad_kind = DTRACEACT_EXIT;
- ap->dtad_difo->dtdo_rtype.dtdt_size = sizeof (int);
+ ap->dtad_difo->dtdo_rtype.dtdt_size = sizeof(int);
}
static void
@@ -1720,7 +1720,7 @@ dt_setcontext(dtrace_hdl_t *dtp, dtrace_probedesc_t *pdp)
if ((prp = dt_probe_info(dtp, pdp, &yypcb->pcb_pinfo)) == NULL) {
pap = &_dtrace_prvdesc;
err = dtrace_errno(dtp);
- memset(&yypcb->pcb_pinfo, 0, sizeof (dtrace_probeinfo_t));
+ memset(&yypcb->pcb_pinfo, 0, sizeof(dtrace_probeinfo_t));
yypcb->pcb_pinfo.dtp_attr = pap->dtpa_provider;
yypcb->pcb_pinfo.dtp_arga = pap->dtpa_args;
} else {
@@ -1791,7 +1791,7 @@ dt_reduceid(dt_idhash_t *dhp, dt_ident_t *idp, dtrace_hdl_t *dtp)
if (idp->di_vers != 0 && idp->di_vers > dtp->dt_vmax)
dt_idhash_delete(dhp, idp);
- return (0);
+ return 0;
}
/*
@@ -1810,12 +1810,12 @@ dt_reduce(dtrace_hdl_t *dtp, dt_version_t v)
dt_xlator_t *dxp, *nxp;
if (v > dtp->dt_vmax)
- return (dt_set_errno(dtp, EDT_VERSREDUCED));
+ return dt_set_errno(dtp, EDT_VERSREDUCED);
else if (v == dtp->dt_vmax)
- return (0); /* no reduction necessary */
+ return 0; /* no reduction necessary */
dt_dprintf("reducing api version to %s\n",
- dt_version_num2str(v, s, sizeof (s)));
+ dt_version_num2str(v, s, sizeof(s)));
dtp->dt_vmax = v;
@@ -1826,12 +1826,12 @@ dt_reduce(dtrace_hdl_t *dtp, dt_version_t v)
dt_list_delete(&dtp->dt_xlators, dxp);
}
- (void) dt_idhash_iter(dtp->dt_macros, (dt_idhash_f *)dt_reduceid, dtp);
- (void) dt_idhash_iter(dtp->dt_aggs, (dt_idhash_f *)dt_reduceid, dtp);
- (void) dt_idhash_iter(dtp->dt_globals, (dt_idhash_f *)dt_reduceid, dtp);
- (void) dt_idhash_iter(dtp->dt_tls, (dt_idhash_f *)dt_reduceid, dtp);
+ dt_idhash_iter(dtp->dt_macros, (dt_idhash_f *)dt_reduceid, dtp);
+ dt_idhash_iter(dtp->dt_aggs, (dt_idhash_f *)dt_reduceid, dtp);
+ dt_idhash_iter(dtp->dt_globals, (dt_idhash_f *)dt_reduceid, dtp);
+ dt_idhash_iter(dtp->dt_tls, (dt_idhash_f *)dt_reduceid, dtp);
- return (0);
+ return 0;
}
/*
@@ -1851,7 +1851,7 @@ static FILE *
dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
{
int argc = dtp->dt_cpp_argc;
- char **argv = alloca(sizeof (char *) * (argc + 5));
+ char **argv = alloca(sizeof(char *) * (argc + 5));
FILE *ofp = tmpfile();
int pipe_needed = 0;
int catpipe[2];
@@ -1868,7 +1868,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
off_t off;
if (argv == NULL || ofp == NULL) {
- (void) dt_set_errno(dtp, errno);
+ dt_set_errno(dtp, errno);
goto err;
}
@@ -1883,30 +1883,29 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
pipe_needed = 1;
if ((c = fgetc(ifp)) == '#' && (c = fgetc(ifp)) == '!') {
- for (off += 2; c != '\n'; off++) {
+ for (off += 2; c != '\n'; off++)
if ((c = fgetc(ifp)) == EOF)
break;
- }
if (c == '\n')
off--; /* start cpp just prior to \n */
}
- (void) fflush(ifp);
+ fflush(ifp);
/*
* Do not touch ifp via stdio from this point on, to avoid
* caching or prereading throwing off the file position.
*/
- (void) lseek(fileno(ifp), off, SEEK_SET);
+ lseek(fileno(ifp), off, SEEK_SET);
if (pipe(catpipe) < 0) {
- (void) dt_set_errno(dtp, errno);
+ dt_set_errno(dtp, errno);
goto err;
}
}
- (void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp));
+ snprintf(opath, sizeof(opath), "/dev/fd/%d", fileno(ofp));
- memcpy(argv, dtp->dt_cpp_argv, sizeof (char *) * argc);
+ memcpy(argv, dtp->dt_cpp_argv, sizeof(char *) * argc);
- (void) snprintf(verdef, sizeof (verdef),
+ snprintf(verdef, sizeof(verdef),
"-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax);
argv[argc++] = verdef;
@@ -1931,19 +1930,19 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
* we block SIGCHLD and reset its disposition to SIG_DFL.
* We restore our signal state once we are done.
*/
- (void) sigemptyset(&mask);
- (void) sigaddset(&mask, SIGCHLD);
- (void) pthread_sigmask(SIG_BLOCK, &mask, &omask);
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGCHLD);
+ pthread_sigmask(SIG_BLOCK, &mask, &omask);
- memset(&act, 0, sizeof (act));
+ memset(&act, 0, sizeof(act));
act.sa_handler = SIG_DFL;
- (void) sigaction(SIGCHLD, &act, &oact);
+ sigaction(SIGCHLD, &act, &oact);
if (pipe_needed) {
if ((catpid = fork()) == -1) {
- (void) sigaction(SIGCHLD, &oact, NULL);
- (void) pthread_sigmask(SIG_SETMASK, &omask, NULL);
- (void) dt_set_errno(dtp, EDT_CPPFORK);
+ sigaction(SIGCHLD, &oact, NULL);
+ pthread_sigmask(SIG_SETMASK, &omask, NULL);
+ dt_set_errno(dtp, EDT_CPPFORK);
goto err;
}
@@ -1966,21 +1965,21 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
}
if ((pid = fork()) == -1) {
- (void) sigaction(SIGCHLD, &oact, NULL);
- (void) pthread_sigmask(SIG_SETMASK, &omask, NULL);
- (void) dt_set_errno(dtp, EDT_CPPFORK);
+ sigaction(SIGCHLD, &oact, NULL);
+ pthread_sigmask(SIG_SETMASK, &omask, NULL);
+ dt_set_errno(dtp, EDT_CPPFORK);
goto err;
}
if (pid == 0) {
if (!pipe_needed) {
- (void) dup2(fileno(ifp), 0);
+ dup2(fileno(ifp), 0);
} else {
- (void) dup2(catpipe[0], 0);
- (void) close(catpipe[0]);
+ dup2(catpipe[0], 0);
+ close(catpipe[0]);
}
- (void) close(fileno(ifp));
- (void) execvp(dtp->dt_cpp_path, argv);
+ close(fileno(ifp));
+ execvp(dtp->dt_cpp_path, argv);
_exit(errno == ENOENT ? 127 : 126);
}
@@ -1997,8 +1996,8 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
} while (waitpid(catpid, &junk, 0) == -1 && errno == EINTR);
}
- (void) sigaction(SIGCHLD, &oact, NULL);
- (void) pthread_sigmask(SIG_SETMASK, &omask, NULL);
+ sigaction(SIGCHLD, &oact, NULL);
+ pthread_sigmask(SIG_SETMASK, &omask, NULL);
dt_dprintf("%s returned exit status %i\n", dtp->dt_cpp_path, wstat);
estat = WIFEXITED(wstat) ? WEXITSTATUS(wstat) : -1;
@@ -2006,28 +2005,28 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
if (estat != 0) {
switch (estat) {
case 126:
- (void) dt_set_errno(dtp, EDT_CPPEXEC);
+ dt_set_errno(dtp, EDT_CPPEXEC);
break;
case 127:
- (void) dt_set_errno(dtp, EDT_CPPENT);
+ dt_set_errno(dtp, EDT_CPPENT);
break;
default:
- (void) dt_set_errno(dtp, EDT_CPPERR);
+ dt_set_errno(dtp, EDT_CPPERR);
}
goto err;
}
- (void) fflush(ofp);
- (void) fseek(ofp, 0, SEEK_SET);
- return (ofp);
+ fflush(ofp);
+ fseek(ofp, 0, SEEK_SET);
+ return ofp;
err:
if (pipe_needed) {
close(catpipe[0]);
close(catpipe[1]);
}
- (void) fclose(ofp);
- return (NULL);
+ fclose(ofp);
+ return NULL;
}
void *
@@ -2041,21 +2040,21 @@ dt_compile(dtrace_hdl_t *dtp, int context, dtrace_probespec_t pspec, void *arg,
int err;
if ((fp == NULL && s == NULL) || (cflags & ~DTRACE_C_MASK) != 0) {
- (void) dt_set_errno(dtp, EINVAL);
- return (NULL);
+ dt_set_errno(dtp, EINVAL);
+ return NULL;
}
if (dt_list_next(&dtp->dt_lib_path) != NULL && dt_load_libs(dtp) != 0)
- return (NULL); /* errno is set for us */
+ return NULL; /* errno is set for us */
- (void) ctf_discard(dtp->dt_cdefs->dm_ctfp);
- (void) ctf_discard(dtp->dt_ddefs->dm_ctfp);
+ ctf_discard(dtp->dt_cdefs->dm_ctfp);
+ ctf_discard(dtp->dt_ddefs->dm_ctfp);
- (void) dt_idhash_iter(dtp->dt_globals, dt_idreset, NULL);
- (void) dt_idhash_iter(dtp->dt_tls, dt_idreset, NULL);
+ dt_idhash_iter(dtp->dt_globals, dt_idreset, NULL);
+ dt_idhash_iter(dtp->dt_tls, dt_idreset, NULL);
if (fp && (cflags & DTRACE_C_CPP) && (fp = dt_preproc(dtp, fp)) == NULL)
- return (NULL); /* errno is set for us */
+ return NULL; /* errno is set for us */
dt_pcb_push(dtp, &pcb);
@@ -2065,7 +2064,7 @@ dt_compile(dtrace_hdl_t *dtp, int context, dtrace_probespec_t pspec, void *arg,
pcb.pcb_strlen = s ? strlen(s) : 0;
pcb.pcb_sargc = argc;
pcb.pcb_sargv = argv;
- pcb.pcb_sflagv = argc ? calloc(argc, sizeof (ushort_t)) : NULL;
+ pcb.pcb_sflagv = argc ? calloc(argc, sizeof(ushort_t)) : NULL;
pcb.pcb_pspec = pspec;
pcb.pcb_cflags = dtp->dt_cflags | cflags;
pcb.pcb_amin = dtp->dt_amin;
@@ -2113,7 +2112,7 @@ dt_compile(dtrace_hdl_t *dtp, int context, dtrace_probespec_t pspec, void *arg,
}
if (yypcb->pcb_pragmas != NULL)
- (void) dt_idhash_iter(yypcb->pcb_pragmas, dt_idpragma, NULL);
+ dt_idhash_iter(yypcb->pcb_pragmas, dt_idpragma, NULL);
if (argc > 1 && !(yypcb->pcb_cflags & DTRACE_C_ARGREF) &&
!(yypcb->pcb_sflagv[argc - 1] & DT_IDFLG_REF)) {
@@ -2148,7 +2147,7 @@ dt_compile(dtrace_hdl_t *dtp, int context, dtrace_probespec_t pspec, void *arg,
dt_compile_xlator(dnp);
break;
case DT_NODE_PROVIDER:
- (void) dt_node_cook(dnp, DT_IDFLG_REF);
+ dt_node_cook(dnp, DT_IDFLG_REF);
break;
}
}
@@ -2162,7 +2161,7 @@ dt_compile(dtrace_hdl_t *dtp, int context, dtrace_probespec_t pspec, void *arg,
break;
case DT_CTX_DEXPR:
- (void) dt_node_cook(yypcb->pcb_root, DT_IDFLG_REF);
+ dt_node_cook(yypcb->pcb_root, DT_IDFLG_REF);
dt_cg(yypcb, yypcb->pcb_root);
rv = dt_as(yypcb);
break;
@@ -2197,11 +2196,11 @@ out:
dt_dprintf("failed to update CTF cache: %s\n", strerror(errno));
if (yypcb->pcb_fileptr && (cflags & DTRACE_C_CPP))
- (void) fclose(yypcb->pcb_fileptr); /* close dt_preproc() file */
+ fclose(yypcb->pcb_fileptr); /* close dt_preproc() file */
dt_pcb_pop(dtp, err);
- (void) dt_set_errno(dtp, err);
- return (err ? NULL : rv);
+ dt_set_errno(dtp, err);
+ return err ? NULL : rv;
}
static dtrace_difo_t *
@@ -2664,15 +2663,15 @@ dtrace_program_fcompile(dtrace_hdl_t *dtp, FILE *fp,
int
dtrace_type_strcompile(dtrace_hdl_t *dtp, const char *s, dtrace_typeinfo_t *dtt)
{
- (void) dt_compile(dtp, DT_CTX_DTYPE,
+ dt_compile(dtp, DT_CTX_DTYPE,
DTRACE_PROBESPEC_NONE, dtt, 0, 0, NULL, NULL, s);
- return (dtp->dt_errno ? -1 : 0);
+ return dtp->dt_errno ? -1 : 0;
}
int
dtrace_type_fcompile(dtrace_hdl_t *dtp, FILE *fp, dtrace_typeinfo_t *dtt)
{
- (void) dt_compile(dtp, DT_CTX_DTYPE,
+ dt_compile(dtp, DT_CTX_DTYPE,
DTRACE_PROBESPEC_NONE, dtt, 0, 0, NULL, fp, NULL);
- return (dtp->dt_errno ? -1 : 0);
+ return dtp->dt_errno ? -1 : 0;
}
diff --git a/libdtrace/dt_cg.c b/libdtrace/dt_cg.c
index 8e440c8e..acaeacee 100644
--- a/libdtrace/dt_cg.c
+++ b/libdtrace/dt_cg.c
@@ -1153,7 +1153,7 @@ static const dt_cg_actdesc_t _dt_cg_actions[DT_ACT_MAX] = {
dt_irnode_t *
dt_cg_node_alloc(uint_t label, struct bpf_insn instr)
{
- dt_irnode_t *dip = malloc(sizeof (dt_irnode_t));
+ dt_irnode_t *dip = malloc(sizeof(dt_irnode_t));
if (dip == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -1163,7 +1163,7 @@ dt_cg_node_alloc(uint_t label, struct bpf_insn instr)
dip->di_extern = NULL;
dip->di_next = NULL;
- return (dip);
+ return dip;
}
/*
@@ -1178,7 +1178,7 @@ dt_cg_membinfo(ctf_file_t *fp, ctf_id_t type, const char *s, ctf_membinfo_t *mp)
char n[DT_TYPE_NAMELEN];
dtrace_typeinfo_t dtt;
- if (ctf_type_name(fp, type, n, sizeof (n)) == NULL ||
+ if (ctf_type_name(fp, type, n, sizeof(n)) == NULL ||
dt_type_lookup(n, &dtt) == -1 || (
dtt.dtt_ctfp == fp && dtt.dtt_type == type))
break; /* unable to improve our position */
@@ -1188,9 +1188,9 @@ dt_cg_membinfo(ctf_file_t *fp, ctf_id_t type, const char *s, ctf_membinfo_t *mp)
}
if (ctf_member_info(fp, type, s, mp) == CTF_ERR)
- return (NULL); /* ctf_errno is set for us */
+ return NULL; /* ctf_errno is set for us */
- return (fp);
+ return fp;
}
void
@@ -1225,7 +1225,7 @@ clp2(size_t x)
x |= (x >> 8);
x |= (x >> 16);
- return (x + 1);
+ return x + 1;
}
/*
@@ -1305,7 +1305,7 @@ dt_cg_load(dt_node_t *dnp, ctf_file_t *ctfp, ctf_id_t type)
if (dnp->dn_flags & DT_NF_USERLAND)
size |= 0x10;
- return (ops[size]);
+ return ops[size];
#endif
}
@@ -1548,7 +1548,7 @@ dt_cg_field_set(dt_node_t *src, dt_irlist_t *dlp,
emit(dlp, BPF_ALU64_REG(BPF_OR, r1, r2));
dt_regset_free(drp, r2);
- return (r1);
+ return r1;
}
static void
@@ -1674,9 +1674,9 @@ dt_cg_typecast(const dt_node_t *src, const dt_node_t *dst,
dstsize = dt_node_type_size(dst);
if (dstsize < srcsize)
- n = sizeof (uint64_t) * NBBY - dstsize * NBBY;
+ n = sizeof(uint64_t) * NBBY - dstsize * NBBY;
else
- n = sizeof (uint64_t) * NBBY - srcsize * NBBY;
+ n = sizeof(uint64_t) * NBBY - srcsize * NBBY;
if (dt_node_is_scalar(dst) && n != 0 && (dstsize < srcsize ||
(src->dn_flags & DT_NF_SIGNED) ^ (dst->dn_flags & DT_NF_SIGNED))) {
@@ -1843,7 +1843,7 @@ dt_cg_stvar(const dt_ident_t *idp)
uint_t i = (((idp->di_flags & DT_IDFLG_LOCAL) != 0) << 1) |
((idp->di_flags & DT_IDFLG_TLS) != 0);
- return (idp->di_kind == DT_IDENT_ARRAY ? aops[i] : sops[i]);
+ return idp->di_kind == DT_IDENT_ARRAY ? aops[i] : sops[i];
}
#endif
@@ -1965,14 +1965,14 @@ dt_cg_compare_signed(dt_node_t *dnp)
if (dt_node_is_string(dnp->dn_left) ||
dt_node_is_string(dnp->dn_right))
- return (1); /* strings always compare signed */
+ return 1; /* strings always compare signed */
else if (!dt_node_is_arith(dnp->dn_left) ||
!dt_node_is_arith(dnp->dn_right))
- return (0); /* non-arithmetic types always compare unsigned */
+ return 0; /* non-arithmetic types always compare unsigned */
- memset(&dn, 0, sizeof (dn));
+ memset(&dn, 0, sizeof(dn));
dt_node_promote(dnp->dn_left, dnp->dn_right, &dn);
- return (dn.dn_flags & DT_NF_SIGNED);
+ return dn.dn_flags & DT_NF_SIGNED;
}
static void
@@ -2166,13 +2166,13 @@ dt_cg_asgn_op(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
* modified according to each instantiated member so that we
* can pass them to dt_cg_store() and effect a member store.
*/
- memset(&dn, 0, sizeof (dt_node_t));
+ memset(&dn, 0, sizeof(dt_node_t));
dn.dn_kind = DT_NODE_OP2;
dn.dn_op = DT_TOK_DOT;
dn.dn_left = dnp;
dn.dn_right = &mn;
- memset(&mn, 0, sizeof (dt_node_t));
+ memset(&mn, 0, sizeof(dt_node_t));
mn.dn_kind = DT_NODE_IDENT;
mn.dn_op = DT_TOK_IDENT;
@@ -2437,11 +2437,11 @@ dt_cg_array_op(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
if (idp->di_id != DIF_VAR_ARGS || !dt_node_is_scalar(dnp))
return;
- if ((size = dt_node_type_size(dnp)) == sizeof (uint64_t))
+ if ((size = dt_node_type_size(dnp)) == sizeof(uint64_t))
return;
- assert(size < sizeof (uint64_t));
- n = sizeof (uint64_t) * NBBY - size * NBBY;
+ assert(size < sizeof(uint64_t));
+ n = sizeof(uint64_t) * NBBY - size * NBBY;
emit(dlp, BPF_ALU64_IMM(BPF_LSH, dnp->dn_reg, n));
emit(dlp, BPF_ALU64_REG((dnp->dn_flags & DT_NF_SIGNED) ? BPF_ARSH : BPF_RSH, dnp->dn_reg, n));
diff --git a/libdtrace/dt_consume.c b/libdtrace/dt_consume.c
index 8adb6b1f..b3aea54f 100644
--- a/libdtrace/dt_consume.c
+++ b/libdtrace/dt_consume.c
@@ -33,9 +33,9 @@ static long double
dt_fabsl(long double x)
{
if (x < 0)
- return (-x);
+ return -x;
- return (x);
+ return x;
}
/*
@@ -45,19 +45,19 @@ dt_fabsl(long double x)
static int
dt_gt_128(uint64_t *a, uint64_t *b)
{
- return (a[1] > b[1] || (a[1] == b[1] && a[0] > b[0]));
+ return a[1] > b[1] || (a[1] == b[1] && a[0] > b[0]);
}
static int
dt_ge_128(uint64_t *a, uint64_t *b)
{
- return (a[1] > b[1] || (a[1] == b[1] && a[0] >= b[0]));
+ return a[1] > b[1] || (a[1] == b[1] && a[0] >= b[0]);
}
static int
dt_le_128(uint64_t *a, uint64_t *b)
{
- return (a[1] < b[1] || (a[1] == b[1] && a[0] <= b[0]));
+ return a[1] < b[1] || (a[1] == b[1] && a[0] <= b[0]);
}
/*
@@ -113,7 +113,7 @@ dt_nbits_128(uint64_t *a)
nbits++;
}
- return (nbits);
+ return nbits;
}
static void
@@ -331,7 +331,7 @@ dt_sqrt_128(uint64_t *square)
assert(result[1] == 0);
- return (result[0]);
+ return result[0];
}
uint64_t
@@ -359,7 +359,7 @@ dt_stddev(uint64_t *data, uint64_t normal)
dt_subtract_128(avg_of_squares, square_of_avg, diff);
- return (dt_sqrt_128(diff));
+ return dt_sqrt_128(diff);
}
static int
@@ -480,16 +480,16 @@ dt_print_quantline(dtrace_hdl_t *dtp, FILE *fp, int64_t val,
depth = 0;
}
- return (dt_printf(dtp, fp, "|%s%s %-9lld\n", ats + len - depth,
- spaces + depth, (long long)val / normal));
+ return dt_printf(dtp, fp, "|%s%s %-9lld\n", ats + len - depth,
+ spaces + depth, (long long)val / normal);
}
if (!positives) {
f = (dt_fabsl((long double)val) * len) / total;
depth = (uint_t)(f + 0.5);
- return (dt_printf(dtp, fp, "%s%s| %-9lld\n", spaces + depth,
- ats + len - depth, (long long)val / normal));
+ return dt_printf(dtp, fp, "%s%s| %-9lld\n", spaces + depth,
+ ats + len - depth, (long long)val / normal);
}
/*
@@ -506,14 +506,13 @@ dt_print_quantline(dtrace_hdl_t *dtp, FILE *fp, int64_t val,
f = (dt_fabsl((long double)val) * len) / total;
depth = (uint_t)(f + 0.5);
- if (val <= 0) {
- return (dt_printf(dtp, fp, "%s%s|%*s %-9lld\n", spaces + depth,
- ats + len - depth, len, "", (long long)val / normal));
- } else {
- return (dt_printf(dtp, fp, "%20s|%s%s %-9lld\n", "",
+ if (val <= 0)
+ return dt_printf(dtp, fp, "%s%s|%*s %-9lld\n", spaces + depth,
+ ats + len - depth, len, "", (long long)val / normal);
+ else
+ return dt_printf(dtp, fp, "%20s|%s%s %-9lld\n", "",
ats + len - depth, spaces + depth,
- (long long)val / normal));
- }
+ (long long)val / normal);
}
int
@@ -525,8 +524,8 @@ dt_print_quantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
long double total = 0;
char positives = 0, negatives = 0;
- if (size != DTRACE_QUANTIZE_NBUCKETS * sizeof (uint64_t))
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ if (size != DTRACE_QUANTIZE_NBUCKETS * sizeof(uint64_t))
+ return dt_set_errno(dtp, EDT_DMISMATCH);
while (first_bin <= last_bin && data[first_bin] == 0)
first_bin++;
@@ -558,19 +557,19 @@ dt_print_quantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
"------------- Distribution -------------", "count") < 0)
- return (-1);
+ return -1;
for (i = first_bin; i <= last_bin; i++) {
if (dt_printf(dtp, fp, "%16lld ",
(long long)DTRACE_QUANTIZE_BUCKETVAL(i)) < 0)
- return (-1);
+ return -1;
if (dt_print_quantline(dtp, fp, data[i], normal, total,
positives, negatives) < 0)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
int
@@ -620,19 +619,17 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
"------------- Distribution -------------", "count") < 0)
- return (-1);
+ return -1;
for (i = first_bin; i <= last_bin; i++) {
char c[32];
int err;
if (i == 0) {
- (void) snprintf(c, sizeof (c), "< %d",
- base);
+ snprintf(c, sizeof(c), "< %d", base);
err = dt_printf(dtp, fp, "%16s ", c);
} else if (i == levels + 1) {
- (void) snprintf(c, sizeof (c), ">= %d",
- base + (levels * step));
+ snprintf(c, sizeof(c), ">= %d", base + (levels * step));
err = dt_printf(dtp, fp, "%16s ", c);
} else {
err = dt_printf(dtp, fp, "%16d ",
@@ -641,10 +638,10 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
if (err < 0 || dt_print_quantline(dtp, fp, data[i], normal,
total, positives, negatives) < 0)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
int
@@ -660,8 +657,8 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
long double total = 0;
char positives = 0, negatives = 0;
- if (size < sizeof (uint64_t))
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ if (size < sizeof(uint64_t))
+ return dt_set_errno(dtp, EDT_DMISMATCH);
factor = DTRACE_LLQUANTIZE_FACTOR(sig);
lmag = DTRACE_LLQUANTIZE_LMAG(sig);
@@ -684,8 +681,8 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
*/
nbins = (hmag - lmag + 1) * (steps - steps_factor) * 2 + 2 + 1;
- if (size != sizeof (uint64_t) * nbins)
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ if (size != sizeof(uint64_t) * nbins)
+ return dt_set_errno(dtp, EDT_DMISMATCH);
/* look for first and last bins with data */
last_bin = nbins - 1;
@@ -709,7 +706,7 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
"------------- Distribution -------------", "count") < 0)
- return (-1);
+ return -1;
/* broaden the range a little bit for reporting purposes */
if (first_bin > 0)
@@ -733,7 +730,7 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
if ((I) >= first_bin - pad && (I) <= last_bin + pad) \
snprintf(c + cwidth * ((I) - first_bin + pad), cwidth, FORMAT, VAL)
- scale = (uint64_t) powl(factor, lmag);
+ scale = (uint64_t)powl(factor, lmag);
/*
* bin0 is for "abs(value)<scale". Note:
* - "abs() < 1" is better written as "0"
@@ -741,14 +738,14 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
* Might as well call this bin "<scale" and not mention "abs()".
*/
if (scale == 1) {
- CPRINT(bin0, "%d", (int) 0);
+ CPRINT(bin0, "%d", (int)0);
} else if (first_bin >= bin0) {
- CPRINT(bin0, "< %llu", (long long unsigned) scale);
+ CPRINT(bin0, "< %llu", (long long unsigned)scale);
} else {
- CPRINT(bin0, "abs() < %llu", (long long unsigned) scale);
+ CPRINT(bin0, "abs() < %llu", (long long unsigned)scale);
}
- CPRINT((bin0-1), "-%llu", (long long unsigned) scale);
- CPRINT((bin0+1), "%llu", (long long unsigned) scale);
+ CPRINT((bin0-1), "-%llu", (long long unsigned)scale);
+ CPRINT((bin0+1), "%llu", (long long unsigned)scale);
mag = lmag;
i = 1;
if (lmag == 0 && steps > factor) {
@@ -759,22 +756,22 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
}
mag++;
}
- scale = (uint64_t) powl(factor, mag + 1) / steps;
+ scale = (uint64_t)powl(factor, mag + 1) / steps;
for ( ; mag <= hmag; mag++) {
for (step = steps_factor + 1; step <= steps; step++) {
i++;
- CPRINT((bin0-i), "-%llu", (long long unsigned) (step * scale));
- CPRINT((bin0+i), "%llu", (long long unsigned) (step * scale));
+ CPRINT((bin0-i), "-%llu", (long long unsigned)(step * scale));
+ CPRINT((bin0+i), "%llu", (long long unsigned)(step * scale));
}
scale *= factor;
}
- scale = (uint64_t) powl(factor, hmag + 1);
- CPRINT(0 , "<= -%llu", (long long unsigned) scale);
- CPRINT(nbins-1, ">= %llu", (long long unsigned) scale);
+ scale = (uint64_t)powl(factor, hmag + 1);
+ CPRINT(0 , "<= -%llu", (long long unsigned)scale);
+ CPRINT(nbins-1, ">= %llu", (long long unsigned)scale);
#undef CPRINT
/* deal with the ghost-bin problem */
- if ( pad > 0 ) {
+ if (pad > 0) {
int j;
/* first_bin */
j = cwidth * (first_bin - first_bin + pad);
@@ -786,7 +783,7 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
memcpy(c+j, c+j-cwidth*i, cwidth);
}
/* last_bin */
- j = cwidth * ( last_bin - first_bin + pad);
+ j = cwidth * (last_bin - first_bin + pad);
if (c[j] == 0) {
for (i = 1; i < pad; i++)
if (c[j+cwidth*i] != 0)
@@ -803,10 +800,10 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr, size_t size,
err = dt_printf(dtp, fp, "%16s ", c + cwidth*(i-first_bin+pad));
if (err < 0 || dt_print_quantline(dtp, fp, data[i], normal,
total, positives, negatives) < 0)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -817,8 +814,8 @@ dt_print_average(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
/* LINTED - alignment */
int64_t *data = (int64_t *)addr;
- return (dt_printf(dtp, fp, " %16lld", data[0] ?
- (long long)(data[1] / (int64_t)normal / data[0]) : 0));
+ return dt_printf(dtp, fp, " %16lld", data[0] ?
+ (long long)(data[1] / (int64_t)normal / data[0]) : 0);
}
/*ARGSUSED*/
@@ -829,8 +826,8 @@ dt_print_stddev(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
/* LINTED - alignment */
uint64_t *data = (uint64_t *)addr;
- return (dt_printf(dtp, fp, " %16llu", data[0] ?
- (unsigned long long) dt_stddev(data, normal) : 0));
+ return dt_printf(dtp, fp, " %16llu", data[0] ?
+ (unsigned long long)dt_stddev(data, normal) : 0);
}
static int
@@ -840,46 +837,46 @@ dt_print_rawbytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr, size_t nbytes)
char *c = (char *)addr;
if (nbytes == 0)
- return (0);
+ return 0;
if (dt_printf(dtp, fp, "\n%*s ", margin, "") < 0)
- return (-1);
+ return -1;
for (i = 0; i < 16; i++)
if (dt_printf(dtp, fp, " %c", "0123456789abcdef"[i]) < 0)
- return (-1);
+ return -1;
if (dt_printf(dtp, fp, " 0123456789abcdef\n") < 0)
- return (-1);
+ return -1;
for (i = 0; i < nbytes; i += 16) {
if (dt_printf(dtp, fp, "%*s%5x:", margin, "", i) < 0)
- return (-1);
+ return -1;
for (j = i; j < i + 16 && j < nbytes; j++) {
if (dt_printf(dtp, fp, " %02x", (uchar_t)c[j]) < 0)
- return (-1);
+ return -1;
}
while (j++ % 16) {
if (dt_printf(dtp, fp, " ") < 0)
- return (-1);
+ return -1;
}
if (dt_printf(dtp, fp, " ") < 0)
- return (-1);
+ return -1;
for (j = i; j < i + 16 && j < nbytes; j++) {
if (dt_printf(dtp, fp, "%c",
c[j] < ' ' || c[j] > '~' ? '.' : c[j]) < 0)
- return (-1);
+ return -1;
}
if (dt_printf(dtp, fp, "\n") < 0)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -896,10 +893,10 @@ dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
char *c = (char *)addr;
if (nbytes == 0)
- return (0);
+ return 0;
if (dtp->dt_options[DTRACEOPT_RAWBYTES] != DTRACEOPT_UNSET)
- return (dt_print_rawbytes(dtp, fp, addr, nbytes));
+ return dt_print_rawbytes(dtp, fp, addr, nbytes);
for (i = 0; i < nbytes; i++) {
/*
@@ -934,9 +931,9 @@ dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
break;
if (quiet)
- return (dt_printf(dtp, fp, "%s", c));
+ return dt_printf(dtp, fp, "%s", c);
else
- return (dt_printf(dtp, fp, " %-*s", width, c));
+ return dt_printf(dtp, fp, " %-*s", width, c);
}
break;
@@ -951,11 +948,11 @@ dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
char *s = alloca(nbytes + 1);
memcpy(s, c, nbytes);
s[nbytes] = '\0';
- return (dt_printf(dtp, fp, " %-*s", width, s));
+ return dt_printf(dtp, fp, " %-*s", width, s);
}
/* print the bytes raw */
- return (dt_print_rawbytes(dtp, fp, addr, nbytes));
+ return dt_print_rawbytes(dtp, fp, addr, nbytes);
}
#ifdef FIXME
@@ -976,7 +973,7 @@ dt_print_tracemem(dtrace_hdl_t *dtp, FILE *fp, const dtrace_recdesc_t *rec,
int dpositive;
if (nrecs < 2)
- return (dt_set_errno(dtp, EDT_TRACEMEM));
+ return dt_set_errno(dtp, EDT_TRACEMEM);
drec = rec + 1;
darg = drec->dtrd_arg;
@@ -985,10 +982,10 @@ dt_print_tracemem(dtrace_hdl_t *dtp, FILE *fp, const dtrace_recdesc_t *rec,
if (drec->dtrd_action != DTRACEACT_TRACEMEM ||
(darg != DTRACE_TRACEMEM_SIZE &&
darg != DTRACE_TRACEMEM_SSIZE))
- return (dt_set_errno(dtp, EDT_TRACEMEM));
+ return dt_set_errno(dtp, EDT_TRACEMEM);
if (dt_variable_read(daddr, drec->dtrd_size, &dsize) < 0)
- return (dt_set_errno(dtp, EDT_TRACEMEM));
+ return dt_set_errno(dtp, EDT_TRACEMEM);
dpositive = drec->dtrd_arg == DTRACE_TRACEMEM_SIZE ||
(dsize & (1 << (drec->dtrd_size * NBBY - 1))) == 0;
@@ -998,13 +995,13 @@ dt_print_tracemem(dtrace_hdl_t *dtp, FILE *fp, const dtrace_recdesc_t *rec,
nconsumed++;
} else if (arg != DTRACE_TRACEMEM_STATIC) {
- return (dt_set_errno(dtp, EDT_TRACEMEM));
+ return dt_set_errno(dtp, EDT_TRACEMEM);
}
if (dt_print_rawbytes(dtp, fp, addr, size) < 0)
- return (-1);
+ return -1;
- return (nconsumed);
+ return nconsumed;
}
#endif
@@ -1019,7 +1016,7 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
uint64_t pc;
if (dt_printf(dtp, fp, "\n") < 0)
- return (-1);
+ return -1;
if (format == NULL)
format = "%s";
@@ -1031,18 +1028,18 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
for (i = 0; i < depth; i++) {
switch (size) {
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
/* LINTED - alignment */
pc = *((uint32_t *)addr);
break;
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
/* LINTED - alignment */
pc = *((uint64_t *)addr);
break;
default:
- return (dt_set_errno(dtp, EDT_BADSTACKPC));
+ return dt_set_errno(dtp, EDT_BADSTACKPC);
}
if (pc == 0)
@@ -1051,15 +1048,15 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
addr += size;
if (dt_printf(dtp, fp, "%*s", indent, "") < 0)
- return (-1);
+ return -1;
if (dtrace_lookup_by_addr(dtp, pc, &sym, &dts) == 0) {
if (pc > sym.st_value)
- snprintf(c, sizeof (c), "%s`%s+0x%llx",
+ snprintf(c, sizeof(c), "%s`%s+0x%llx",
dts.object, dts.name,
(long long unsigned)pc - sym.st_value);
else
- snprintf(c, sizeof (c), "%s`%s",
+ snprintf(c, sizeof(c), "%s`%s",
dts.object, dts.name);
} else {
/*
@@ -1067,23 +1064,22 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
* a NULL GElf_Sym -- indicating that we're only
* interested in the containing module.
*/
- if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0) {
- snprintf(c, sizeof (c), "%s`0x%llx",
+ if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0)
+ snprintf(c, sizeof(c), "%s`0x%llx",
dts.object, (long long unsigned)pc);
- } else {
- (void) snprintf(c, sizeof (c), "0x%llx",
- (long long unsigned) pc);
- }
+ else
+ snprintf(c, sizeof(c), "0x%llx",
+ (long long unsigned)pc);
}
if (dt_printf(dtp, fp, format, c) < 0)
- return (-1);
+ return -1;
if (dt_printf(dtp, fp, "\n") < 0)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
int
@@ -1094,7 +1090,7 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
uint64_t *pc = ((uint64_t *)addr) + 1;
uint32_t depth = DTRACE_USTACK_NFRAMES(arg);
uint32_t strsize = DTRACE_USTACK_STRSIZE(arg);
- const char *strbase = addr + (depth + 2) * sizeof (uint64_t);
+ const char *strbase = addr + (depth + 2) * sizeof(uint64_t);
const char *str = strsize ? strbase : NULL;
int err = 0;
@@ -1105,12 +1101,12 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
pid_t pid = -1, tgid;
if (depth == 0)
- return (0);
+ return 0;
tgid = (pid_t)*pc++;
if (dt_printf(dtp, fp, "\n") < 0)
- return (-1);
+ return -1;
if (format == NULL)
format = "%s";
@@ -1146,23 +1142,23 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
if (pmap)
offset = pc[i] - pmap->pr_vaddr;
- (void) snprintf(c, sizeof(c), "%s:0x%llx",
+ snprintf(c, sizeof(c), "%s:0x%llx",
dt_basename(objname), (u_longlong_t)offset);
} else
- (void) snprintf(c, sizeof(c), "0x%llx",
+ snprintf(c, sizeof(c), "0x%llx",
(u_longlong_t)pc[i]);
} else if (pid >= 0 && dt_Plookup_by_addr(dtp, pid, pc[i],
&name, &sym) == 0) {
- dt_Pobjname(dtp, pid, pc[i], objname, sizeof (objname));
+ dt_Pobjname(dtp, pid, pc[i], objname, sizeof(objname));
if (pc[i] > sym.st_value)
- snprintf(c, sizeof (c), "%s`%s+0x%llx",
+ snprintf(c, sizeof(c), "%s`%s+0x%llx",
dt_basename(objname), name,
(u_longlong_t)(pc[i] - sym.st_value));
else
- snprintf(c, sizeof (c), "%s`%s",
+ snprintf(c, sizeof(c), "%s`%s",
dt_basename(objname), name);
/* Allocated by Plookup_by_addr. */
@@ -1184,16 +1180,15 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
* writable, we assume that we have fallen into this
* case and we refuse to use the string.
*/
- (void) snprintf(c, sizeof (c), "%s", str);
+ snprintf(c, sizeof(c), "%s", str);
} else {
if (pid >= 0 && dt_Pobjname(dtp, pid, pc[i], objname,
- sizeof (objname)) != NULL) {
- (void) snprintf(c, sizeof (c), "%s`0x%llx",
+ sizeof(objname)) != NULL)
+ snprintf(c, sizeof(c), "%s`0x%llx",
dt_basename(objname), (u_longlong_t)pc[i]);
- } else {
- (void) snprintf(c, sizeof (c), "0x%llx",
+ else
+ snprintf(c, sizeof(c), "0x%llx",
(u_longlong_t)pc[i]);
- }
}
if ((err = dt_printf(dtp, fp, format, c)) < 0)
@@ -1212,7 +1207,7 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
if ((err = dt_printf(dtp, fp, "%*s", indent, "")) < 0)
break;
- (void) snprintf(c, sizeof (c), " [ %s ]", &str[1]);
+ snprintf(c, sizeof(c), " [ %s ]", &str[1]);
if ((err = dt_printf(dtp, fp, format, c)) < 0)
break;
@@ -1231,7 +1226,7 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
if (pid >= 0)
dt_proc_release_unlock(dtp, pid);
- return (err);
+ return err;
}
static int
@@ -1265,7 +1260,7 @@ dt_print_usym(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr, dtrace_actkind_t act)
s = alloca(n);
} while ((len = dtrace_uaddr2str(dtp, tgid, pc, s, n)) > n);
- return (dt_printf(dtp, fp, format, s));
+ return dt_printf(dtp, fp, format, s);
}
int
@@ -1292,18 +1287,17 @@ dt_print_umod(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr)
DTRACE_PROC_SHORTLIVED);
if (pid >= 0 && dt_Pobjname(dtp, pid, pc, objname,
- sizeof (objname)) != NULL) {
- (void) snprintf(c, sizeof (c), "%s", dt_basename(objname));
- } else {
- (void) snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc);
- }
+ sizeof(objname)) != NULL)
+ snprintf(c, sizeof(c), "%s", dt_basename(objname));
+ else
+ snprintf(c, sizeof(c), "0x%llx", (u_longlong_t)pc);
err = dt_printf(dtp, fp, format, c);
if (pid >= 0)
dt_proc_release_unlock(dtp, pid);
- return (err);
+ return err;
}
static int
@@ -1319,7 +1313,7 @@ dt_print_sym(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr)
format = " %-50s";
if (dtrace_lookup_by_addr(dtp, pc, &sym, &dts) == 0) {
- snprintf(c, sizeof (c), "%s`%s", dts.object, dts.name);
+ snprintf(c, sizeof(c), "%s`%s", dts.object, dts.name);
} else {
/*
* We'll repeat the lookup, but this time we'll specify a
@@ -1327,16 +1321,16 @@ dt_print_sym(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr)
* the containing module.
*/
if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0)
- snprintf(c, sizeof (c), "%s`0x%llx",
+ snprintf(c, sizeof(c), "%s`0x%llx",
dts.object, (u_longlong_t)pc);
else
- snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc);
+ snprintf(c, sizeof(c), "0x%llx", (u_longlong_t)pc);
}
if (dt_printf(dtp, fp, format, c) < 0)
- return (-1);
+ return -1;
- return (0);
+ return 0;
}
int
@@ -1351,14 +1345,14 @@ dt_print_mod(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr)
format = " %-50s";
if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0)
- snprintf(c, sizeof (c), "%s", dts.object);
+ snprintf(c, sizeof(c), "%s", dts.object);
else
- snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc);
+ snprintf(c, sizeof(c), "0x%llx", (u_longlong_t)pc);
if (dt_printf(dtp, fp, format, c) < 0)
- return (-1);
+ return -1;
- return (0);
+ return 0;
}
int
@@ -1372,16 +1366,16 @@ dt_print_pcap(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
addr = (caddr_t)buf + rec->dtrd_offset;
- if (dt_variable_read(addr, sizeof (uint64_t), &time) < 0 ||
- dt_variable_read(addr + sizeof (uint64_t), sizeof (uint64_t),
+ if (dt_variable_read(addr, sizeof(uint64_t), &time) < 0 ||
+ dt_variable_read(addr + sizeof(uint64_t), sizeof(uint64_t),
&pktlen) < 0)
- return (dt_set_errno(dtp, EDT_PCAP));
+ return dt_set_errno(dtp, EDT_PCAP);
if (pktlen == 0) {
/*
* skb must have been NULL, skip without capturing.
*/
- return (0);
+ return 0;
}
maxlen = DT_PCAPSIZE(dtp->dt_options[DTRACEOPT_PCAPSIZE]);
@@ -1390,7 +1384,7 @@ dt_print_pcap(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
paddr = (caddr_t)buf + prec->dtrd_offset;
if (dt_variable_read(paddr, prec->dtrd_size, &proto) < 0)
- return (dt_set_errno(dtp, EDT_PCAP));
+ return dt_set_errno(dtp, EDT_PCAP);
/*
* Dump pcap data to dump file if handler command/output file is
@@ -1400,14 +1394,14 @@ dt_print_pcap(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
filename = dt_pcap_filename(dtp, fp);
if (filename != NULL) {
dt_pcap_dump(dtp, filename, proto, time,
- addr + (2 * sizeof (uint64_t)), (uint32_t)pktlen,
+ addr + (2 * sizeof(uint64_t)), (uint32_t)pktlen,
(uint32_t)maxlen);
} else {
if (dt_print_rawbytes(dtp, fp, addr + (2 * sizeof(uint64_t)),
pktlen > maxlen ? maxlen : pktlen) < 0)
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
#ifdef FIXME
@@ -1424,13 +1418,13 @@ dt_normalize_agg(const dtrace_aggdata_t *aggdata, void *arg)
dtrace_aggid_t id = normal->dtnd_id;
if (agg->dtagd_nrecs == 0)
- return (DTRACE_AGGWALK_NEXT);
+ return DTRACE_AGGWALK_NEXT;
if (agg->dtagd_varid != id)
- return (DTRACE_AGGWALK_NEXT);
+ return DTRACE_AGGWALK_NEXT;
((dtrace_aggdata_t *)aggdata)->dtada_normal = normal->dtnd_normal;
- return (DTRACE_AGGWALK_NORMALIZE);
+ return DTRACE_AGGWALK_NORMALIZE;
}
static int
@@ -1461,19 +1455,19 @@ dt_normalize(dtrace_hdl_t *dtp, caddr_t base, dtrace_recdesc_t *rec)
addr = base + rec->dtrd_offset;
switch (rec->dtrd_size) {
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
/* LINTED - alignment */
normal.dtnd_normal = *((uint64_t *)addr);
break;
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
/* LINTED - alignment */
normal.dtnd_normal = *((uint32_t *)addr);
break;
- case sizeof (uint16_t):
+ case sizeof(uint16_t):
/* LINTED - alignment */
normal.dtnd_normal = *((uint16_t *)addr);
break;
- case sizeof (uint8_t):
+ case sizeof(uint8_t):
normal.dtnd_normal = *((uint8_t *)addr);
break;
default:
@@ -1528,16 +1522,16 @@ dt_trunc_agg(const dtrace_aggdata_t *aggdata, void *arg)
dtrace_aggid_t id = trunc->dttd_id;
if (agg->dtagd_nrecs == 0)
- return (DTRACE_AGGWALK_NEXT);
+ return DTRACE_AGGWALK_NEXT;
if (agg->dtagd_varid != id)
- return (DTRACE_AGGWALK_NEXT);
+ return DTRACE_AGGWALK_NEXT;
if (trunc->dttd_remaining == 0)
- return (DTRACE_AGGWALK_REMOVE);
+ return DTRACE_AGGWALK_REMOVE;
trunc->dttd_remaining--;
- return (DTRACE_AGGWALK_NEXT);
+ return DTRACE_AGGWALK_NEXT;
}
static int
@@ -1571,19 +1565,19 @@ dt_trunc(dtrace_hdl_t *dtp, caddr_t base, dtrace_recdesc_t *rec)
addr = base + rec->dtrd_offset;
switch (rec->dtrd_size) {
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
/* LINTED - alignment */
remaining = *((int64_t *)addr);
break;
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
/* LINTED - alignment */
remaining = *((int32_t *)addr);
break;
- case sizeof (uint16_t):
+ case sizeof(uint16_t):
/* LINTED - alignment */
remaining = *((int16_t *)addr);
break;
- case sizeof (uint8_t):
+ case sizeof(uint8_t):
remaining = *((int8_t *)addr);
break;
default:
@@ -1654,22 +1648,22 @@ dt_print_datum(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
}
switch (size) {
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
err = dt_printf(dtp, fp, " %16lld",
/* LINTED - alignment */
(long long)*((uint64_t *)addr) / normal);
break;
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
/* LINTED - alignment */
err = dt_printf(dtp, fp, " %8d", *((uint32_t *)addr) /
(uint32_t)normal);
break;
- case sizeof (uint16_t):
+ case sizeof(uint16_t):
/* LINTED - alignment */
err = dt_printf(dtp, fp, " %5d", *((uint16_t *)addr) /
(uint32_t)normal);
break;
- case sizeof (uint8_t):
+ case sizeof(uint8_t):
err = dt_printf(dtp, fp, " %3d", *((uint8_t *)addr) /
(uint32_t)normal);
break;
@@ -1842,32 +1836,32 @@ dt_setopt(dtrace_hdl_t *dtp, const dtrace_probedata_t *data,
const char *errstr;
dtrace_setoptdata_t optdata;
- memset(&optdata, 0, sizeof (optdata));
- (void) dtrace_getopt(dtp, option, &optdata.dtsda_oldval);
+ memset(&optdata, 0, sizeof(optdata));
+ dtrace_getopt(dtp, option, &optdata.dtsda_oldval);
if (dtrace_setopt(dtp, option, value) == 0) {
- (void) dtrace_getopt(dtp, option, &optdata.dtsda_newval);
+ dtrace_getopt(dtp, option, &optdata.dtsda_newval);
optdata.dtsda_probe = data;
optdata.dtsda_option = option;
optdata.dtsda_handle = dtp;
if ((rval = dt_handle_setopt(dtp, &optdata)) != 0)
- return (rval);
+ return rval;
- return (0);
+ return 0;
}
errstr = dtrace_errmsg(dtp, dtrace_errno(dtp));
len = strlen(option) + strlen(value) + strlen(errstr) + 80;
msg = alloca(len);
- (void) snprintf(msg, len, "couldn't set option \"%s\" to \"%s\": %s\n",
+ snprintf(msg, len, "couldn't set option \"%s\" to \"%s\": %s\n",
option, value, errstr);
if ((rval = dt_handle_liberr(dtp, data, msg)) == 0)
- return (0);
+ return 0;
- return (rval);
+ return rval;
}
static int
diff --git a/libdtrace/dt_decl.c b/libdtrace/dt_decl.c
index 231a2506..1f4936dd 100644
--- a/libdtrace/dt_decl.c
+++ b/libdtrace/dt_decl.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -20,7 +20,7 @@ static dt_decl_t *
dt_decl_check(dt_decl_t *ddp)
{
if (ddp->dd_kind == CTF_K_UNKNOWN)
- return (ddp); /* nothing to check if the type is not yet set */
+ return ddp; /* nothing to check if the type is not yet set */
if (ddp->dd_name != NULL && strcmp(ddp->dd_name, "char") == 0 &&
(ddp->dd_attr & (DT_DA_SHORT | DT_DA_LONG | DT_DA_LONGLONG))) {
@@ -48,13 +48,13 @@ dt_decl_check(dt_decl_t *ddp)
"floating-point type\n");
}
- return (ddp);
+ return ddp;
}
dt_decl_t *
dt_decl_alloc(ushort_t kind, char *name)
{
- dt_decl_t *ddp = malloc(sizeof (dt_decl_t));
+ dt_decl_t *ddp = malloc(sizeof(dt_decl_t));
if (ddp == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -67,7 +67,7 @@ dt_decl_alloc(ushort_t kind, char *name)
ddp->dd_node = NULL;
ddp->dd_next = NULL;
- return (ddp);
+ return ddp;
}
void
@@ -106,14 +106,14 @@ dt_decl_push(dt_decl_t *ddp)
if (top != NULL &&
top->dd_kind == CTF_K_UNKNOWN && top->dd_name == NULL) {
top->dd_kind = CTF_K_INTEGER;
- (void) dt_decl_check(top);
+ dt_decl_check(top);
}
assert(ddp->dd_next == NULL);
ddp->dd_next = top;
dsp->ds_decl = ddp;
- return (ddp);
+ return ddp;
}
dt_decl_t *
@@ -130,7 +130,7 @@ dt_decl_pop(void)
dsp->ds_class = DT_DC_DEFAULT;
dsp->ds_enumval = -1;
- return (ddp);
+ return ddp;
}
dt_decl_t *
@@ -148,7 +148,7 @@ dt_decl_pop_param(char **idp)
dsp->ds_ident = NULL;
}
- return (dt_decl_pop());
+ return dt_decl_pop();
}
dt_decl_t *
@@ -161,10 +161,10 @@ dt_decl_top(void)
if (ddp->dd_kind == CTF_K_UNKNOWN && ddp->dd_name == NULL) {
ddp->dd_kind = CTF_K_INTEGER;
- (void) dt_decl_check(ddp);
+ dt_decl_check(ddp);
}
- return (ddp);
+ return ddp;
}
dt_decl_t *
@@ -184,7 +184,7 @@ dt_decl_ident(char *name)
if (ddp == NULL)
ddp = dt_decl_push(dt_decl_alloc(CTF_K_UNKNOWN, NULL));
- return (ddp);
+ return ddp;
}
void
@@ -212,7 +212,7 @@ dt_decl_spec(ushort_t kind, char *name)
dt_decl_t *ddp = yypcb->pcb_dstack.ds_decl;
if (ddp == NULL)
- return (dt_decl_push(dt_decl_alloc(kind, name)));
+ return dt_decl_push(dt_decl_alloc(kind, name));
/*
* If we already have a type name specified and we see another type
@@ -223,7 +223,7 @@ dt_decl_spec(ushort_t kind, char *name)
*/
if (ddp->dd_name != NULL && kind == CTF_K_TYPEDEF) {
if (yypcb->pcb_dstack.ds_class != DT_DC_TYPEDEF)
- return (dt_decl_ident(name));
+ return dt_decl_ident(name);
xyerror(D_DECL_IDRED, "identifier redeclared: %s\n", name);
}
@@ -238,7 +238,7 @@ dt_decl_spec(ushort_t kind, char *name)
"in a type name\n");
}
- return (dt_decl_check(ddp));
+ return dt_decl_check(ddp);
}
dt_decl_t *
@@ -249,7 +249,7 @@ dt_decl_attr(ushort_t attr)
if (ddp == NULL) {
ddp = dt_decl_push(dt_decl_alloc(CTF_K_UNKNOWN, NULL));
ddp->dd_attr = attr;
- return (ddp);
+ return ddp;
}
if (attr == DT_DA_LONG && (ddp->dd_attr & DT_DA_LONG)) {
@@ -258,7 +258,7 @@ dt_decl_attr(ushort_t attr)
}
ddp->dd_attr |= attr;
- return (dt_decl_check(ddp));
+ return dt_decl_check(ddp);
}
/*
@@ -274,10 +274,10 @@ dt_decl_protoform(dt_node_t *fnp, dt_node_t *flist)
for (dnp = flist; dnp != fnp && dnp != NULL; dnp = dnp->dn_list) {
if (dnp->dn_string != NULL &&
strcmp(dnp->dn_string, fnp->dn_string) == 0)
- return (B_TRUE);
+ return B_TRUE;
}
- return (B_FALSE);
+ return B_FALSE;
}
/*
@@ -307,7 +307,7 @@ dt_decl_prototype(dt_node_t *plist,
if (dt_node_is_dynamic(dnp) && !(flags & DT_DP_DYNAMIC)) {
dnerror(dnp, D_DECL_PROTO_TYPE, "%s prototype may not "
"use parameter of type %s: %s, parameter #%d\n",
- kind, dt_node_type_name(dnp, n, sizeof (n)),
+ kind, dt_node_type_name(dnp, n, sizeof(n)),
dnp->dn_string ? dnp->dn_string : "(anonymous)", i);
}
@@ -317,7 +317,7 @@ dt_decl_prototype(dt_node_t *plist,
if (is_void && !(flags & DT_DP_VOID)) {
dnerror(dnp, D_DECL_PROTO_TYPE, "%s prototype may not "
"use parameter of type %s: %s, parameter #%d\n",
- kind, dt_node_type_name(dnp, n, sizeof (n)),
+ kind, dt_node_type_name(dnp, n, sizeof(n)),
dnp->dn_string ? dnp->dn_string : "(anonymous)", i);
}
@@ -343,7 +343,7 @@ dt_decl_prototype(dt_node_t *plist,
if (v != 0 && plist->dn_list != NULL)
xyerror(D_DECL_PROTO_VOID, "void must be sole parameter\n");
- return (v ? 0 : i - 1); /* return zero if sole parameter is 'void' */
+ return v ? 0 : i - 1; /* return zero if sole parameter is 'void' */
}
dt_decl_t *
@@ -390,10 +390,10 @@ dt_decl_array(dt_node_t *dnp)
} else if (dnp != NULL) {
ddp->dd_node = dnp;
- (void) dt_decl_prototype(dnp, dnp, "array", DT_DP_ANON);
+ dt_decl_prototype(dnp, dnp, "array", DT_DP_ANON);
}
- return (ddp);
+ return ddp;
}
/*
@@ -412,31 +412,31 @@ dt_decl_func(dt_decl_t *pdp, dt_node_t *dnp)
{
dt_decl_t *ddp;
- (void) dt_decl_prototype(dnp, dnp, "function",
+ dt_decl_prototype(dnp, dnp, "function",
DT_DP_VARARGS | DT_DP_VOID | DT_DP_ANON);
ddp = dt_decl_alloc(CTF_K_FUNCTION, NULL);
ddp->dd_node = dnp;
if (pdp == NULL || pdp->dd_kind != CTF_K_POINTER)
- return (dt_decl_push(ddp));
+ return dt_decl_push(ddp);
while (pdp->dd_next != NULL && !(pdp->dd_next->dd_attr & DT_DA_PAREN))
pdp = pdp->dd_next;
if (pdp->dd_next == NULL)
- return (dt_decl_push(ddp));
+ return dt_decl_push(ddp);
ddp->dd_next = pdp->dd_next;
pdp->dd_next = ddp;
- return (pdp);
+ return pdp;
}
dt_decl_t *
dt_decl_ptr(void)
{
- return (dt_decl_push(dt_decl_alloc(CTF_K_POINTER, NULL)));
+ return dt_decl_push(dt_decl_alloc(CTF_K_POINTER, NULL));
}
dt_decl_t *
@@ -458,7 +458,7 @@ dt_decl_sou(uint_t kind, char *name)
else
flag = CTF_ADD_ROOT;
- (void) snprintf(n, sizeof (n), "%s %s",
+ snprintf(n, sizeof(n), "%s %s",
kind == CTF_K_STRUCT ? "struct" : "union",
name == NULL ? "(anon)" : name);
@@ -480,7 +480,7 @@ dt_decl_sou(uint_t kind, char *name)
ddp->dd_type = type;
dt_scope_push(ctfp, type);
- return (ddp);
+ return ddp;
}
void
@@ -510,7 +510,7 @@ dt_decl_member(dt_node_t *dnp)
if (ddp->dd_kind == CTF_K_UNKNOWN && ddp->dd_name == NULL) {
ddp->dd_kind = CTF_K_INTEGER;
- (void) dt_decl_check(ddp);
+ dt_decl_check(ddp);
}
if (dt_decl_type(ddp, &dtt) != 0)
@@ -535,7 +535,7 @@ dt_decl_member(dt_node_t *dnp)
kind == CTF_K_UNION) && size == 0)) {
xyerror(D_DECL_INCOMPLETE, "incomplete struct/union/enum %s: "
"%s\n", dt_type_name(dtt.dtt_ctfp, dtt.dtt_type,
- n, sizeof (n)), ident);
+ n, sizeof(n)), ident);
}
if (size == 0)
@@ -584,7 +584,7 @@ dt_decl_member(dt_node_t *dnp)
dtt.dtt_type = ctf_add_integer(dsp->ds_ctfp,
CTF_ADD_NONROOT, ctf_type_name(dtt.dtt_ctfp,
- dtt.dtt_type, n, sizeof (n)), &cte);
+ dtt.dtt_type, n, sizeof(n)), &cte);
if (dtt.dtt_type == CTF_ERR ||
ctf_update(dsp->ds_ctfp) == CTF_ERR) {
@@ -633,7 +633,7 @@ done:
static int
dt_decl_hasmembers(const char *name, int value, void *private)
{
- return (1); /* abort search and return true if a member exists */
+ return 1; /* abort search and return true if a member exists */
}
dt_decl_t *
@@ -655,7 +655,7 @@ dt_decl_enum(char *name)
else
flag = CTF_ADD_ROOT;
- (void) snprintf(n, sizeof (n), "enum %s", name ? name : "(anon)");
+ snprintf(n, sizeof(n), "enum %s", name ? name : "(anon)");
if (name != NULL && (type = ctf_lookup_by_name(ctfp, n)) != CTF_ERR) {
if (ctf_enum_iter(ctfp, type, dt_decl_hasmembers, NULL))
@@ -669,7 +669,7 @@ dt_decl_enum(char *name)
ddp->dd_type = type;
dt_scope_push(ctfp, type);
- return (ddp);
+ return ddp;
}
void
@@ -684,7 +684,7 @@ dt_decl_enumerator(char *s, dt_node_t *dnp)
int value;
name = alloca(strlen(s) + 1);
- (void) strcpy(name, s);
+ strcpy(name, s);
free(s);
if (dsp == NULL)
@@ -765,7 +765,7 @@ dt_decl_enumerator(char *s, dt_node_t *dnp)
dnp = dt_node_int(value);
dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type);
- if ((inp = malloc(sizeof (dt_idnode_t))) == NULL)
+ if ((inp = malloc(sizeof(dt_idnode_t))) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
/*
@@ -776,7 +776,7 @@ dt_decl_enumerator(char *s, dt_node_t *dnp)
yypcb->pcb_list = dnp->dn_link;
dnp->dn_link = NULL;
- memset(inp, 0, sizeof (dt_idnode_t));
+ memset(inp, 0, sizeof(dt_idnode_t));
inp->din_list = dnp;
inp->din_root = dnp;
@@ -821,7 +821,7 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
tip->dtt_object = dmp->dm_name;
tip->dtt_ctfp = ddp->dd_ctfp;
tip->dtt_type = ddp->dd_type;
- return (0);
+ return 0;
}
/*
@@ -835,7 +835,7 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
tip->dtt_object = dtp->dt_ddefs->dm_name;
tip->dtt_ctfp = DT_FUNC_CTFP(dtp);
tip->dtt_type = DT_FUNC_TYPE(dtp);
- return (0);
+ return 0;
}
/*
@@ -848,17 +848,17 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
tip->dtt_object = dtp->dt_ddefs->dm_name;
tip->dtt_ctfp = DT_FPTR_CTFP(dtp);
tip->dtt_type = DT_FPTR_TYPE(dtp);
- return (0);
+ return 0;
}
if ((rv = dt_decl_type(ddp->dd_next, tip)) == 0 &&
(rv = dt_type_pointer(tip)) != 0) {
xywarn(D_UNKNOWN, "cannot find type: %s*: %s\n",
dt_type_name(tip->dtt_ctfp, tip->dtt_type,
- n, sizeof (n)), ctf_errmsg(dtp->dt_ctferr));
+ n, sizeof(n)), ctf_errmsg(dtp->dt_ctferr));
}
- return (rv);
+ return rv;
}
/*
@@ -896,11 +896,11 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
tip->dtt_object = dtp->dt_ddefs->dm_name;
tip->dtt_ctfp = DT_DYN_CTFP(dtp);
tip->dtt_type = DT_DYN_TYPE(dtp);
- return (0);
+ return 0;
}
if ((rv = dt_decl_type(ddp->dd_next, tip)) != 0)
- return (rv);
+ return rv;
/*
* If the array base type is not defined in the target
@@ -918,7 +918,7 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
ctf_update(tip->dtt_ctfp) == CTF_ERR) {
xywarn(D_UNKNOWN, "failed to copy type: %s\n",
ctf_errmsg(ctf_errno(tip->dtt_ctfp)));
- return (-1);
+ return -1;
}
}
@@ -939,10 +939,10 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
ctf_update(tip->dtt_ctfp) == CTF_ERR) {
xywarn(D_UNKNOWN, "failed to create array type: %s\n",
ctf_errmsg(ctf_errno(tip->dtt_ctfp)));
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
/*
@@ -956,33 +956,33 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
case CTF_K_INTEGER:
case CTF_K_FLOAT:
if (ddp->dd_attr & DT_DA_SIGNED)
- (void) strcat(name, "signed ");
+ strcat(name, "signed ");
if (ddp->dd_attr & DT_DA_UNSIGNED)
- (void) strcat(name, "unsigned ");
+ strcat(name, "unsigned ");
if (ddp->dd_attr & DT_DA_SHORT)
- (void) strcat(name, "short ");
+ strcat(name, "short ");
if (ddp->dd_attr & DT_DA_LONG)
- (void) strcat(name, "long ");
+ strcat(name, "long ");
if (ddp->dd_attr & DT_DA_LONGLONG)
- (void) strcat(name, "long long ");
+ strcat(name, "long long ");
if (ddp->dd_attr == 0 && ddp->dd_name == NULL)
- (void) strcat(name, "int");
+ strcat(name, "int");
break;
case CTF_K_STRUCT:
- (void) strcpy(name, "struct ");
+ strcpy(name, "struct ");
break;
case CTF_K_UNION:
- (void) strcpy(name, "union ");
+ strcpy(name, "union ");
break;
case CTF_K_ENUM:
- (void) strcpy(name, "enum ");
+ strcpy(name, "enum ");
break;
case CTF_K_TYPEDEF:
break;
default:
xywarn(D_UNKNOWN, "internal error -- "
"bad decl kind %u\n", ddp->dd_kind);
- return (-1);
+ return -1;
}
/*
@@ -991,7 +991,7 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
*/
if (ddp->dd_name != NULL && (ddp->dd_kind != CTF_K_INTEGER ||
(ddp->dd_attr & (DT_DA_SHORT | DT_DA_LONG | DT_DA_LONGLONG)) == 0))
- (void) strcat(name, ddp->dd_name);
+ strcat(name, ddp->dd_name);
/*
* Lookup the type. If we find it, we're done. Otherwise create a
@@ -999,7 +999,7 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
* we can't find it and we can't create a tag, return failure.
*/
if ((rv = dt_type_lookup(name, tip)) == 0)
- return (rv);
+ return rv;
switch (ddp->dd_kind) {
case CTF_K_STRUCT:
@@ -1011,13 +1011,13 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
default:
xywarn(D_UNKNOWN, "failed to resolve type %s: %s\n", name,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- return (rv);
+ return rv;
}
if (type == CTF_ERR || ctf_update(dmp->dm_ctfp) == CTF_ERR) {
xywarn(D_UNKNOWN, "failed to add forward tag for %s: %s\n",
name, ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (-1);
+ return -1;
}
ddp->dd_ctfp = dmp->dm_ctfp;
@@ -1027,7 +1027,7 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
tip->dtt_ctfp = dmp->dm_ctfp;
tip->dtt_type = type;
- return (0);
+ return 0;
}
void
@@ -1060,7 +1060,7 @@ void
dt_scope_push(ctf_file_t *ctfp, ctf_id_t type)
{
dt_scope_t *rsp = &yypcb->pcb_dstack;
- dt_scope_t *dsp = malloc(sizeof (dt_scope_t));
+ dt_scope_t *dsp = malloc(sizeof(dt_scope_t));
if (dsp == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -1103,5 +1103,5 @@ dt_scope_pop(void)
rsp->ds_enumval = dsp->ds_enumval;
free(dsp);
- return (rsp->ds_decl);
+ return rsp->ds_decl;
}
diff --git a/libdtrace/dt_dis.c b/libdtrace/dt_dis.c
index d047bde3..e57a0438 100644
--- a/libdtrace/dt_dis.c
+++ b/libdtrace/dt_dis.c
@@ -55,12 +55,12 @@ dt_dis_varname(const dtrace_difo_t *dp, uint_t id, uint_t scope, uint_t addr)
if (dvp->dtdv_id == id && dvp->dtdv_scope == scope &&
dvp->dtdv_insn_from <= addr && addr <= dvp->dtdv_insn_to) {
if (dvp->dtdv_name < dp->dtdo_strlen)
- return (dp->dtdo_strtab + dvp->dtdv_name);
+ return dp->dtdo_strtab + dvp->dtdv_name;
break;
}
}
- return (NULL);
+ return NULL;
}
static char *
@@ -267,7 +267,7 @@ dt_dis_bpf_args(const dtrace_difo_t *dp, const char *fn,
DIFV_SCOPE_GLOBAL, addr));
return buf;
} else if (strcmp(fn, "dt_get_tvar") == 0 ||
- strcmp(fn, "dt_set_tvar") == 0 ) {
+ strcmp(fn, "dt_set_tvar") == 0) {
/*
* We know that the previous instruction exists and assigns
* the variable id to %r1 (because we wrote the code generator
@@ -371,7 +371,7 @@ dt_dis_typestr(const dtrace_diftype_t *t, char *buf, size_t len)
strcpy(kind, "string");
break;
default:
- snprintf(kind, sizeof (kind), "0x%x", t->dtdt_kind);
+ snprintf(kind, sizeof(kind), "0x%x", t->dtdt_kind);
}
switch (t->dtdt_ckind) {
@@ -418,7 +418,7 @@ dt_dis_typestr(const dtrace_diftype_t *t, char *buf, size_t len)
strcpy(ckind, "restrict");
break;
default:
- snprintf(ckind, sizeof (ckind), "0x%x", t->dtdt_ckind);
+ snprintf(ckind, sizeof(ckind), "0x%x", t->dtdt_ckind);
}
if (t->dtdt_flags & DIF_TF_BYREF) {
@@ -429,7 +429,7 @@ dt_dis_typestr(const dtrace_diftype_t *t, char *buf, size_t len)
kind, ckind, (ulong_t)t->dtdt_size);
}
- return (buf);
+ return buf;
}
static void
diff --git a/libdtrace/dt_dlibs.c b/libdtrace/dt_dlibs.c
index f1d0b29a..72bc65ad 100644
--- a/libdtrace/dt_dlibs.c
+++ b/libdtrace/dt_dlibs.c
@@ -803,7 +803,7 @@ dt_lib_depend_add(dtrace_hdl_t *dtp, dt_list_t *dlp, const char *arg)
if ((end = strrchr(arg, '/')) == NULL)
return dt_set_errno(dtp, EINVAL);
- if ((dld = dt_zalloc(dtp, sizeof (dt_lib_depend_t))) == NULL)
+ if ((dld = dt_zalloc(dtp, sizeof(dt_lib_depend_t))) == NULL)
return -1;
if ((dld->dtld_libpath = dt_alloc(dtp, PATH_MAX)) == NULL) {
@@ -890,7 +890,7 @@ dt_topo_sort(dtrace_hdl_t *dtp, dt_lib_depend_t *dld, int *count)
return -1;
}
- if ((new = dt_zalloc(dtp, sizeof (dt_lib_depend_t))) == NULL)
+ if ((new = dt_zalloc(dtp, sizeof(dt_lib_depend_t))) == NULL)
return -1;
if ((new->dtld_library = strdup(dld->dtld_library)) == NULL) {
@@ -1028,7 +1028,7 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path)
else
continue; /* skip any filename not ending in ".d" */
- snprintf(fname, sizeof (fname), "%s/%s", path, dp->d_name);
+ snprintf(fname, sizeof(fname), "%s/%s", path, dp->d_name);
if (type == DT_DLIB_BPF) {
if (readBPFFile(dtp, fname) != 0)
diff --git a/libdtrace/dt_dof.c b/libdtrace/dt_dof.c
index 9fc73723..c78e38a3 100644
--- a/libdtrace/dt_dof.c
+++ b/libdtrace/dt_dof.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -89,7 +89,7 @@ dt_dof_reset(dtrace_hdl_t *dtp, dtrace_prog_t *pgp)
ddo->ddo_xlexport = dt_calloc(dtp, nx, sizeof(dof_secidx_t));
if (nx != 0 && (ddo->ddo_xlimport == NULL || ddo->ddo_xlexport == NULL))
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
for (i = 0; i < nx; i++) {
ddo->ddo_xlimport[i] = DOF_SECIDX_NONE;
@@ -108,7 +108,7 @@ dt_dof_reset(dtrace_hdl_t *dtp, dtrace_prog_t *pgp)
dt_buf_reset(dtp, &ddo->ddo_rels);
dt_buf_reset(dtp, &ddo->ddo_xlms);
- return (0);
+ return 0;
}
/*
@@ -130,12 +130,12 @@ dof_add_lsect(dt_dof_t *ddo, const void *data, uint32_t type,
s.dofs_offset = dt_buf_offset(&ddo->ddo_ldata, align);
s.dofs_size = size;
- dt_buf_write(dtp, &ddo->ddo_secs, &s, sizeof (s), sizeof (uint64_t));
+ dt_buf_write(dtp, &ddo->ddo_secs, &s, sizeof(s), sizeof(uint64_t));
if (data != NULL)
dt_buf_write(dtp, &ddo->ddo_ldata, data, size, align);
- return (ddo->ddo_nsecs++);
+ return ddo->ddo_nsecs++;
}
/*
@@ -157,12 +157,12 @@ dof_add_usect(dt_dof_t *ddo, const void *data, uint32_t type,
s.dofs_offset = dt_buf_offset(&ddo->ddo_udata, align);
s.dofs_size = size;
- dt_buf_write(dtp, &ddo->ddo_secs, &s, sizeof (s), sizeof (uint64_t));
+ dt_buf_write(dtp, &ddo->ddo_secs, &s, sizeof(s), sizeof(uint64_t));
if (data != NULL)
dt_buf_write(dtp, &ddo->ddo_udata, data, size, align);
- return (ddo->ddo_nsecs++);
+ return ddo->ddo_nsecs++;
}
/*
@@ -176,16 +176,16 @@ dof_add_string(dt_dof_t *ddo, const char *s)
dof_stridx_t i = dt_buf_len(bp);
if (i != 0 && (s == NULL || *s == '\0'))
- return (0); /* string table has \0 at offset 0 */
+ return 0; /* string table has \0 at offset 0 */
- dt_buf_write(ddo->ddo_hdl, bp, s, strlen(s) + 1, sizeof (char));
- return (i);
+ dt_buf_write(ddo->ddo_hdl, bp, s, strlen(s) + 1, sizeof(char));
+ return i;
}
static dof_attr_t
dof_attr(const dtrace_attribute_t *ap)
{
- return (DOF_ATTR(ap->dtat_name, ap->dtat_data, ap->dtat_class));
+ return DOF_ATTR(ap->dtat_name, ap->dtat_data, ap->dtat_class);
}
static dof_secidx_t
@@ -201,26 +201,26 @@ dof_add_difo(dt_dof_t *ddo, const dtrace_difo_t *dp)
if (dp->dtdo_buf != NULL) {
dsecs[nsecs++] = dof_add_lsect(ddo, dp->dtdo_buf,
- DOF_SECT_DIF, sizeof (dif_instr_t), 0,
- sizeof (dif_instr_t), sizeof (dif_instr_t) * dp->dtdo_len);
+ DOF_SECT_DIF, sizeof(dif_instr_t), 0,
+ sizeof(dif_instr_t), sizeof(dif_instr_t) * dp->dtdo_len);
}
if (dp->dtdo_strtab != NULL) {
dsecs[nsecs++] = strsec = dof_add_lsect(ddo, dp->dtdo_strtab,
- DOF_SECT_STRTAB, sizeof (char), 0, 0, dp->dtdo_strlen);
+ DOF_SECT_STRTAB, sizeof(char), 0, 0, dp->dtdo_strlen);
}
if (dp->dtdo_vartab != NULL) {
dsecs[nsecs++] = dof_add_lsect(ddo, dp->dtdo_vartab,
- DOF_SECT_VARTAB, sizeof (uint_t), 0, sizeof (dtrace_difv_t),
- sizeof (dtrace_difv_t) * dp->dtdo_varlen);
+ DOF_SECT_VARTAB, sizeof(uint_t), 0, sizeof(dtrace_difv_t),
+ sizeof(dtrace_difv_t) * dp->dtdo_varlen);
}
if (dp->dtdo_xlmtab != NULL) {
dof_xlref_t *xlt, *xlp;
dt_node_t **pnp;
- xlt = alloca(sizeof (dof_xlref_t) * dp->dtdo_xlmlen);
+ xlt = alloca(sizeof(dof_xlref_t) * dp->dtdo_xlmlen);
pnp = dp->dtdo_xlmtab;
/*
@@ -241,22 +241,22 @@ dof_add_difo(dt_dof_t *ddo, const dtrace_difo_t *dp)
}
dsecs[nsecs++] = dof_add_lsect(ddo, xlt, DOF_SECT_XLTAB,
- sizeof (dof_secidx_t), 0, sizeof (dof_xlref_t),
- sizeof (dof_xlref_t) * dp->dtdo_xlmlen);
+ sizeof(dof_secidx_t), 0, sizeof(dof_xlref_t),
+ sizeof(dof_xlref_t) * dp->dtdo_xlmlen);
}
/*
* Copy the return type and the array of section indices that form the
* DIFO into a single dof_difohdr_t and then add DOF_SECT_DIFOHDR.
*/
- assert(nsecs <= sizeof (dsecs) / sizeof (dsecs[0]));
- dofd = alloca(sizeof (dtrace_diftype_t) + sizeof (dsecs));
+ assert(nsecs <= sizeof(dsecs) / sizeof(dsecs[0]));
+ dofd = alloca(sizeof(dtrace_diftype_t) + sizeof(dsecs));
memset(&dofd->dofd_rtype, 0, sizeof(dtrace_diftype_t));
- memcpy(&dofd->dofd_links, dsecs, sizeof (dof_secidx_t) * nsecs);
+ memcpy(&dofd->dofd_links, dsecs, sizeof(dof_secidx_t) * nsecs);
hdrsec = dof_add_lsect(ddo, dofd, DOF_SECT_DIFOHDR,
- sizeof (dof_secidx_t), 0, 0,
- sizeof (dtrace_diftype_t) + sizeof (dof_secidx_t) * nsecs);
+ sizeof(dof_secidx_t), 0, 0,
+ sizeof(dtrace_diftype_t) + sizeof(dof_secidx_t) * nsecs);
return hdrsec;
}
@@ -301,24 +301,24 @@ dof_add_translator(dt_dof_t *ddo, const dt_xlator_t *dxp, uint_t type)
dt_node_diftype(dtp, dnp, &dofxm.dofxm_type);
dt_buf_write(dtp, &ddo->ddo_xlms,
- &dofxm, sizeof (dofxm), sizeof (uint32_t));
+ &dofxm, sizeof(dofxm), sizeof(uint32_t));
}
dofxl.dofxl_members = dof_add_lsect(ddo, NULL, DOF_SECT_XLMEMBERS,
- sizeof (uint32_t), 0, sizeof (dofxm), dt_buf_len(&ddo->ddo_xlms));
+ sizeof(uint32_t), 0, sizeof(dofxm), dt_buf_len(&ddo->ddo_xlms));
- dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_xlms, sizeof (uint32_t));
+ dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_xlms, sizeof(uint32_t));
dofxl.dofxl_strtab = ddo->ddo_strsec;
dofxl.dofxl_argv = dof_add_string(ddo, ctf_type_name(
- dxp->dx_src_ctfp, dxp->dx_src_type, buf, sizeof (buf)));
+ dxp->dx_src_ctfp, dxp->dx_src_type, buf, sizeof(buf)));
dofxl.dofxl_argc = 1;
dofxl.dofxl_type = dof_add_string(ddo, ctf_type_name(
- dxp->dx_dst_ctfp, dxp->dx_dst_type, buf, sizeof (buf)));
+ dxp->dx_dst_ctfp, dxp->dx_dst_type, buf, sizeof(buf)));
dofxl.dofxl_attr = dof_attr(&dxp->dx_souid.di_attr);
xst[dxp->dx_id] = dof_add_lsect(ddo, &dofxl, type,
- sizeof (uint32_t), 0, 0, sizeof (dofxl));
+ sizeof(uint32_t), 0, 0, sizeof(dofxl));
}
/*ARGSUSED*/
@@ -341,24 +341,21 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
dofpr.dofpr_name = dof_add_string(ddo, prp->pr_name);
dofpr.dofpr_nargv = dt_buf_len(&ddo->ddo_strs);
- for (dnp = prp->nargs; dnp != NULL; dnp = dnp->dn_list) {
- (void) dof_add_string(ddo, ctf_type_name(dnp->dn_ctfp,
- dnp->dn_type, buf, sizeof (buf)));
- }
+ for (dnp = prp->nargs; dnp != NULL; dnp = dnp->dn_list)
+ dof_add_string(ddo, ctf_type_name(dnp->dn_ctfp,
+ dnp->dn_type, buf, sizeof(buf)));
dofpr.dofpr_xargv = dt_buf_len(&ddo->ddo_strs);
- for (dnp = prp->xargs; dnp != NULL; dnp = dnp->dn_list) {
- (void) dof_add_string(ddo, ctf_type_name(dnp->dn_ctfp,
- dnp->dn_type, buf, sizeof (buf)));
- }
+ for (dnp = prp->xargs; dnp != NULL; dnp = dnp->dn_list)
+ dof_add_string(ddo, ctf_type_name(dnp->dn_ctfp,
+ dnp->dn_type, buf, sizeof(buf)));
- dofpr.dofpr_argidx = dt_buf_len(&ddo->ddo_args) / sizeof (uint8_t);
+ dofpr.dofpr_argidx = dt_buf_len(&ddo->ddo_args) / sizeof(uint8_t);
- for (i = 0; i < prp->xargc; i++) {
+ for (i = 0; i < prp->xargc; i++)
dt_buf_write(dtp, &ddo->ddo_args, &prp->mapping[i],
- sizeof (uint8_t), sizeof (uint8_t));
- }
+ sizeof(uint8_t), sizeof(uint8_t));
dofpr.dofpr_nargc = prp->nargc;
dofpr.dofpr_xargc = prp->xargc;
@@ -379,16 +376,16 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
assert(pip->pi_noffs + pip->pi_nenoffs > 0);
dofpr.dofpr_offidx =
- dt_buf_len(&ddo->ddo_offs) / sizeof (uint32_t);
+ dt_buf_len(&ddo->ddo_offs) / sizeof(uint32_t);
dofpr.dofpr_noffs = pip->pi_noffs;
dt_buf_write(dtp, &ddo->ddo_offs, pip->pi_offs,
- pip->pi_noffs * sizeof (uint32_t), sizeof (uint32_t));
+ pip->pi_noffs * sizeof(uint32_t), sizeof(uint32_t));
dofpr.dofpr_enoffidx =
- dt_buf_len(&ddo->ddo_enoffs) / sizeof (uint32_t);
+ dt_buf_len(&ddo->ddo_enoffs) / sizeof(uint32_t);
dofpr.dofpr_nenoffs = pip->pi_nenoffs;
dt_buf_write(dtp, &ddo->ddo_enoffs, pip->pi_enoffs,
- pip->pi_nenoffs * sizeof (uint32_t), sizeof (uint32_t));
+ pip->pi_nenoffs * sizeof(uint32_t), sizeof(uint32_t));
/*
* If pi_rname isn't set, the relocation will be against the
@@ -406,13 +403,13 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
dofr.dofr_data = 0;
dt_buf_write(dtp, &ddo->ddo_rels, &dofr,
- sizeof (dofr), sizeof (uint64_t));
+ sizeof(dofr), sizeof(uint64_t));
dt_buf_write(dtp, &ddo->ddo_probes, &dofpr,
- sizeof (dofpr), sizeof (uint64_t));
+ sizeof(dofpr), sizeof(uint64_t));
}
- return (0);
+ return 0;
}
static void
@@ -430,7 +427,7 @@ dof_add_provider(dt_dof_t *ddo, const dt_provider_t *pvp)
return; /* ignore providers that are exported by dtrace(7D) */
nxr = dt_popcb(pvp->pv_xrefs, pvp->pv_xrmax);
- dofs = alloca(sizeof (dof_secidx_t) * (nxr + 1));
+ dofs = alloca(sizeof(dof_secidx_t) * (nxr + 1));
xr = 1; /* reserve dofs[0] for the provider itself */
/*
@@ -452,33 +449,32 @@ dof_add_provider(dt_dof_t *ddo, const dt_provider_t *pvp)
dt_buf_reset(dtp, &ddo->ddo_enoffs);
dt_buf_reset(dtp, &ddo->ddo_rels);
- (void) dt_idhash_iter(pvp->pv_probes, dof_add_probe, ddo);
+ dt_idhash_iter(pvp->pv_probes, dof_add_probe, ddo);
dofpv.dofpv_probes = dof_add_lsect(ddo, NULL, DOF_SECT_PROBES,
- sizeof (uint64_t), 0, sizeof (dof_probe_t),
+ sizeof(uint64_t), 0, sizeof(dof_probe_t),
dt_buf_len(&ddo->ddo_probes));
dt_buf_concat(dtp, &ddo->ddo_ldata,
- &ddo->ddo_probes, sizeof (uint64_t));
+ &ddo->ddo_probes, sizeof(uint64_t));
dofpv.dofpv_prargs = dof_add_lsect(ddo, NULL, DOF_SECT_PRARGS,
- sizeof (uint8_t), 0, sizeof (uint8_t), dt_buf_len(&ddo->ddo_args));
+ sizeof(uint8_t), 0, sizeof(uint8_t), dt_buf_len(&ddo->ddo_args));
- dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_args, sizeof (uint8_t));
+ dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_args, sizeof(uint8_t));
dofpv.dofpv_proffs = dof_add_lsect(ddo, NULL, DOF_SECT_PROFFS,
- sizeof (uint_t), 0, sizeof (uint_t), dt_buf_len(&ddo->ddo_offs));
+ sizeof(uint_t), 0, sizeof(uint_t), dt_buf_len(&ddo->ddo_offs));
- dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_offs, sizeof (uint_t));
+ dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_offs, sizeof(uint_t));
- if ((sz = dt_buf_len(&ddo->ddo_enoffs)) != 0) {
+ if ((sz = dt_buf_len(&ddo->ddo_enoffs)) != 0)
dofpv.dofpv_prenoffs = dof_add_lsect(ddo, NULL,
- DOF_SECT_PRENOFFS, sizeof (uint_t), 0, sizeof (uint_t), sz);
- } else {
+ DOF_SECT_PRENOFFS, sizeof(uint_t), 0, sizeof(uint_t), sz);
+ else
dofpv.dofpv_prenoffs = DOF_SECT_NONE;
- }
- dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_enoffs, sizeof (uint_t));
+ dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_enoffs, sizeof(uint_t));
dofpv.dofpv_strtab = ddo->ddo_strsec;
dofpv.dofpv_name = dof_add_string(ddo, pvp->desc.dtvd_name);
@@ -490,24 +486,23 @@ dof_add_provider(dt_dof_t *ddo, const dt_provider_t *pvp)
dofpv.dofpv_argsattr = dof_attr(&pvp->desc.dtvd_attr.dtpa_args);
dofs[0] = dof_add_lsect(ddo, &dofpv, DOF_SECT_PROVIDER,
- sizeof (dof_secidx_t), 0, 0, sizeof (dof_provider_t));
+ sizeof(dof_secidx_t), 0, 0, sizeof(dof_provider_t));
dofr.dofr_strtab = dofpv.dofpv_strtab;
dofr.dofr_tgtsec = dofpv.dofpv_probes;
dofr.dofr_relsec = dof_add_lsect(ddo, NULL, DOF_SECT_RELTAB,
- sizeof (uint64_t), 0, sizeof (dof_relodesc_t),
+ sizeof(uint64_t), 0, sizeof(dof_relodesc_t),
dt_buf_len(&ddo->ddo_rels));
- dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_rels, sizeof (uint64_t));
+ dt_buf_concat(dtp, &ddo->ddo_ldata, &ddo->ddo_rels, sizeof(uint64_t));
- (void) dof_add_lsect(ddo, &dofr, DOF_SECT_URELHDR,
- sizeof (dof_secidx_t), 0, 0, sizeof (dof_relohdr_t));
+ dof_add_lsect(ddo, &dofr, DOF_SECT_URELHDR,
+ sizeof(dof_secidx_t), 0, 0, sizeof(dof_relohdr_t));
- if (nxr != 0 && dtp->dt_xlatemode == DT_XL_DYNAMIC) {
- (void) dof_add_lsect(ddo, dofs, DOF_SECT_PREXPORT,
- sizeof (dof_secidx_t), 0, sizeof (dof_secidx_t),
- sizeof (dof_secidx_t) * (nxr + 1));
- }
+ if (nxr != 0 && dtp->dt_xlatemode == DT_XL_DYNAMIC)
+ dof_add_lsect(ddo, dofs, DOF_SECT_PREXPORT,
+ sizeof(dof_secidx_t), 0, sizeof(dof_secidx_t),
+ sizeof(dof_secidx_t) * (nxr + 1));
}
static int
@@ -521,9 +516,9 @@ dof_hdr(dtrace_hdl_t *dtp, uint8_t dofversion, dof_hdr_t *hp)
if (dtp->dt_conf.dtc_difversion > UINT8_MAX ||
dtp->dt_conf.dtc_difintregs > UINT8_MAX ||
dtp->dt_conf.dtc_diftupregs > UINT8_MAX)
- return (dt_set_errno(dtp, EOVERFLOW));
+ return dt_set_errno(dtp, EOVERFLOW);
- memset(hp, 0, sizeof (dof_hdr_t));
+ memset(hp, 0, sizeof(dof_hdr_t));
hp->dofh_ident[DOF_ID_MAG0] = DOF_MAG_MAG0;
hp->dofh_ident[DOF_ID_MAG1] = DOF_MAG_MAG1;
@@ -541,11 +536,11 @@ dof_hdr(dtrace_hdl_t *dtp, uint8_t dofversion, dof_hdr_t *hp)
hp->dofh_ident[DOF_ID_DIFIREG] = dtp->dt_conf.dtc_difintregs;
hp->dofh_ident[DOF_ID_DIFTREG] = dtp->dt_conf.dtc_diftupregs;
- hp->dofh_hdrsize = sizeof (dof_hdr_t);
- hp->dofh_secsize = sizeof (dof_sec_t);
- hp->dofh_secoff = sizeof (dof_hdr_t);
+ hp->dofh_hdrsize = sizeof(dof_hdr_t);
+ hp->dofh_secsize = sizeof(dof_sec_t);
+ hp->dofh_secoff = sizeof(dof_hdr_t);
- return (0);
+ return 0;
}
void *
@@ -579,17 +574,17 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
uint_t i;
if (flags & ~DTRACE_D_MASK) {
- (void) dt_set_errno(dtp, EINVAL);
- return (NULL);
+ dt_set_errno(dtp, EINVAL);
+ return NULL;
}
flags |= dtp->dt_dflags;
if (dof_hdr(dtp, pgp->dp_dofversion, &h) != 0)
- return (NULL);
+ return NULL;
if (dt_dof_reset(dtp, pgp) != 0)
- return (NULL);
+ return NULL;
#ifdef FIXME
/*
@@ -619,13 +614,13 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
}
#endif
- dofa = alloca(sizeof (dof_actdesc_t) * maxacts);
+ dofa = alloca(sizeof(dof_actdesc_t) * maxacts);
#ifdef FIXME
fmt = alloca(maxfmt + 1);
#endif
ddo->ddo_strsec = dof_add_lsect(ddo, NULL, DOF_SECT_STRTAB, 1, 0, 0, 0);
- (void) dof_add_string(ddo, "");
+ dof_add_string(ddo, "");
/*
* If there are references to dynamic translators in the program, add
@@ -676,8 +671,8 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
dofp.dofp_id = pdp->id;
probesec = dof_add_lsect(ddo, &dofp, DOF_SECT_PROBEDESC,
- sizeof (dof_secidx_t), 0,
- sizeof (dof_probedesc_t), sizeof (dof_probedesc_t));
+ sizeof(dof_secidx_t), 0,
+ sizeof(dof_probedesc_t), sizeof(dof_probedesc_t));
#ifdef FIXME
/*
@@ -699,7 +694,7 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
*/
if (sdp != NULL && ap == sdp->dtsd_action) {
if (sdp->dtsd_fmtdata != NULL) {
- (void) dtrace_printf_format(dtp,
+ dtrace_printf_format(dtp,
sdp->dtsd_fmtdata, fmt, maxfmt + 1);
strndx = dof_add_string(ddo, fmt);
} else
@@ -729,8 +724,8 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
if (i > 0) {
actsec = dof_add_lsect(ddo, dofa, DOF_SECT_ACTDESC,
- sizeof (uint64_t), 0, sizeof (dof_actdesc_t),
- sizeof (dof_actdesc_t) * i);
+ sizeof(uint64_t), 0, sizeof(dof_actdesc_t),
+ sizeof(dof_actdesc_t) * i);
}
/*
@@ -742,8 +737,8 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
dofe.dofe_pad = 0;
dofe.dofe_uarg = edp->dted_uarg;
- (void) dof_add_lsect(ddo, &dofe, DOF_SECT_ECBDESC,
- sizeof (uint64_t), 0, 0, sizeof (dof_ecbdesc_t));
+ dof_add_lsect(ddo, &dofe, DOF_SECT_ECBDESC,
+ sizeof(uint64_t), 0, 0, sizeof(dof_ecbdesc_t));
}
/*
@@ -761,10 +756,10 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
* comments and any other unloadable miscellany.
*/
if (!(flags & DTRACE_D_STRIP)) {
- (void) dof_add_usect(ddo, _dtrace_version, DOF_SECT_COMMENTS,
- sizeof (char), 0, 0, strlen(_dtrace_version) + 1);
- (void) dof_add_usect(ddo, &dtp->dt_uts, DOF_SECT_UTSNAME,
- sizeof (char), 0, 0, sizeof (struct utsname));
+ dof_add_usect(ddo, _dtrace_version, DOF_SECT_COMMENTS,
+ sizeof(char), 0, 0, strlen(_dtrace_version) + 1);
+ dof_add_usect(ddo, &dtp->dt_uts, DOF_SECT_UTSNAME,
+ sizeof(char), 0, 0, sizeof(struct utsname));
}
/*
@@ -772,15 +767,15 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
* dofh_secnum, dofh_loadsz, and dofh_filez values.
*/
h.dofh_secnum = ddo->ddo_nsecs;
- ssize = sizeof (h) + dt_buf_len(&ddo->ddo_secs);
- assert(ssize == sizeof (h) + sizeof (dof_sec_t) * ddo->ddo_nsecs);
+ ssize = sizeof(h) + dt_buf_len(&ddo->ddo_secs);
+ assert(ssize == sizeof(h) + sizeof(dof_sec_t) * ddo->ddo_nsecs);
h.dofh_loadsz = ssize +
dt_buf_len(&ddo->ddo_ldata) +
dt_buf_len(&ddo->ddo_strs);
if (dt_buf_len(&ddo->ddo_udata) != 0) {
- lsize = roundup(h.dofh_loadsz, sizeof (uint64_t));
+ lsize = roundup(h.dofh_loadsz, sizeof(uint64_t));
h.dofh_filesz = lsize + dt_buf_len(&ddo->ddo_udata);
} else {
lsize = h.dofh_loadsz;
@@ -793,8 +788,8 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
* iterate over the buffer data directly, we must check for errors.
*/
if ((i = dt_buf_error(&ddo->ddo_secs)) != 0) {
- (void) dt_set_errno(dtp, i);
- return (NULL);
+ dt_set_errno(dtp, i);
+ return NULL;
}
sp = dt_buf_ptr(&ddo->ddo_secs);
@@ -824,13 +819,13 @@ dtrace_dof_create(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t flags)
*/
dt_buf_create(dtp, &dof, "dof", h.dofh_filesz);
- dt_buf_write(dtp, &dof, &h, sizeof (h), sizeof (uint64_t));
- dt_buf_concat(dtp, &dof, &ddo->ddo_secs, sizeof (uint64_t));
- dt_buf_concat(dtp, &dof, &ddo->ddo_ldata, sizeof (uint64_t));
- dt_buf_concat(dtp, &dof, &ddo->ddo_strs, sizeof (char));
- dt_buf_concat(dtp, &dof, &ddo->ddo_udata, sizeof (uint64_t));
+ dt_buf_write(dtp, &dof, &h, sizeof(h), sizeof(uint64_t));
+ dt_buf_concat(dtp, &dof, &ddo->ddo_secs, sizeof(uint64_t));
+ dt_buf_concat(dtp, &dof, &ddo->ddo_ldata, sizeof(uint64_t));
+ dt_buf_concat(dtp, &dof, &ddo->ddo_strs, sizeof(char));
+ dt_buf_concat(dtp, &dof, &ddo->ddo_udata, sizeof(uint64_t));
- return (dt_buf_claim(dtp, &dof));
+ return dt_buf_claim(dtp, &dof);
}
void
@@ -845,20 +840,20 @@ dtrace_getopt_dof(dtrace_hdl_t *dtp)
dof_hdr_t *dof;
dof_sec_t *sec;
dof_optdesc_t *dofo;
- int i, nopts = 0, len = sizeof (dof_hdr_t) +
- roundup(sizeof (dof_sec_t), sizeof (uint64_t));
+ int i, nopts = 0, len = sizeof(dof_hdr_t) +
+ roundup(sizeof(dof_sec_t), sizeof(uint64_t));
for (i = 0; i < DTRACEOPT_MAX; i++) {
if (dtp->dt_options[i] != DTRACEOPT_UNSET)
nopts++;
}
- len += sizeof (dof_optdesc_t) * nopts;
+ len += sizeof(dof_optdesc_t) * nopts;
if ((dof = dt_zalloc(dtp, len)) == NULL ||
dof_hdr(dtp, DOF_VERSION, dof) != 0) {
dt_free(dtp, dof);
- return (NULL);
+ return NULL;
}
dof->dofh_secnum = 1; /* only DOF_SECT_OPTDESC */
@@ -868,17 +863,17 @@ dtrace_getopt_dof(dtrace_hdl_t *dtp)
/*
* Fill in the option section header...
*/
- sec = (dof_sec_t *)((uintptr_t)dof + sizeof (dof_hdr_t));
+ sec = (dof_sec_t *)((uintptr_t)dof + sizeof(dof_hdr_t));
sec->dofs_type = DOF_SECT_OPTDESC;
- sec->dofs_align = sizeof (uint64_t);
+ sec->dofs_align = sizeof(uint64_t);
sec->dofs_flags = DOF_SECF_LOAD;
- sec->dofs_entsize = sizeof (dof_optdesc_t);
+ sec->dofs_entsize = sizeof(dof_optdesc_t);
dofo = (dof_optdesc_t *)((uintptr_t)sec +
- roundup(sizeof (dof_sec_t), sizeof (uint64_t)));
+ roundup(sizeof(dof_sec_t), sizeof(uint64_t)));
sec->dofs_offset = (uintptr_t)dofo - (uintptr_t)dof;
- sec->dofs_size = sizeof (dof_optdesc_t) * nopts;
+ sec->dofs_size = sizeof(dof_optdesc_t) * nopts;
for (i = 0; i < DTRACEOPT_MAX; i++) {
if (dtp->dt_options[i] == DTRACEOPT_UNSET)
@@ -890,15 +885,15 @@ dtrace_getopt_dof(dtrace_hdl_t *dtp)
dofo++;
}
- return (dof);
+ return dof;
}
void *
dtrace_geterr_dof(dtrace_hdl_t *dtp)
{
if (dtp->dt_errprog != NULL)
- return (dtrace_dof_create(dtp, dtp->dt_errprog, 0));
+ return dtrace_dof_create(dtp, dtp->dt_errprog, 0);
- (void) dt_set_errno(dtp, EDT_BADERROR);
- return (NULL);
+ dt_set_errno(dtp, EDT_BADERROR);
+ return NULL;
}
diff --git a/libdtrace/dt_error.c b/libdtrace/dt_error.c
index e08962f8..b2688402 100644
--- a/libdtrace/dt_error.c
+++ b/libdtrace/dt_error.c
@@ -96,7 +96,7 @@ static const struct {
{ EDT_PCAP, "Missing or corrupt pcap() record" }
};
-static const int _dt_nerr = sizeof (_dt_errlist) / sizeof (_dt_errlist[0]);
+static const int _dt_nerr = sizeof(_dt_errlist) / sizeof(_dt_errlist[0]);
const char *
dtrace_errmsg(dtrace_hdl_t *dtp, int error)
@@ -113,26 +113,26 @@ dtrace_errmsg(dtrace_hdl_t *dtp, int error)
else if (error >= EDT_BASE && (error - EDT_BASE) < _dt_nerr) {
for (i = 0; i < _dt_nerr; i++) {
if (_dt_errlist[i].err == error)
- return (_dt_errlist[i].msg);
+ return _dt_errlist[i].msg;
}
str = NULL;
} else
str = strerror(error);
- return (str ? str : "Unknown error");
+ return str ? str : "Unknown error";
}
int
dtrace_errno(dtrace_hdl_t *dtp)
{
- return (dtp->dt_errno);
+ return dtp->dt_errno;
}
int
dt_set_errno(dtrace_hdl_t *dtp, int err)
{
dtp->dt_errno = err;
- return (-1);
+ return -1;
}
void
@@ -143,32 +143,32 @@ dt_set_errmsg(dtrace_hdl_t *dtp, const char *errtag, const char *region,
char *p, *s;
s = dtp->dt_errmsg;
- n = sizeof (dtp->dt_errmsg);
+ n = sizeof(dtp->dt_errmsg);
if (errtag != NULL && ((dtp->dt_cflags & DTRACE_C_ETAGS) ||
(yypcb && yypcb->pcb_cflags & DTRACE_C_ETAGS)))
- (void) snprintf(s, n, "[%s] ", errtag);
+ snprintf(s, n, "[%s] ", errtag);
else
s[0] = '\0';
len = strlen(dtp->dt_errmsg);
s = dtp->dt_errmsg + len;
- n = sizeof (dtp->dt_errmsg) - len;
+ n = sizeof(dtp->dt_errmsg) - len;
if (filename == NULL)
filename = dtp->dt_filetag;
if (filename != NULL)
- (void) snprintf(s, n, "\"%s\", line %d: ", filename, lineno);
+ snprintf(s, n, "\"%s\", line %d: ", filename, lineno);
else if (lineno != 0)
- (void) snprintf(s, n, "line %d: ", lineno);
+ snprintf(s, n, "line %d: ", lineno);
else if (region != NULL)
- (void) snprintf(s, n, "in %s: ", region);
+ snprintf(s, n, "in %s: ", region);
len = strlen(dtp->dt_errmsg);
s = dtp->dt_errmsg + len;
- n = sizeof (dtp->dt_errmsg) - len;
- (void) vsnprintf(s, n, format, ap);
+ n = sizeof(dtp->dt_errmsg) - len;
+ vsnprintf(s, n, format, ap);
if ((p = strrchr(dtp->dt_errmsg, '\n')) != NULL)
*p = '\0'; /* remove trailing \n from message buffer */
@@ -201,8 +201,8 @@ dtrace_faultstr(dtrace_hdl_t *dtp, int fault)
for (i = 0; faults[i].str != NULL; i++) {
if (faults[i].code == fault)
- return (faults[i].str);
+ return faults[i].str;
}
- return ("unknown fault");
+ return "unknown fault";
}
diff --git a/libdtrace/dt_grammar.y b/libdtrace/dt_grammar.y
index 2294683e..048a974d 100644
--- a/libdtrace/dt_grammar.y
+++ b/libdtrace/dt_grammar.y
@@ -1,7 +1,7 @@
%{
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -190,9 +190,9 @@ int yylex (void);
%%
-dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
- | d_program DT_TOK_EOF { return (dt_node_root($1)); }
- | d_type DT_TOK_EOF { return (dt_node_root($1)); }
+dtrace_program: d_expression DT_TOK_EOF { return dt_node_root($1); }
+ | d_program DT_TOK_EOF { return dt_node_root($1); }
+ | d_type DT_TOK_EOF { return dt_node_root($1); }
;
d_expression: DT_CTX_DEXPR { $$ = NULL; }
diff --git a/libdtrace/dt_handle.c b/libdtrace/dt_handle.c
index c678faff..52ff27a8 100644
--- a/libdtrace/dt_handle.c
+++ b/libdtrace/dt_handle.c
@@ -41,7 +41,7 @@ dtrace_handle_err(dtrace_hdl_t *dtp, dtrace_handle_err_f *hdlr, void *arg)
* We don't currently support multiple error handlers.
*/
if (dtp->dt_errhdlr != NULL)
- return (dt_set_errno(dtp, EALREADY));
+ return dt_set_errno(dtp, EALREADY);
/*
* If the DTRACEOPT_GRABANON is enabled, the anonymous enabling will
@@ -54,7 +54,7 @@ dtrace_handle_err(dtrace_hdl_t *dtp, dtrace_handle_err_f *hdlr, void *arg)
#if 0
if ((pgp = dtrace_program_strcompile(dtp, _dt_errprog,
DTRACE_PROBESPEC_NAME, DTRACE_C_ZDEFS, 0, NULL)) == NULL)
- return (dt_set_errno(dtp, dtrace_errno(dtp)));
+ return dt_set_errno(dtp, dtrace_errno(dtp));
stp = dt_list_next(&pgp->dp_stmts);
assert(stp != NULL);
@@ -69,31 +69,31 @@ out:
dtp->dt_errarg = arg;
dtp->dt_errprog = pgp;
- return (0);
+ return 0;
}
int
dtrace_handle_drop(dtrace_hdl_t *dtp, dtrace_handle_drop_f *hdlr, void *arg)
{
if (dtp->dt_drophdlr != NULL)
- return (dt_set_errno(dtp, EALREADY));
+ return dt_set_errno(dtp, EALREADY);
dtp->dt_drophdlr = hdlr;
dtp->dt_droparg = arg;
- return (0);
+ return 0;
}
int
dtrace_handle_proc(dtrace_hdl_t *dtp, dtrace_handle_proc_f *hdlr, void *arg)
{
if (dtp->dt_prochdlr != NULL)
- return (dt_set_errno(dtp, EALREADY));
+ return dt_set_errno(dtp, EALREADY);
dtp->dt_prochdlr = hdlr;
dtp->dt_procarg = arg;
- return (0);
+ return 0;
}
int
@@ -101,15 +101,15 @@ dtrace_handle_buffered(dtrace_hdl_t *dtp, dtrace_handle_buffered_f *hdlr,
void *arg)
{
if (dtp->dt_bufhdlr != NULL)
- return (dt_set_errno(dtp, EALREADY));
+ return dt_set_errno(dtp, EALREADY);
if (hdlr == NULL)
- return (dt_set_errno(dtp, EINVAL));
+ return dt_set_errno(dtp, EINVAL);
dtp->dt_bufhdlr = hdlr;
dtp->dt_bufarg = arg;
- return (0);
+ return 0;
}
int
@@ -117,12 +117,12 @@ dtrace_handle_setopt(dtrace_hdl_t *dtp, dtrace_handle_setopt_f *hdlr,
void *arg)
{
if (hdlr == NULL)
- return (dt_set_errno(dtp, EINVAL));
+ return dt_set_errno(dtp, EINVAL);
dtp->dt_setopthdlr = hdlr;
dtp->dt_setoptarg = arg;
- return (0);
+ return 0;
}
#define DT_REC(type, ndx) *((type *)((uintptr_t)data->dtpda_data + \
@@ -148,7 +148,7 @@ dt_handle_err(dtrace_hdl_t *dtp, dtrace_probedata_t *data)
if (dd->dtdd_nrecs != 5 || strcmp(pd->prv, "dtrace") != 0 ||
strcmp(pd->prb, "ERROR") != 0)
- return (dt_set_errno(dtp, EDT_BADERROR));
+ return dt_set_errno(dtp, EDT_BADERROR);
/*
* This is an error. We have the following items here: EPID,
@@ -157,7 +157,7 @@ dt_handle_err(dtrace_hdl_t *dtp, dtrace_probedata_t *data)
epid = (uint32_t)DT_REC(uint64_t, 0);
if (dt_epid_lookup(dtp, epid, &errdd, &errpd) != 0)
- return (dt_set_errno(dtp, EDT_BADERROR));
+ return dt_set_errno(dtp, EDT_BADERROR);
err.dteda_ddesc = errdd;
err.dteda_pdesc = errpd;
@@ -174,24 +174,21 @@ dt_handle_err(dtrace_hdl_t *dtp, dtrace_probedata_t *data)
str = (char *)alloca(len);
- if (err.dteda_action == 0) {
- (void) sprintf(where, "predicate");
- } else {
- (void) sprintf(where, "action #%d", err.dteda_action);
- }
+ if (err.dteda_action == 0)
+ sprintf(where, "predicate");
+ else
+ sprintf(where, "action #%d", err.dteda_action);
- if (err.dteda_offset != -1) {
- (void) sprintf(offinfo, " at DIF offset %d", err.dteda_offset);
- } else {
+ if (err.dteda_offset != -1)
+ sprintf(offinfo, " at DIF offset %d", err.dteda_offset);
+ else
offinfo[0] = 0;
- }
switch (err.dteda_fault) {
case DTRACEFLT_BADADDR:
case DTRACEFLT_BADALIGN:
case DTRACEFLT_BADSTACK:
- (void) sprintf(details, " (0x%llx)",
- (u_longlong_t)err.dteda_addr);
+ sprintf(details, " (0x%llx)", (u_longlong_t)err.dteda_addr);
break;
default:
@@ -207,12 +204,12 @@ dt_handle_err(dtrace_hdl_t *dtp, dtrace_probedata_t *data)
err.dteda_msg = str;
if (dtp->dt_errhdlr == NULL)
- return (dt_set_errno(dtp, EDT_ERRABORT));
+ return dt_set_errno(dtp, EDT_ERRABORT);
if ((*dtp->dt_errhdlr)(&err, dtp->dt_errarg) == DTRACE_HANDLE_ABORT)
- return (dt_set_errno(dtp, EDT_ERRABORT));
+ return dt_set_errno(dtp, EDT_ERRABORT);
- return (0);
+ return 0;
}
int
@@ -246,12 +243,12 @@ dt_handle_liberr(dtrace_hdl_t *dtp, const dtrace_probedata_t *data,
err.dteda_msg = str;
if (dtp->dt_errhdlr == NULL)
- return (dt_set_errno(dtp, EDT_ERRABORT));
+ return dt_set_errno(dtp, EDT_ERRABORT);
if ((*dtp->dt_errhdlr)(&err, dtp->dt_errarg) == DTRACE_HANDLE_ABORT)
- return (dt_set_errno(dtp, EDT_ERRABORT));
+ return dt_set_errno(dtp, EDT_ERRABORT);
- return (0);
+ return 0;
}
#define DROPTAG(x) x, #x
@@ -280,10 +277,10 @@ dt_droptag(dtrace_dropkind_t kind)
for (i = 0; _dt_droptags[i].dtdrg_tag != NULL; i++) {
if (_dt_droptags[i].dtdrg_kind == kind)
- return (_dt_droptags[i].dtdrg_tag);
+ return _dt_droptags[i].dtdrg_tag;
}
- return ("DTRACEDROP_UNKNOWN");
+ return "DTRACEDROP_UNKNOWN";
}
int
@@ -296,7 +293,7 @@ dt_handle_cpudrop(dtrace_hdl_t *dtp, processorid_t cpu,
assert(what == DTRACEDROP_PRINCIPAL || what == DTRACEDROP_AGGREGATION);
- memset(&drop, 0, sizeof (drop));
+ memset(&drop, 0, sizeof(drop));
drop.dtdda_handle = dtp;
drop.dtdda_cpu = cpu;
drop.dtdda_kind = what;
@@ -304,25 +301,25 @@ dt_handle_cpudrop(dtrace_hdl_t *dtp, processorid_t cpu,
drop.dtdda_msg = str;
if (dtp->dt_droptags) {
- (void) snprintf(str, sizeof (str), "[%s] ", dt_droptag(what));
+ snprintf(str, sizeof(str), "[%s] ", dt_droptag(what));
s = &str[strlen(str)];
- size = sizeof (str) - (s - str);
+ size = sizeof(str) - (s - str);
} else {
s = str;
- size = sizeof (str);
+ size = sizeof(str);
}
- (void) snprintf(s, size, "%llu %sdrop%s on CPU %d\n",
- (unsigned long long) howmany, what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ",
+ snprintf(s, size, "%llu %sdrop%s on CPU %d\n",
+ (unsigned long long)howmany, what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ",
howmany > 1 ? "s" : "", cpu);
if (dtp->dt_drophdlr == NULL)
- return (dt_set_errno(dtp, EDT_DROPABORT));
+ return dt_set_errno(dtp, EDT_DROPABORT);
if ((*dtp->dt_drophdlr)(&drop, dtp->dt_droparg) == DTRACE_HANDLE_ABORT)
- return (dt_set_errno(dtp, EDT_DROPABORT));
+ return dt_set_errno(dtp, EDT_DROPABORT);
- return (0);
+ return 0;
}
static const struct {
@@ -374,7 +371,7 @@ dt_handle_status(dtrace_hdl_t *dtp, dtrace_status_t *old, dtrace_status_t *new)
uintptr_t base = (uintptr_t)new, obase = (uintptr_t)old;
int i, size;
- memset(&drop, 0, sizeof (drop));
+ memset(&drop, 0, sizeof(drop));
drop.dtdda_handle = dtp;
drop.dtdda_cpu = DTRACE_CPUALL;
drop.dtdda_msg = str;
@@ -383,7 +380,7 @@ dt_handle_status(dtrace_hdl_t *dtp, dtrace_status_t *old, dtrace_status_t *new)
* First, check to see if we've been killed -- in which case we abort.
*/
if (new->dtst_killed && !old->dtst_killed)
- return (dt_set_errno(dtp, EDT_BRICKED));
+ return dt_set_errno(dtp, EDT_BRICKED);
for (i = 0; _dt_droptab[i].dtdrt_str != NULL; i++) {
uintptr_t naddr = base + _dt_droptab[i].dtdrt_offset;
@@ -396,17 +393,17 @@ dt_handle_status(dtrace_hdl_t *dtp, dtrace_status_t *old, dtrace_status_t *new)
continue;
if (dtp->dt_droptags) {
- (void) snprintf(str, sizeof (str), "[%s] ",
+ snprintf(str, sizeof(str), "[%s] ",
dt_droptag(_dt_droptab[i].dtdrt_kind));
s = &str[strlen(str)];
- size = sizeof (str) - (s - str);
+ size = sizeof(str) - (s - str);
} else {
s = str;
- size = sizeof (str);
+ size = sizeof(str);
}
- (void) snprintf(s, size, "%llu %s%s%s\n",
- (unsigned long long) nval - oval,
+ snprintf(s, size, "%llu %s%s%s\n",
+ (unsigned long long)nval - oval,
_dt_droptab[i].dtdrt_str, (nval - oval > 1) ? "s" : "",
_dt_droptab[i].dtdrt_msg != NULL ?
_dt_droptab[i].dtdrt_msg : "");
@@ -416,14 +413,14 @@ dt_handle_status(dtrace_hdl_t *dtp, dtrace_status_t *old, dtrace_status_t *new)
drop.dtdda_drops = nval - oval;
if (dtp->dt_drophdlr == NULL)
- return (dt_set_errno(dtp, EDT_DROPABORT));
+ return dt_set_errno(dtp, EDT_DROPABORT);
if ((*dtp->dt_drophdlr)(&drop,
dtp->dt_droparg) == DTRACE_HANDLE_ABORT)
- return (dt_set_errno(dtp, EDT_DROPABORT));
+ return dt_set_errno(dtp, EDT_DROPABORT);
}
- return (0);
+ return 0;
}
int
@@ -432,12 +429,12 @@ dt_handle_setopt(dtrace_hdl_t *dtp, dtrace_setoptdata_t *data)
void *arg = dtp->dt_setoptarg;
if (dtp->dt_setopthdlr == NULL)
- return (0);
+ return 0;
if ((*dtp->dt_setopthdlr)(data, arg) == DTRACE_HANDLE_ABORT)
- return (dt_set_errno(dtp, EDT_DIRABORT));
+ return dt_set_errno(dtp, EDT_DIRABORT);
- return (0);
+ return 0;
}
int
@@ -452,11 +449,11 @@ dt_handle(dtrace_hdl_t *dtp, dtrace_probedata_t *data)
break;
default:
- return (DTRACE_CONSUME_THIS);
+ return DTRACE_CONSUME_THIS;
}
if (rval == 0)
- return (DTRACE_CONSUME_NEXT);
+ return DTRACE_CONSUME_NEXT;
- return (DTRACE_CONSUME_ERROR);
+ return DTRACE_CONSUME_ERROR;
}
diff --git a/libdtrace/dt_ident.c b/libdtrace/dt_ident.c
index eb59ad10..317e3360 100644
--- a/libdtrace/dt_ident.c
+++ b/libdtrace/dt_ident.c
@@ -94,9 +94,9 @@ dt_idcook_sign(dt_node_t *dnp, dt_ident_t *idp,
"prototype:\n\tprototype: %s\n\t%9s: %s\n",
prefix, idp->di_name, suffix,
iskey ? "key" : "argument", i + 1,
- dt_node_type_name(&isp->dis_args[i], n1, sizeof (n1)),
+ dt_node_type_name(&isp->dis_args[i], n1, sizeof(n1)),
iskey ? "key" : "argument",
- dt_node_type_name(args, n2, sizeof (n2)));
+ dt_node_type_name(args, n2, sizeof(n2)));
}
}
@@ -112,7 +112,7 @@ static void
dt_idcook_assc(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
{
if (idp->di_data == NULL) {
- dt_idsig_t *isp = idp->di_data = malloc(sizeof (dt_idsig_t));
+ dt_idsig_t *isp = idp->di_data = malloc(sizeof(dt_idsig_t));
char n[DT_TYPE_NAMELEN];
int i;
@@ -126,7 +126,7 @@ dt_idcook_assc(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
isp->dis_auxinfo = 0;
if (argc != 0 && (isp->dis_args = calloc(argc,
- sizeof (dt_node_t))) == NULL) {
+ sizeof(dt_node_t))) == NULL) {
idp->di_data = NULL;
free(isp);
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -148,7 +148,7 @@ dt_idcook_assc(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
if (dt_node_is_dynamic(args) || dt_node_is_void(args)) {
xyerror(D_KEY_TYPE, "%s expression may not be "
"used as %s index: key #%d\n",
- dt_node_type_name(args, n, sizeof (n)),
+ dt_node_type_name(args, n, sizeof(n)),
dt_idkind_name(idp->di_kind), i + 1);
}
@@ -184,7 +184,7 @@ dt_idcook_func(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
assert(idp->di_iarg != NULL);
s = alloca(strlen(idp->di_iarg) + 1);
- (void) strcpy(s, idp->di_iarg);
+ strcpy(s, idp->di_iarg);
if ((p2 = strrchr(s, ')')) != NULL)
*p2 = '\0'; /* mark end of parameter list string */
@@ -192,17 +192,15 @@ dt_idcook_func(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
if ((p1 = strchr(s, '(')) != NULL)
*p1++ = '\0'; /* mark end of return type string */
- if (p1 == NULL || p2 == NULL) {
+ if (p1 == NULL || p2 == NULL)
xyerror(D_UNKNOWN, "internal error: malformed entry "
"for built-in function %s\n", idp->di_name);
- }
- for (p2 = p1; *p2 != '\0'; p2++) {
+ for (p2 = p1; *p2 != '\0'; p2++)
if (!isspace(*p2)) {
i++;
break;
}
- }
for (p2 = strchr(p2, ','); p2++ != NULL; i++)
p2 = strchr(p2, ',');
@@ -212,7 +210,7 @@ dt_idcook_func(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
* appropriate number of argument entries, and then look up
* the return type and store its CTF data in di_ctfp/type.
*/
- if ((isp = idp->di_data = malloc(sizeof (dt_idsig_t))) == NULL)
+ if ((isp = idp->di_data = malloc(sizeof(dt_idsig_t))) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
isp->dis_varargs = -1;
@@ -222,17 +220,16 @@ dt_idcook_func(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
isp->dis_auxinfo = 0;
if (i != 0 && (isp->dis_args = calloc(i,
- sizeof (dt_node_t))) == NULL) {
+ sizeof(dt_node_t))) == NULL) {
idp->di_data = NULL;
free(isp);
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
}
- if (dt_type_lookup(s, &dtt) == -1) {
+ if (dt_type_lookup(s, &dtt) == -1)
xyerror(D_UNKNOWN, "failed to resolve type of %s (%s):"
" %s\n", idp->di_name, s,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- }
if (idp->di_kind == DT_IDENT_AGGFUNC) {
idp->di_ctfp = DT_DYN_CTFP(dtp);
@@ -335,7 +332,7 @@ dt_idcook_args(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
xyerror(D_PROTO_ARG, "%s[ ] argument #1 is incompatible with "
"prototype:\n\tprototype: %s\n\t argument: %s\n",
idp->di_name, "integer constant",
- dt_type_name(ap->dn_ctfp, ap->dn_type, n1, sizeof (n1)));
+ dt_type_name(ap->dn_ctfp, ap->dn_type, n1, sizeof(n1)));
}
if (yypcb->pcb_pdesc == NULL) {
@@ -347,13 +344,13 @@ dt_idcook_args(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
xyerror(D_ARGS_MULTI,
"%s[ ] may not be referenced because probe description %s "
"matches an unstable set of probes\n", idp->di_name,
- dtrace_desc2str(yypcb->pcb_pdesc, n1, sizeof (n1)));
+ dtrace_desc2str(yypcb->pcb_pdesc, n1, sizeof(n1)));
}
if (ap->dn_value >= prp->argc) {
xyerror(D_ARGS_IDX, "index %lld is out of range for %s %s[ ]\n",
(longlong_t)ap->dn_value, dtrace_desc2str(yypcb->pcb_pdesc,
- n1, sizeof (n1)), idp->di_name);
+ n1, sizeof(n1)), idp->di_name);
}
/*
@@ -420,8 +417,8 @@ dt_idcook_args(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
} else {
xyerror(D_ARGS_XLATOR, "translator for %s[%lld] from %s to %s "
"is not defined\n", idp->di_name, (longlong_t)ap->dn_value,
- dt_node_type_name(nnp, n1, sizeof (n1)),
- dt_node_type_name(xnp, n2, sizeof (n2)));
+ dt_node_type_name(nnp, n1, sizeof(n1)),
+ dt_node_type_name(xnp, n2, sizeof(n2)));
}
assert(dnp->dn_ident->di_flags & DT_IDFLG_ORPHAN);
@@ -445,7 +442,7 @@ dt_idcook_regs(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
xyerror(D_PROTO_ARG, "%s[ ] argument #1 is incompatible with "
"prototype:\n\tprototype: %s\n\t argument: %s\n",
idp->di_name, "integer constant",
- dt_type_name(ap->dn_ctfp, ap->dn_type, n, sizeof (n)));
+ dt_type_name(ap->dn_ctfp, ap->dn_type, n, sizeof(n)));
}
if ((ap->dn_flags & DT_NF_SIGNED) && (int64_t)ap->dn_value < 0) {
@@ -567,14 +564,14 @@ dt_iddtor_difo(dt_ident_t *idp)
static size_t
dt_idsize_type(dt_ident_t *idp)
{
- return (ctf_type_size(idp->di_ctfp, idp->di_type));
+ return ctf_type_size(idp->di_ctfp, idp->di_type);
}
/*ARGSUSED*/
static size_t
dt_idsize_none(dt_ident_t *idp)
{
- return (0);
+ return 0;
}
const dt_idops_t dt_idops_assc = {
@@ -657,11 +654,11 @@ dt_idhash_create(const char *name, const dt_ident_t *tmpl,
assert(min <= max);
- size = sizeof (dt_idhash_t) +
- sizeof (dt_ident_t *) * (_dtrace_strbuckets - 1);
+ size = sizeof(dt_idhash_t) +
+ sizeof(dt_ident_t *) * (_dtrace_strbuckets - 1);
if ((dhp = malloc(size)) == NULL)
- return (NULL);
+ return NULL;
memset(dhp, 0, size);
dhp->dh_name = name;
@@ -672,7 +669,7 @@ dt_idhash_create(const char *name, const dt_ident_t *tmpl,
dhp->dh_nextoff = 0;
dhp->dh_hashsz = _dtrace_strbuckets;
- return (dhp);
+ return dhp;
}
/*
@@ -747,20 +744,20 @@ dt_idhash_lookup(dt_idhash_t *dhp, const char *name)
for (idp = dhp->dh_hash[h]; idp != NULL; idp = idp->di_next) {
if (strcmp(idp->di_name, name) == 0)
- return (idp);
+ return idp;
}
- return (NULL);
+ return NULL;
}
int
dt_idhash_nextid(dt_idhash_t *dhp, uint_t *p)
{
if (dhp->dh_nextid >= dhp->dh_maxid)
- return (-1); /* no more id's are free to allocate */
+ return -1; /* no more id's are free to allocate */
*p = dhp->dh_nextid++;
- return (0);
+ return 0;
}
uint_t
@@ -801,7 +798,7 @@ dt_idhash_insert(dt_idhash_t *dhp, const char *name, ushort_t kind,
idp = dt_ident_create(name, kind, flags, id, attr, vers, ops, iarg,
gen);
if (idp == NULL)
- return (NULL);
+ return NULL;
h = dt_strtab_hash(name, NULL) % dhp->dh_hashsz;
idp->di_next = dhp->dh_hash[h];
@@ -813,7 +810,7 @@ dt_idhash_insert(dt_idhash_t *dhp, const char *name, ushort_t kind,
if (dhp->dh_defer != NULL)
dhp->dh_defer(dhp, idp);
- return (idp);
+ return idp;
}
void
@@ -868,9 +865,9 @@ dt_idhash_comp(const void *lp, const void *rp)
const dt_ident_t *rhs = *((const dt_ident_t **)rp);
if (lhs->di_id != rhs->di_id)
- return ((int)(lhs->di_id - rhs->di_id));
+ return (int)(lhs->di_id - rhs->di_id);
else
- return (strcmp(lhs->di_name, rhs->di_name));
+ return strcmp(lhs->di_name, rhs->di_name);
}
int
@@ -885,21 +882,21 @@ dt_idhash_iter(dt_idhash_t *dhp, dt_idhash_f *func, void *data)
dt_idhash_populate(dhp); /* fill hash w/ initial population */
n = dhp->dh_nelems;
- ids = alloca(sizeof (dt_ident_t *) * n);
+ ids = alloca(sizeof(dt_ident_t *) * n);
for (i = 0, j = 0; i < dhp->dh_hashsz; i++) {
for (idp = dhp->dh_hash[i]; idp != NULL; idp = idp->di_next)
ids[j++] = idp;
}
- qsort(ids, dhp->dh_nelems, sizeof (dt_ident_t *), dt_idhash_comp);
+ qsort(ids, dhp->dh_nelems, sizeof(dt_ident_t *), dt_idhash_comp);
for (i = 0; i < n; i++) {
if ((rv = func(dhp, ids[i], data)) != 0)
- return (rv);
+ return rv;
}
- return (0);
+ return 0;
}
dt_ident_t *
@@ -911,10 +908,10 @@ dt_idstack_lookup(dt_idstack_t *sp, const char *name)
for (dhp = dt_list_prev(&sp->dids_list);
dhp != NULL; dhp = dt_list_prev(dhp)) {
if ((idp = dt_idhash_lookup(dhp, name)) != NULL)
- return (idp);
+ return idp;
}
- return (NULL);
+ return NULL;
}
void
@@ -939,9 +936,9 @@ dt_ident_create(const char *name, ushort_t kind, ushort_t flags, uint_t id,
char *s = NULL;
if ((name != NULL && (s = strdup(name)) == NULL) ||
- (idp = malloc(sizeof (dt_ident_t))) == NULL) {
+ (idp = malloc(sizeof(dt_ident_t))) == NULL) {
free(s);
- return (NULL);
+ return NULL;
}
idp->di_name = s;
@@ -1008,7 +1005,7 @@ dt_ident_cook(dt_node_t *dnp, dt_ident_t *idp, dt_node_t **pargp)
if (idp->di_flags & DT_IDFLG_USER)
dnp->dn_flags |= DT_NF_USERLAND;
- return (dt_attr_min(attr, idp->di_attr));
+ return dt_attr_min(attr, idp->di_attr);
}
void
@@ -1067,41 +1064,41 @@ dt_ident_resolve(dt_ident_t *idp)
break;
}
- return (idp);
+ return idp;
}
size_t
dt_ident_size(dt_ident_t *idp)
{
idp = dt_ident_resolve(idp);
- return (idp->di_ops->di_size(idp));
+ return idp->di_ops->di_size(idp);
}
int
dt_ident_unref(const dt_ident_t *idp)
{
- return (idp->di_gen == yypcb->pcb_hdl->dt_gen &&
- (idp->di_flags & (DT_IDFLG_REF|DT_IDFLG_MOD|DT_IDFLG_DECL)) == 0);
+ return idp->di_gen == yypcb->pcb_hdl->dt_gen &&
+ (idp->di_flags & (DT_IDFLG_REF|DT_IDFLG_MOD|DT_IDFLG_DECL)) == 0;
}
const char *
dt_idkind_name(uint_t kind)
{
switch (kind) {
- case DT_IDENT_ARRAY: return ("associative array");
- case DT_IDENT_SCALAR: return ("scalar");
- case DT_IDENT_PTR: return ("pointer");
- case DT_IDENT_FUNC: return ("function");
- case DT_IDENT_AGG: return ("aggregation");
- case DT_IDENT_AGGFUNC: return ("aggregating function");
- case DT_IDENT_ACTFUNC: return ("tracing function");
- case DT_IDENT_XLSOU: return ("translated data");
- case DT_IDENT_XLPTR: return ("pointer to translated data");
- case DT_IDENT_SYMBOL: return ("external symbol reference");
- case DT_IDENT_ENUM: return ("enumerator");
- case DT_IDENT_PRAGAT: return ("#pragma attributes");
- case DT_IDENT_PRAGBN: return ("#pragma binding");
- case DT_IDENT_PROBE: return ("probe definition");
- default: return ("<?>");
+ case DT_IDENT_ARRAY: return "associative array";
+ case DT_IDENT_SCALAR: return "scalar";
+ case DT_IDENT_PTR: return "pointer";
+ case DT_IDENT_FUNC: return "function";
+ case DT_IDENT_AGG: return "aggregation";
+ case DT_IDENT_AGGFUNC: return "aggregating function";
+ case DT_IDENT_ACTFUNC: return "tracing function";
+ case DT_IDENT_XLSOU: return "translated data";
+ case DT_IDENT_XLPTR: return "pointer to translated data";
+ case DT_IDENT_SYMBOL: return "external symbol reference";
+ case DT_IDENT_ENUM: return "enumerator";
+ case DT_IDENT_PRAGAT: return "#pragma attributes";
+ case DT_IDENT_PRAGBN: return "#pragma binding";
+ case DT_IDENT_PROBE: return "probe definition";
+ default: return "<?>";
}
}
diff --git a/libdtrace/dt_kernel_module.c b/libdtrace/dt_kernel_module.c
index 07cd4943..4bf44532 100644
--- a/libdtrace/dt_kernel_module.c
+++ b/libdtrace/dt_kernel_module.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -46,16 +46,16 @@ dt_kern_path_create(dtrace_hdl_t *dtp, char *name, char *path)
if (strcmp(dkpp->dkp_name, name) == 0) {
free(name);
free(path);
- return (dkpp);
+ return dkpp;
}
}
- if ((dkpp = malloc(sizeof (dt_kern_path_t))) == NULL)
- return (NULL); /* caller must handle allocation failure */
+ if ((dkpp = malloc(sizeof(dt_kern_path_t))) == NULL)
+ return NULL; /* caller must handle allocation failure */
dt_dprintf("Adding %s -> %s\n", name, path);
- memset(dkpp, 0, sizeof (dt_kern_path_t));
+ memset(dkpp, 0, sizeof(dt_kern_path_t));
dkpp->dkp_name = name;
dkpp->dkp_path = path; /* strdup()ped by our caller */
dt_list_append(&dtp->dt_kernpathlist, dkpp);
@@ -63,7 +63,7 @@ dt_kern_path_create(dtrace_hdl_t *dtp, char *name, char *path)
dtp->dt_kernpaths[h] = dkpp;
dtp->dt_nkernpaths++;
- return (dkpp);
+ return dkpp;
}
void
@@ -191,7 +191,7 @@ dt_kern_path_lookup_by_name(dtrace_hdl_t *dtp, const char *name)
if (dterrno != 0) {
dt_dprintf("Error initializing kernel module paths: "
"%s\n", dtrace_errmsg(dtp, dterrno));
- return (NULL);
+ return NULL;
}
dt_dprintf("Initialized %i kernel module paths\n",
@@ -200,10 +200,10 @@ dt_kern_path_lookup_by_name(dtrace_hdl_t *dtp, const char *name)
for (dkpp = dtp->dt_kernpaths[h]; dkpp != NULL; dkpp = dkpp->dkp_next) {
if (strcmp(dkpp->dkp_name, name) == 0)
- return (dkpp);
+ return dkpp;
}
- return (NULL);
+ return NULL;
}
/*
diff --git a/libdtrace/dt_lex.l b/libdtrace/dt_lex.l
index dc1b13db..ceebeae5 100644
--- a/libdtrace/dt_lex.l
+++ b/libdtrace/dt_lex.l
@@ -1,7 +1,7 @@
%{
/*
* Oracle Linux DTrace.
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -73,88 +73,88 @@ RGX_CTL [\f\t\v ]*#
if (yypcb->pcb_token != 0) {
int tok = yypcb->pcb_token;
yypcb->pcb_token = 0;
- return (tok);
+ return tok;
}
%}
-<S0>auto return (DT_KEY_AUTO);
-<S0>break return (DT_KEY_BREAK);
-<S0>case return (DT_KEY_CASE);
-<S0>char return (DT_KEY_CHAR);
-<S0>const return (DT_KEY_CONST);
-<S0>continue return (DT_KEY_CONTINUE);
-<S0>counter return (DT_KEY_COUNTER);
-<S0>default return (DT_KEY_DEFAULT);
-<S0>do return (DT_KEY_DO);
-<S0>double return (DT_KEY_DOUBLE);
-<S0>else return (DT_KEY_ELSE);
-<S0>enum { yypcb->pcb_sou_type = 1; return (DT_KEY_ENUM); }
-<S0>extern return (DT_KEY_EXTERN);
-<S0>float return (DT_KEY_FLOAT);
-<S0>for return (DT_KEY_FOR);
-<S0>goto return (DT_KEY_GOTO);
-<S0>if return (DT_KEY_IF);
-<S0>import return (DT_KEY_IMPORT);
-<S0>inline return (DT_KEY_INLINE);
-<S0>int return (DT_KEY_INT);
-<S0>long return (DT_KEY_LONG);
-<S0>offsetof return (DT_TOK_OFFSETOF);
-<S0>probe return (DT_KEY_PROBE);
-<S0>provider return (DT_KEY_PROVIDER);
-<S0>register return (DT_KEY_REGISTER);
-<S0>restrict return (DT_KEY_RESTRICT);
-<S0>return return (DT_KEY_RETURN);
-<S0>self return (DT_KEY_SELF);
-<S0>short return (DT_KEY_SHORT);
-<S0>signed return (DT_KEY_SIGNED);
-<S0>sizeof return (DT_TOK_SIZEOF);
-<S0>static return (DT_KEY_STATIC);
-<S0>string return (DT_KEY_STRING);
-<S0>stringof return (DT_TOK_STRINGOF);
-<S0>struct { yypcb->pcb_sou_type = 1; return (DT_KEY_STRUCT); }
-<S0>switch return (DT_KEY_SWITCH);
-<S0>this return (DT_KEY_THIS);
-<S0>translator return (DT_KEY_XLATOR);
-<S0>typedef return (DT_KEY_TYPEDEF);
-<S0>union { yypcb->pcb_sou_type = 1; return (DT_KEY_UNION); }
-<S0>unsigned return (DT_KEY_UNSIGNED);
-<S0>void return (DT_KEY_VOID);
-<S0>volatile return (DT_KEY_VOLATILE);
-<S0>while return (DT_KEY_WHILE);
-<S0>xlate return (DT_TOK_XLATE);
-
-<S2>auto { yybegin(YYS_EXPR); return (DT_KEY_AUTO); }
-<S2>char { yybegin(YYS_EXPR); return (DT_KEY_CHAR); }
-<S2>const { yybegin(YYS_EXPR); return (DT_KEY_CONST); }
-<S2>counter { yybegin(YYS_DEFINE); return (DT_KEY_COUNTER); }
-<S2>double { yybegin(YYS_EXPR); return (DT_KEY_DOUBLE); }
+<S0>auto return DT_KEY_AUTO;
+<S0>break return DT_KEY_BREAK;
+<S0>case return DT_KEY_CASE;
+<S0>char return DT_KEY_CHAR;
+<S0>const return DT_KEY_CONST;
+<S0>continue return DT_KEY_CONTINUE;
+<S0>counter return DT_KEY_COUNTER;
+<S0>default return DT_KEY_DEFAULT;
+<S0>do return DT_KEY_DO;
+<S0>double return DT_KEY_DOUBLE;
+<S0>else return DT_KEY_ELSE;
+<S0>enum { yypcb->pcb_sou_type = 1; return DT_KEY_ENUM; }
+<S0>extern return DT_KEY_EXTERN;
+<S0>float return DT_KEY_FLOAT;
+<S0>for return DT_KEY_FOR;
+<S0>goto return DT_KEY_GOTO;
+<S0>if return DT_KEY_IF;
+<S0>import return DT_KEY_IMPORT;
+<S0>inline return DT_KEY_INLINE;
+<S0>int return DT_KEY_INT;
+<S0>long return DT_KEY_LONG;
+<S0>offsetof return DT_TOK_OFFSETOF;
+<S0>probe return DT_KEY_PROBE;
+<S0>provider return DT_KEY_PROVIDER;
+<S0>register return DT_KEY_REGISTER;
+<S0>restrict return DT_KEY_RESTRICT;
+<S0>return return DT_KEY_RETURN;
+<S0>self return DT_KEY_SELF;
+<S0>short return DT_KEY_SHORT;
+<S0>signed return DT_KEY_SIGNED;
+<S0>sizeof return DT_TOK_SIZEOF;
+<S0>static return DT_KEY_STATIC;
+<S0>string return DT_KEY_STRING;
+<S0>stringof return DT_TOK_STRINGOF;
+<S0>struct { yypcb->pcb_sou_type = 1; return DT_KEY_STRUCT; }
+<S0>switch return DT_KEY_SWITCH;
+<S0>this return DT_KEY_THIS;
+<S0>translator return DT_KEY_XLATOR;
+<S0>typedef return DT_KEY_TYPEDEF;
+<S0>union { yypcb->pcb_sou_type = 1; return DT_KEY_UNION; }
+<S0>unsigned return DT_KEY_UNSIGNED;
+<S0>void return DT_KEY_VOID;
+<S0>volatile return DT_KEY_VOLATILE;
+<S0>while return DT_KEY_WHILE;
+<S0>xlate return DT_TOK_XLATE;
+
+<S2>auto { yybegin(YYS_EXPR); return DT_KEY_AUTO; }
+<S2>char { yybegin(YYS_EXPR); return DT_KEY_CHAR; }
+<S2>const { yybegin(YYS_EXPR); return DT_KEY_CONST; }
+<S2>counter { yybegin(YYS_DEFINE); return DT_KEY_COUNTER; }
+<S2>double { yybegin(YYS_EXPR); return DT_KEY_DOUBLE; }
<S2>enum { yybegin(YYS_EXPR); yypcb->pcb_sou_type = 1;
- return (DT_KEY_ENUM); }
-<S2>extern { yybegin(YYS_EXPR); return (DT_KEY_EXTERN); }
-<S2>float { yybegin(YYS_EXPR); return (DT_KEY_FLOAT); }
-<S2>import { yybegin(YYS_EXPR); return (DT_KEY_IMPORT); }
-<S2>inline { yybegin(YYS_DEFINE); return (DT_KEY_INLINE); }
-<S2>int { yybegin(YYS_EXPR); return (DT_KEY_INT); }
-<S2>long { yybegin(YYS_EXPR); return (DT_KEY_LONG); }
-<S2>provider { yybegin(YYS_DEFINE); return (DT_KEY_PROVIDER); }
-<S2>register { yybegin(YYS_EXPR); return (DT_KEY_REGISTER); }
-<S2>restrict { yybegin(YYS_EXPR); return (DT_KEY_RESTRICT); }
-<S2>self { yybegin(YYS_EXPR); return (DT_KEY_SELF); }
-<S2>short { yybegin(YYS_EXPR); return (DT_KEY_SHORT); }
-<S2>signed { yybegin(YYS_EXPR); return (DT_KEY_SIGNED); }
-<S2>static { yybegin(YYS_EXPR); return (DT_KEY_STATIC); }
-<S2>string { yybegin(YYS_EXPR); return (DT_KEY_STRING); }
+ return DT_KEY_ENUM; }
+<S2>extern { yybegin(YYS_EXPR); return DT_KEY_EXTERN; }
+<S2>float { yybegin(YYS_EXPR); return DT_KEY_FLOAT; }
+<S2>import { yybegin(YYS_EXPR); return DT_KEY_IMPORT; }
+<S2>inline { yybegin(YYS_DEFINE); return DT_KEY_INLINE; }
+<S2>int { yybegin(YYS_EXPR); return DT_KEY_INT; }
+<S2>long { yybegin(YYS_EXPR); return DT_KEY_LONG; }
+<S2>provider { yybegin(YYS_DEFINE); return DT_KEY_PROVIDER; }
+<S2>register { yybegin(YYS_EXPR); return DT_KEY_REGISTER; }
+<S2>restrict { yybegin(YYS_EXPR); return DT_KEY_RESTRICT; }
+<S2>self { yybegin(YYS_EXPR); return DT_KEY_SELF; }
+<S2>short { yybegin(YYS_EXPR); return DT_KEY_SHORT; }
+<S2>signed { yybegin(YYS_EXPR); return DT_KEY_SIGNED; }
+<S2>static { yybegin(YYS_EXPR); return DT_KEY_STATIC; }
+<S2>string { yybegin(YYS_EXPR); return DT_KEY_STRING; }
<S2>struct { yybegin(YYS_EXPR); yypcb->pcb_sou_type = 1;
- return (DT_KEY_STRUCT); }
-<S2>this { yybegin(YYS_EXPR); return (DT_KEY_THIS); }
-<S2>translator { yybegin(YYS_DEFINE); return (DT_KEY_XLATOR); }
-<S2>typedef { yybegin(YYS_EXPR); return (DT_KEY_TYPEDEF); }
+ return DT_KEY_STRUCT; }
+<S2>this { yybegin(YYS_EXPR); return DT_KEY_THIS; }
+<S2>translator { yybegin(YYS_DEFINE); return DT_KEY_XLATOR; }
+<S2>typedef { yybegin(YYS_EXPR); return DT_KEY_TYPEDEF; }
<S2>union { yybegin(YYS_EXPR); yypcb->pcb_sou_type = 1;
- return (DT_KEY_UNION); }
-<S2>unsigned { yybegin(YYS_EXPR); return (DT_KEY_UNSIGNED); }
-<S2>void { yybegin(YYS_EXPR); return (DT_KEY_VOID); }
-<S2>volatile { yybegin(YYS_EXPR); return (DT_KEY_VOLATILE); }
+ return DT_KEY_UNION; }
+<S2>unsigned { yybegin(YYS_EXPR); return DT_KEY_UNSIGNED; }
+<S2>void { yybegin(YYS_EXPR); return DT_KEY_VOID; }
+<S2>volatile { yybegin(YYS_EXPR); return DT_KEY_VOLATILE; }
<S0>"$$"[0-9]+ {
int i = atoi(yytext + 2);
@@ -182,8 +182,8 @@ if (yypcb->pcb_token != 0) {
if ((yylval.l_str = strdup(v)) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- (void) stresc2chr(yylval.l_str);
- return (DT_TOK_STRING);
+ stresc2chr(yylval.l_str);
+ return DT_TOK_STRING;
}
<S0,SIDENT>"$"[0-9]+ {
@@ -226,8 +226,8 @@ if (yypcb->pcb_token != 0) {
if (yylval.l_str == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- (void) stresc2chr(yylval.l_str);
- return (DT_TOK_STRING);
+ stresc2chr(yylval.l_str);
+ return DT_TOK_STRING;
}
/*
@@ -242,7 +242,7 @@ if (yypcb->pcb_token != 0) {
errno = 0;
yylval.l_int = strtoull(v, &p, 0);
- strcpy_safe(yyintsuffix, sizeof (yyintsuffix), p);
+ strcpy_safe(yyintsuffix, sizeof(yyintsuffix), p);
yyintdecimal = *v != '0';
if (errno == ERANGE) {
@@ -251,10 +251,10 @@ if (yypcb->pcb_token != 0) {
" overflow\n", yytext, v);
}
- return (DT_TOK_INT);
+ return DT_TOK_INT;
}
- return (id_or_type(v));
+ return id_or_type(v);
}
<S0>"$$"{RGX_IDENT} {
@@ -272,11 +272,11 @@ if (yypcb->pcb_token != 0) {
* For the moment, all current macro variables are of
* type id_t (refer to dtrace_update() for details).
*/
- (void) snprintf(s, sizeof (s), "%u", idp->di_id);
+ snprintf(s, sizeof(s), "%u", idp->di_id);
if ((yylval.l_str = strdup(s)) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- return (DT_TOK_STRING);
+ return DT_TOK_STRING;
}
<S0>"$"{RGX_IDENT} {
@@ -297,23 +297,23 @@ if (yypcb->pcb_token != 0) {
yyintsuffix[0] = '\0';
yyintdecimal = 1;
- return (DT_TOK_INT);
+ return DT_TOK_INT;
}
<S0,SIDENT>{RGX_IDENT} {
- return (id_or_type(yytext));
+ return id_or_type(yytext);
}
<S0>{RGX_AGG} {
if ((yylval.l_str = strdup(yytext)) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- return (DT_TOK_AGG);
+ return DT_TOK_AGG;
}
<S0>"@" {
if ((yylval.l_str = strdup("@_")) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- return (DT_TOK_AGG);
+ return DT_TOK_AGG;
}
<S0>{RGX_INT} |
@@ -324,7 +324,7 @@ if (yypcb->pcb_token != 0) {
errno = 0;
yylval.l_int = strtoull(yytext, &p, 0);
yyintprefix = 0;
- strcpy_safe(yyintsuffix, sizeof (yyintsuffix), p);
+ strcpy_safe(yyintsuffix, sizeof(yyintsuffix), p);
yyintdecimal = yytext[0] != '0';
if (errno == ERANGE) {
@@ -338,7 +338,7 @@ if (yypcb->pcb_token != 0) {
}
if ((YYSTATE) != S3)
- return (DT_TOK_INT);
+ return DT_TOK_INT;
yypragma = dt_node_link(yypragma,
dt_node_int(yylval.l_int));
@@ -360,9 +360,9 @@ if (yypcb->pcb_token != 0) {
if (yylval.l_str == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- (void) stresc2chr(yylval.l_str);
+ stresc2chr(yylval.l_str);
if ((YYSTATE) != S3)
- return (DT_TOK_STRING);
+ return DT_TOK_STRING;
yypragma = dt_node_link(yypragma,
dt_node_string(yylval.l_str));
@@ -389,7 +389,7 @@ if (yypcb->pcb_token != 0) {
yyintsuffix[0] = '\0';
yyintdecimal = 1;
- if (nbytes > sizeof (yylval.l_int)) {
+ if (nbytes > sizeof(yylval.l_int)) {
xyerror(D_CHR_OFLOW, "character constant is "
"too long");
}
@@ -399,9 +399,9 @@ if (yypcb->pcb_token != 0) {
*p-- = *q++;
#else
memcpy(((char *)&yylval.l_int) +
- sizeof (yylval.l_int) - nbytes, s, nbytes);
+ sizeof(yylval.l_int) - nbytes, s, nbytes);
#endif
- return (DT_TOK_INT);
+ return DT_TOK_INT;
}
<S0,S2,SIDENT>"/*" {
@@ -454,86 +454,86 @@ if (yypcb->pcb_token != 0) {
tok = DT_TOK_DIV;
unput(c);
- return (tok);
+ return tok;
}
<S0>"(" {
yypcb->pcb_parens++;
yypcb->pcb_sou_type = 0;
- return (DT_TOK_LPAR);
+ return DT_TOK_LPAR;
}
<S0>")" {
if (--yypcb->pcb_parens < 0)
yyerror("extra ) in input stream\n");
yypcb->pcb_sou_type = 0;
- return (DT_TOK_RPAR);
+ return DT_TOK_RPAR;
}
<S0>"[" {
yypcb->pcb_brackets++;
- return (DT_TOK_LBRAC);
+ return DT_TOK_LBRAC;
}
<S0>"]" {
if (--yypcb->pcb_brackets < 0)
yyerror("extra ] in input stream\n");
- return (DT_TOK_RBRAC);
+ return DT_TOK_RBRAC;
}
<S0>"{" |
<S2>"{" {
yypcb->pcb_braces++;
yypcb->pcb_sou_type = 0;
- return ('{');
+ return '{';
}
<S0>"}" {
if (--yypcb->pcb_braces < 0)
yyerror("extra } in input stream\n");
- return ('}');
+ return '}';
}
-<S0>"|" return (DT_TOK_BOR);
-<S0>"^" return (DT_TOK_XOR);
-<S0>"&" return (DT_TOK_BAND);
-<S0>"&&" return (DT_TOK_LAND);
-<S0>"^^" return (DT_TOK_LXOR);
-<S0>"||" return (DT_TOK_LOR);
-<S0>"==" return (DT_TOK_EQU);
-<S0>"!=" return (DT_TOK_NEQ);
-<S0>"<" yypcb->pcb_sou_type = 0; return (DT_TOK_LT);
-<S0>"<=" return (DT_TOK_LE);
-<S0>">" yypcb->pcb_sou_type = 0; return (DT_TOK_GT);
-<S0>">=" return (DT_TOK_GE);
-<S0>"<<" return (DT_TOK_LSH);
-<S0>">>" return (DT_TOK_RSH);
-<S0>"+" return (DT_TOK_ADD);
-<S0>"-" return (DT_TOK_SUB);
-<S0>"*" return (DT_TOK_MUL);
-<S0>"%" return (DT_TOK_MOD);
-<S0>"~" return (DT_TOK_BNEG);
-<S0>"!" return (DT_TOK_LNEG);
-<S0>"?" return (DT_TOK_QUESTION);
-<S0>":" return (DT_TOK_COLON);
-<S0>"." yypcb->pcb_sou_deref = 1; BEGIN(SIDENT); return (DT_TOK_DOT);
-<S0>"->" yypcb->pcb_sou_deref = 1; BEGIN(SIDENT); return (DT_TOK_PTR);
-<S0>"=" return (DT_TOK_ASGN);
-<S0>"+=" return (DT_TOK_ADD_EQ);
-<S0>"-=" return (DT_TOK_SUB_EQ);
-<S0>"*=" return (DT_TOK_MUL_EQ);
-<S0>"/=" return (DT_TOK_DIV_EQ);
-<S0>"%=" return (DT_TOK_MOD_EQ);
-<S0>"&=" return (DT_TOK_AND_EQ);
-<S0>"^=" return (DT_TOK_XOR_EQ);
-<S0>"|=" return (DT_TOK_OR_EQ);
-<S0>"<<=" return (DT_TOK_LSH_EQ);
-<S0>">>=" return (DT_TOK_RSH_EQ);
-<S0>"++" return (DT_TOK_ADDADD);
-<S0>"--" return (DT_TOK_SUBSUB);
-<S0>"..." return (DT_TOK_ELLIPSIS);
-<S0>"," return (DT_TOK_COMMA);
-<S0>";" return (';');
+<S0>"|" return DT_TOK_BOR;
+<S0>"^" return DT_TOK_XOR;
+<S0>"&" return DT_TOK_BAND;
+<S0>"&&" return DT_TOK_LAND;
+<S0>"^^" return DT_TOK_LXOR;
+<S0>"||" return DT_TOK_LOR;
+<S0>"==" return DT_TOK_EQU;
+<S0>"!=" return DT_TOK_NEQ;
+<S0>"<" yypcb->pcb_sou_type = 0; return DT_TOK_LT;
+<S0>"<=" return DT_TOK_LE;
+<S0>">" yypcb->pcb_sou_type = 0; return DT_TOK_GT;
+<S0>">=" return DT_TOK_GE;
+<S0>"<<" return DT_TOK_LSH;
+<S0>">>" return DT_TOK_RSH;
+<S0>"+" return DT_TOK_ADD;
+<S0>"-" return DT_TOK_SUB;
+<S0>"*" return DT_TOK_MUL;
+<S0>"%" return DT_TOK_MOD;
+<S0>"~" return DT_TOK_BNEG;
+<S0>"!" return DT_TOK_LNEG;
+<S0>"?" return DT_TOK_QUESTION;
+<S0>":" return DT_TOK_COLON;
+<S0>"." yypcb->pcb_sou_deref = 1; BEGIN(SIDENT); return DT_TOK_DOT;
+<S0>"->" yypcb->pcb_sou_deref = 1; BEGIN(SIDENT); return DT_TOK_PTR;
+<S0>"=" return DT_TOK_ASGN;
+<S0>"+=" return DT_TOK_ADD_EQ;
+<S0>"-=" return DT_TOK_SUB_EQ;
+<S0>"*=" return DT_TOK_MUL_EQ;
+<S0>"/=" return DT_TOK_DIV_EQ;
+<S0>"%=" return DT_TOK_MOD_EQ;
+<S0>"&=" return DT_TOK_AND_EQ;
+<S0>"^=" return DT_TOK_XOR_EQ;
+<S0>"|=" return DT_TOK_OR_EQ;
+<S0>"<<=" return DT_TOK_LSH_EQ;
+<S0>">>=" return DT_TOK_RSH_EQ;
+<S0>"++" return DT_TOK_ADDADD;
+<S0>"--" return DT_TOK_SUBSUB;
+<S0>"..." return DT_TOK_ELLIPSIS;
+<S0>"," return DT_TOK_COMMA;
+<S0>";" return ';';
<S0>{RGX_WS} ; /* discard */
<S0>"\\"\n ; /* discard */
<S0>. {
@@ -604,7 +604,7 @@ if (yypcb->pcb_token != 0) {
}
yybegin(YYS_EXPR);
- return (DT_TOK_TNAME);
+ return DT_TOK_TNAME;
}
if (p != NULL && p > yytext)
@@ -614,11 +614,11 @@ if (yypcb->pcb_token != 0) {
if ((yylval.l_str = strdup(yytext)) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- return (DT_TOK_PSPEC);
+ return DT_TOK_PSPEC;
}
-<S2>"/" return (DT_TOK_DIV);
-<S2>"," return (DT_TOK_COMMA);
+<S2>"/" return DT_TOK_DIV;
+<S2>"," return DT_TOK_COMMA;
<S2>{RGX_WS} ; /* discard */
<S2>. yyerror("syntax error near \"%c\"\n", yytext[0]);
@@ -746,7 +746,7 @@ id_or_type(const char *s)
*/
if (yypcb->pcb_sou_type) {
yypcb->pcb_sou_type = 0;
- return (DT_TOK_TNAME);
+ return DT_TOK_TNAME;
}
/*
@@ -754,14 +754,14 @@ id_or_type(const char *s)
*/
if (yypcb->pcb_sou_deref) {
yypcb->pcb_sou_deref = 0;
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
}
/*
* In type context -> must be a type name.
*/
if (yypcb->pcb_context == DT_CTX_DTYPE)
- return (DT_TOK_TNAME);
+ return DT_TOK_TNAME;
/*
* Inside an array declaration, having already seen a type: this must
@@ -771,7 +771,7 @@ id_or_type(const char *s)
idp = dt_idhash_insert(yypcb->pcb_idents, s, DT_IDENT_SCALAR,
DT_IDFLG_DECL, 0, _dtrace_defattr, 0, &dt_idops_thaw,
NULL, dtp->dt_gen);
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
}
/*
@@ -780,7 +780,7 @@ id_or_type(const char *s)
*/
if (dt_idstack_lookup(&yypcb->pcb_globals, s) != NULL ||
dt_idhash_lookup(yypcb->pcb_idents, s) != NULL)
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
/*
* If the lexeme is in a program clause, then it could be a type or it
@@ -855,7 +855,7 @@ id_or_type(const char *s)
}
if (ttok == DT_TOK_IDENT)
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
}
/*
@@ -889,7 +889,7 @@ id_or_type(const char *s)
}
if (ttok == DT_TOK_IDENT)
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
}
/*
@@ -898,7 +898,7 @@ id_or_type(const char *s)
* had better not get here for identifiers in trivial D code.
*/
if (dt_type_lookup(s, NULL) != 0)
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
/*
* If we're in the midst of parsing a declaration and a type_specifier
@@ -913,13 +913,13 @@ id_or_type(const char *s)
* redeclarations of the same identifier as part of dt_node_decl().
*/
if (ddp != NULL && ddp->dd_name != NULL)
- return (DT_TOK_IDENT);
+ return DT_TOK_IDENT;
/*
* The lexeme is a type name. (Ambiguous parses with identifiers in
* program clauses are already ruled out by the code above.)
*/
- return (DT_TOK_TNAME);
+ return DT_TOK_TNAME;
}
/*
diff --git a/libdtrace/dt_link.c b/libdtrace/dt_link.c
index 0dd6e23d..0b03bf8c 100644
--- a/libdtrace/dt_link.c
+++ b/libdtrace/dt_link.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -143,27 +143,27 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf32_t *dep)
dep->de_nsym = count + 1; /* the first symbol is always null */
if (dtp->dt_lazyload) {
- dep->de_strlen += sizeof (DOFLAZYSTR);
+ dep->de_strlen += sizeof(DOFLAZYSTR);
dep->de_nsym++;
} else {
- dep->de_strlen += sizeof (DOFSTR);
+ dep->de_strlen += sizeof(DOFSTR);
dep->de_nsym++;
}
if ((dep->de_rel = calloc(dep->de_nrel,
- sizeof (dep->de_rel[0]))) == NULL) {
- return (dt_set_errno(dtp, EDT_NOMEM));
+ sizeof(dep->de_rel[0]))) == NULL) {
+ return dt_set_errno(dtp, EDT_NOMEM);
}
- if ((dep->de_sym = calloc(dep->de_nsym, sizeof (Elf32_Sym))) == NULL) {
+ if ((dep->de_sym = calloc(dep->de_nsym, sizeof(Elf32_Sym))) == NULL) {
free(dep->de_rel);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
if ((dep->de_strtab = calloc(dep->de_strlen, 1)) == NULL) {
free(dep->de_rel);
free(dep->de_sym);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
count = 0;
@@ -176,7 +176,7 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf32_t *dep)
/*
* The first symbol table entry must be zeroed and is always ignored.
*/
- memset(sym, 0, sizeof (Elf32_Sym));
+ memset(sym, 0, sizeof(Elf32_Sym));
sym++;
/*
@@ -254,17 +254,17 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf32_t *dep)
if (dtp->dt_lazyload) {
memcpy(dep->de_strtab + strtabsz, DOFLAZYSTR,
- sizeof (DOFLAZYSTR));
- strtabsz += sizeof (DOFLAZYSTR);
+ sizeof(DOFLAZYSTR));
+ strtabsz += sizeof(DOFLAZYSTR);
} else {
- memcpy(dep->de_strtab + strtabsz, DOFSTR, sizeof (DOFSTR));
- strtabsz += sizeof (DOFSTR);
+ memcpy(dep->de_strtab + strtabsz, DOFSTR, sizeof(DOFSTR));
+ strtabsz += sizeof(DOFSTR);
}
assert(count == dep->de_nrel);
assert(strtabsz == dep->de_strlen);
- return (0);
+ return 0;
}
@@ -324,27 +324,27 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
dep->de_nsym = count + 1; /* the first symbol is always null */
if (dtp->dt_lazyload) {
- dep->de_strlen += sizeof (DOFLAZYSTR);
+ dep->de_strlen += sizeof(DOFLAZYSTR);
dep->de_nsym++;
} else {
- dep->de_strlen += sizeof (DOFSTR);
+ dep->de_strlen += sizeof(DOFSTR);
dep->de_nsym++;
}
if ((dep->de_rel = calloc(dep->de_nrel,
- sizeof (dep->de_rel[0]))) == NULL) {
- return (dt_set_errno(dtp, EDT_NOMEM));
+ sizeof(dep->de_rel[0]))) == NULL) {
+ return dt_set_errno(dtp, EDT_NOMEM);
}
- if ((dep->de_sym = calloc(dep->de_nsym, sizeof (Elf64_Sym))) == NULL) {
+ if ((dep->de_sym = calloc(dep->de_nsym, sizeof(Elf64_Sym))) == NULL) {
free(dep->de_rel);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
if ((dep->de_strtab = calloc(dep->de_strlen, 1)) == NULL) {
free(dep->de_rel);
free(dep->de_sym);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
count = 0;
@@ -357,7 +357,7 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
/*
* The first symbol table entry must be zeroed and is always ignored.
*/
- memset(sym, 0, sizeof (Elf64_Sym));
+ memset(sym, 0, sizeof(Elf64_Sym));
sym++;
/*
@@ -431,17 +431,17 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
if (dtp->dt_lazyload) {
memcpy(dep->de_strtab + strtabsz, DOFLAZYSTR,
- sizeof (DOFLAZYSTR));
- strtabsz += sizeof (DOFLAZYSTR);
+ sizeof(DOFLAZYSTR));
+ strtabsz += sizeof(DOFLAZYSTR);
} else {
- memcpy(dep->de_strtab + strtabsz, DOFSTR, sizeof (DOFSTR));
- strtabsz += sizeof (DOFSTR);
+ memcpy(dep->de_strtab + strtabsz, DOFSTR, sizeof(DOFSTR));
+ strtabsz += sizeof(DOFSTR);
}
assert(count == dep->de_nrel);
assert(strtabsz == dep->de_strlen);
- return (0);
+ return 0;
}
/*
@@ -465,7 +465,7 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
de.de_sym = NULL; /* gcc -Wmaybe-uninitialized */
if (prepare_elf32(dtp, dof, &de) != 0)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
/*
* If there are no relocations, we only need enough sections for
@@ -473,7 +473,7 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
*/
nshdr = de.de_nrel == 0 ? ESHDR_SYMTAB + 1 : ESHDR_NUM;
- memset(&elf_file, 0, sizeof (elf_file));
+ memset(&elf_file, 0, sizeof(elf_file));
elf_file.ehdr.e_ident[EI_MAG0] = ELFMAG0;
elf_file.ehdr.e_ident[EI_MAG1] = ELFMAG1;
@@ -493,20 +493,20 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
elf_file.ehdr.e_machine = EM_386;
#endif
elf_file.ehdr.e_version = EV_CURRENT;
- elf_file.ehdr.e_shoff = sizeof (Elf32_Ehdr);
- elf_file.ehdr.e_ehsize = sizeof (Elf32_Ehdr);
- elf_file.ehdr.e_phentsize = sizeof (Elf32_Phdr);
- elf_file.ehdr.e_shentsize = sizeof (Elf32_Shdr);
+ elf_file.ehdr.e_shoff = sizeof(Elf32_Ehdr);
+ elf_file.ehdr.e_ehsize = sizeof(Elf32_Ehdr);
+ elf_file.ehdr.e_phentsize = sizeof(Elf32_Phdr);
+ elf_file.ehdr.e_shentsize = sizeof(Elf32_Shdr);
elf_file.ehdr.e_shnum = nshdr;
elf_file.ehdr.e_shstrndx = ESHDR_SHSTRTAB;
- off = sizeof (elf_file) + nshdr * sizeof (Elf32_Shdr);
+ off = sizeof(elf_file) + nshdr * sizeof(Elf32_Shdr);
shp = &elf_file.shdr[ESHDR_SHSTRTAB];
shp->sh_name = NAMEOFF_SHSTRTAB;
shp->sh_type = SHT_STRTAB;
shp->sh_offset = off;
- shp->sh_size = sizeof (DTRACE_SHSTRTAB32);
- shp->sh_addralign = sizeof (char);
+ shp->sh_size = sizeof(DTRACE_SHSTRTAB32);
+ shp->sh_addralign = sizeof(char);
off = shp->sh_offset + shp->sh_size;
shp = &elf_file.shdr[ESHDR_STACKNOTE];
@@ -514,7 +514,7 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
shp->sh_type = SHT_PROGBITS;
shp->sh_offset = off;
shp->sh_size = 0;
- shp->sh_addralign = sizeof (char);
+ shp->sh_addralign = sizeof(char);
off = P2ROUNDUP(shp->sh_offset + shp->sh_size, 8);
shp = &elf_file.shdr[ESHDR_DOF];
@@ -532,24 +532,24 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
shp->sh_type = SHT_STRTAB;
shp->sh_offset = off;
shp->sh_size = de.de_strlen;
- shp->sh_addralign = sizeof (char);
+ shp->sh_addralign = sizeof(char);
off = P2ROUNDUP(shp->sh_offset + shp->sh_size, 4);
shp = &elf_file.shdr[ESHDR_SYMTAB];
shp->sh_name = NAMEOFF_SYMTAB;
shp->sh_flags = SHF_ALLOC;
shp->sh_type = SHT_SYMTAB;
- shp->sh_entsize = sizeof (Elf32_Sym);
+ shp->sh_entsize = sizeof(Elf32_Sym);
shp->sh_link = ESHDR_STRTAB;
shp->sh_offset = off;
shp->sh_info = de.de_global;
- shp->sh_size = de.de_nsym * sizeof (Elf32_Sym);
+ shp->sh_size = de.de_nsym * sizeof(Elf32_Sym);
shp->sh_addralign = 4;
off = P2ROUNDUP(shp->sh_offset + shp->sh_size, 4);
if (de.de_nrel == 0) {
if (dt_write(dtp, fd, &elf_file,
- sizeof (elf_file)) != sizeof (elf_file) ||
+ sizeof(elf_file)) != sizeof(elf_file) ||
PWRITE_SCN(ESHDR_SHSTRTAB, DTRACE_SHSTRTAB32) ||
PWRITE_SCN(ESHDR_STRTAB, de.de_strtab) ||
PWRITE_SCN(ESHDR_SYMTAB, de.de_sym) ||
@@ -565,15 +565,15 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
#else
shp->sh_type = SHT_REL;
#endif
- shp->sh_entsize = sizeof (de.de_rel[0]);
+ shp->sh_entsize = sizeof(de.de_rel[0]);
shp->sh_link = ESHDR_SYMTAB;
shp->sh_info = ESHDR_DOF;
shp->sh_offset = off;
- shp->sh_size = de.de_nrel * sizeof (de.de_rel[0]);
+ shp->sh_size = de.de_nrel * sizeof(de.de_rel[0]);
shp->sh_addralign = 4;
if (dt_write(dtp, fd, &elf_file,
- sizeof (elf_file)) != sizeof (elf_file) ||
+ sizeof(elf_file)) != sizeof(elf_file) ||
PWRITE_SCN(ESHDR_SHSTRTAB, DTRACE_SHSTRTAB32) ||
PWRITE_SCN(ESHDR_STRTAB, de.de_strtab) ||
PWRITE_SCN(ESHDR_SYMTAB, de.de_sym) ||
@@ -587,7 +587,7 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
free(de.de_sym);
free(de.de_rel);
- return (ret);
+ return ret;
}
/*
@@ -611,7 +611,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
de.de_sym = NULL; /* gcc -Wmaybe-uninitialized */
if (prepare_elf64(dtp, dof, &de) != 0)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
/*
* If there are no relocations, we only need enough sections for
@@ -619,7 +619,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
*/
nshdr = de.de_nrel == 0 ? ESHDR_SYMTAB + 1 : ESHDR_NUM;
- memset(&elf_file, 0, sizeof (elf_file));
+ memset(&elf_file, 0, sizeof(elf_file));
elf_file.ehdr.e_ident[EI_MAG0] = ELFMAG0;
elf_file.ehdr.e_ident[EI_MAG1] = ELFMAG1;
@@ -641,20 +641,20 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
elf_file.ehdr.e_machine = EM_AARCH64;
#endif
elf_file.ehdr.e_version = EV_CURRENT;
- elf_file.ehdr.e_shoff = sizeof (Elf64_Ehdr);
- elf_file.ehdr.e_ehsize = sizeof (Elf64_Ehdr);
- elf_file.ehdr.e_phentsize = sizeof (Elf64_Phdr);
- elf_file.ehdr.e_shentsize = sizeof (Elf64_Shdr);
+ elf_file.ehdr.e_shoff = sizeof(Elf64_Ehdr);
+ elf_file.ehdr.e_ehsize = sizeof(Elf64_Ehdr);
+ elf_file.ehdr.e_phentsize = sizeof(Elf64_Phdr);
+ elf_file.ehdr.e_shentsize = sizeof(Elf64_Shdr);
elf_file.ehdr.e_shnum = nshdr;
elf_file.ehdr.e_shstrndx = ESHDR_SHSTRTAB;
- off = sizeof (elf_file) + nshdr * sizeof (Elf64_Shdr);
+ off = sizeof(elf_file) + nshdr * sizeof(Elf64_Shdr);
shp = &elf_file.shdr[ESHDR_SHSTRTAB];
shp->sh_name = NAMEOFF_SHSTRTAB;
shp->sh_type = SHT_STRTAB;
shp->sh_offset = off;
- shp->sh_size = sizeof (DTRACE_SHSTRTAB64);
- shp->sh_addralign = sizeof (char);
+ shp->sh_size = sizeof(DTRACE_SHSTRTAB64);
+ shp->sh_addralign = sizeof(char);
off = shp->sh_offset + shp->sh_size;
shp = &elf_file.shdr[ESHDR_STACKNOTE];
@@ -662,7 +662,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
shp->sh_type = SHT_PROGBITS;
shp->sh_offset = off;
shp->sh_size = 0;
- shp->sh_addralign = sizeof (char);
+ shp->sh_addralign = sizeof(char);
off = P2ROUNDUP(shp->sh_offset + shp->sh_size, 8);
shp = &elf_file.shdr[ESHDR_DOF];
@@ -680,24 +680,24 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
shp->sh_type = SHT_STRTAB;
shp->sh_offset = off;
shp->sh_size = de.de_strlen;
- shp->sh_addralign = sizeof (char);
+ shp->sh_addralign = sizeof(char);
off = P2ROUNDUP(shp->sh_offset + shp->sh_size, 8);
shp = &elf_file.shdr[ESHDR_SYMTAB];
shp->sh_name = NAMEOFF_SYMTAB;
shp->sh_flags = SHF_ALLOC;
shp->sh_type = SHT_SYMTAB;
- shp->sh_entsize = sizeof (Elf64_Sym);
+ shp->sh_entsize = sizeof(Elf64_Sym);
shp->sh_link = ESHDR_STRTAB;
shp->sh_offset = off;
shp->sh_info = de.de_global;
- shp->sh_size = de.de_nsym * sizeof (Elf64_Sym);
+ shp->sh_size = de.de_nsym * sizeof(Elf64_Sym);
shp->sh_addralign = 8;
off = P2ROUNDUP(shp->sh_offset + shp->sh_size, 8);
if (de.de_nrel == 0) {
if (dt_write(dtp, fd, &elf_file,
- sizeof (elf_file)) != sizeof (elf_file) ||
+ sizeof(elf_file)) != sizeof(elf_file) ||
PWRITE_SCN(ESHDR_SHSTRTAB, DTRACE_SHSTRTAB64) ||
PWRITE_SCN(ESHDR_STRTAB, de.de_strtab) ||
PWRITE_SCN(ESHDR_SYMTAB, de.de_sym) ||
@@ -709,15 +709,15 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
shp->sh_name = NAMEOFF_REL;
shp->sh_flags = SHF_ALLOC;
shp->sh_type = SHT_RELA;
- shp->sh_entsize = sizeof (de.de_rel[0]);
+ shp->sh_entsize = sizeof(de.de_rel[0]);
shp->sh_link = ESHDR_SYMTAB;
shp->sh_info = ESHDR_DOF;
shp->sh_offset = off;
- shp->sh_size = de.de_nrel * sizeof (de.de_rel[0]);
+ shp->sh_size = de.de_nrel * sizeof(de.de_rel[0]);
shp->sh_addralign = 8;
if (dt_write(dtp, fd, &elf_file,
- sizeof (elf_file)) != sizeof (elf_file) ||
+ sizeof(elf_file)) != sizeof(elf_file) ||
PWRITE_SCN(ESHDR_SHSTRTAB, DTRACE_SHSTRTAB64) ||
PWRITE_SCN(ESHDR_STRTAB, de.de_strtab) ||
PWRITE_SCN(ESHDR_SYMTAB, de.de_sym) ||
@@ -731,7 +731,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
free(de.de_sym);
free(de.de_rel);
- return (ret);
+ return ret;
}
static int
@@ -747,7 +747,7 @@ dt_elf_symtab_lookup(Elf_Data *data_sym, int nsym, uintptr_t addr, uint_t shn,
sym->st_value <= addr &&
addr < sym->st_value + sym->st_size) {
if (GELF_ST_BIND(sym->st_info) == STB_GLOBAL)
- return (0);
+ return 0;
ret = 0;
s = *sym;
@@ -756,7 +756,7 @@ dt_elf_symtab_lookup(Elf_Data *data_sym, int nsym, uintptr_t addr, uint_t shn,
if (ret == 0)
*sym = s;
- return (ret);
+ return ret;
}
#if defined(__sparc)
@@ -780,8 +780,8 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
{
uint32_t *ip;
- if ((rela->r_offset & (sizeof (uint32_t) - 1)) != 0)
- return (-1);
+ if ((rela->r_offset & (sizeof(uint32_t) - 1)) != 0)
+ return -1;
/*LINTED*/
ip = (uint32_t *)(p + rela->r_offset);
@@ -794,7 +794,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (GELF_R_TYPE(rela->r_info) != R_SPARC_WDISP30 &&
GELF_R_TYPE(rela->r_info) != R_SPARC_WPLT30 &&
GELF_R_TYPE(rela->r_info) != R_386_NONE)
- return (-1);
+ return -1;
/*
* We may have already processed this object file in an earlier linker
@@ -803,22 +803,22 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
*/
if (isenabled) {
if (ip[0] == DT_OP_NOP) {
- (*off) += sizeof (ip[0]);
- return (0);
+ (*off) += sizeof(ip[0]);
+ return 0;
}
} else {
if (DT_IS_RESTORE(ip[1])) {
if (ip[0] == DT_OP_RET) {
- (*off) += sizeof (ip[0]);
- return (0);
+ (*off) += sizeof(ip[0]);
+ return 0;
}
} else if (DT_IS_MOV_O7(ip[1])) {
if (DT_IS_RETL(ip[0]))
- return (0);
+ return 0;
} else {
if (ip[0] == DT_OP_NOP) {
- (*off) += sizeof (ip[0]);
- return (0);
+ (*off) += sizeof(ip[0]);
+ return 0;
}
}
}
@@ -829,7 +829,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (ip[0] != DT_OP_CALL) {
dt_dprintf("found %x instead of a call instruction at %llx\n",
ip[0], (u_longlong_t)rela->r_offset);
- return (-1);
+ return -1;
}
if (isenabled) {
@@ -842,7 +842,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (DT_IS_RESTORE(ip[1]) || DT_IS_MOV_O7(ip[1])) {
dt_dprintf("tail call to is-enabled probe at %llx\n",
(u_longlong_t)rela->r_offset);
- return (-1);
+ return -1;
}
@@ -855,7 +855,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
* return register after that instruction has been emulated.
*/
ip[0] = DT_OP_NOP;
- (*off) += sizeof (ip[0]);
+ (*off) += sizeof(ip[0]);
} else {
/*
* If the call is followed by a restore, it's a tail call so
@@ -877,16 +877,16 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
*/
if (DT_IS_RESTORE(ip[1])) {
ip[0] = DT_OP_RET;
- (*off) += sizeof (ip[0]);
+ (*off) += sizeof(ip[0]);
} else if (DT_IS_MOV_O7(ip[1])) {
ip[0] = DT_MAKE_RETL(DT_RS2(ip[1]));
} else {
ip[0] = DT_OP_NOP;
- (*off) += sizeof (ip[0]);
+ (*off) += sizeof(ip[0]);
}
}
- return (0);
+ return 0;
}
#elif defined(__i386) || defined(__amd64)
@@ -925,7 +925,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (GELF_R_TYPE(rela->r_info) != R_386_PC32 &&
GELF_R_TYPE(rela->r_info) != R_386_PLT32 &&
GELF_R_TYPE(rela->r_info) != R_386_NONE)
- return (-1);
+ return -1;
/*
* We may have already processed this object file in an earlier linker
@@ -938,13 +938,13 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if ((ip[0] == DT_OP_NOP || ip[0] == DT_OP_RET) &&
ip[1] == DT_OP_NOP && ip[2] == DT_OP_NOP &&
ip[3] == DT_OP_NOP && ip[4] == DT_OP_NOP)
- return (0);
+ return 0;
} else if (dtp->dt_oflags & DTRACE_O_ILP32) {
if (ip[0] == DT_OP_XOR_EAX_0 && ip[1] == DT_OP_XOR_EAX_1 &&
(ip[2] == DT_OP_NOP || ip[2] == DT_OP_RET) &&
ip[3] == DT_OP_NOP && ip[4] == DT_OP_NOP) {
(*off) += 2;
- return (0);
+ return 0;
}
} else {
if (ip[0] == DT_OP_REX_RAX &&
@@ -952,7 +952,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
(ip[3] == DT_OP_NOP || ip[3] == DT_OP_RET) &&
ip[4] == DT_OP_NOP) {
(*off) += 3;
- return (0);
+ return 0;
}
}
@@ -963,7 +963,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (ip[0] != DT_OP_CALL && ip[0] != DT_OP_JMP32) {
dt_dprintf("found %x instead of a call or jmp instruction at "
"%llx\n", ip[0], (u_longlong_t)rela->r_offset);
- return (-1);
+ return -1;
}
ret = (ip[0] == DT_OP_JMP32) ? DT_OP_RET : DT_OP_NOP;
@@ -997,7 +997,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
(*off) += 3;
}
- return (0);
+ return 0;
}
#elif defined(__aarch64__)
@@ -1016,8 +1016,8 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
/*
* Ensure that the offset is aligned on an instruction boundary.
*/
- if ((rela->r_offset & (sizeof (uint32_t) - 1)) != 0)
- return (-1);
+ if ((rela->r_offset & (sizeof(uint32_t) - 1)) != 0)
+ return -1;
/*
* We only know about some specific relocation types.
@@ -1027,7 +1027,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (GELF_R_TYPE(rela->r_info) != R_AARCH64_CALL26 &&
GELF_R_TYPE(rela->r_info) != R_AARCH64_JUMP26 &&
GELF_R_TYPE(rela->r_info) != R_AARCH64_NONE)
- return (-1);
+ return -1;
ip = (uint32_t *)(p + rela->r_offset);
@@ -1037,7 +1037,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
* the one we would install below.
*/
if (ip[0] == DT_OP_NOP || ip[0] == DT_OP_RET)
- return (0);
+ return 0;
/*
* We only expect call instructions with a displacement of 0, or a jump
@@ -1046,7 +1046,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
if (ip[0] != DT_OP_CALL26 && ip[0] != DT_OP_JUMP26) {
dt_dprintf("found %x instead of a call or jmp instruction at "
"%llx\n", ip[0], (u_longlong_t)rela->r_offset);
- return (-1);
+ return -1;
}
/*
@@ -1061,7 +1061,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
else
ip[0] = DT_OP_RET;
- return (0);
+ return 0;
}
#else
#error unknown ISA
@@ -1081,10 +1081,10 @@ dt_link_error(dtrace_hdl_t *dtp, Elf *elf, int fd, dt_link_pair_t *bufs,
va_end(ap);
if (elf != NULL)
- (void) elf_end(elf);
+ elf_end(elf);
if (fd >= 0)
- (void) close(fd);
+ close(fd);
while ((pair = bufs) != NULL) {
bufs = pair->dlp_next;
@@ -1093,7 +1093,7 @@ dt_link_error(dtrace_hdl_t *dtp, Elf *elf, int fd, dt_link_pair_t *bufs,
dt_free(dtp, pair);
}
- return (dt_set_errno(dtp, EDT_COMPILER));
+ return dt_set_errno(dtp, EDT_COMPILER);
}
static int
@@ -1122,30 +1122,30 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
dt_strtab_t *strtab;
if ((fd = open64(obj, O_RDWR)) == -1) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "failed to open %s: %s", obj, strerror(errno)));
+ return dt_link_error(dtp, elf, fd, bufs,
+ "failed to open %s: %s", obj, strerror(errno));
}
if ((elf = elf_begin(fd, ELF_C_RDWR_MMAP, NULL)) == NULL) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "failed to process %s: %s", obj, elf_errmsg(elf_errno())));
+ return dt_link_error(dtp, elf, fd, bufs,
+ "failed to process %s: %s", obj, elf_errmsg(elf_errno()));
}
switch (elf_kind(elf)) {
case ELF_K_ELF:
break;
case ELF_K_AR:
- return (dt_link_error(dtp, elf, fd, bufs, "archives are not "
+ return dt_link_error(dtp, elf, fd, bufs, "archives are not "
"permitted; use the contents of the archive instead: %s",
- obj));
+ obj);
default:
- return (dt_link_error(dtp, elf, fd, bufs,
- "invalid file type: %s", obj));
+ return dt_link_error(dtp, elf, fd, bufs,
+ "invalid file type: %s", obj);
}
if (gelf_getehdr(elf, &ehdr) == NULL) {
- return (dt_link_error(dtp, elf, fd, bufs, "corrupt file: %s",
- obj));
+ return dt_link_error(dtp, elf, fd, bufs, "corrupt file: %s",
+ obj);
}
if (dtp->dt_oflags & DTRACE_O_ILP32) {
@@ -1156,7 +1156,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
#elif defined(__i386) || defined(__amd64)
emachine1 = emachine2 = EM_386;
#endif
- symsize = sizeof (Elf32_Sym);
+ symsize = sizeof(Elf32_Sym);
} else {
eclass = ELFCLASS64;
#if defined(__sparc)
@@ -1166,28 +1166,25 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
#elif defined(__aarch64__)
emachine1 = emachine2 = EM_AARCH64;
#endif
- symsize = sizeof (Elf64_Sym);
+ symsize = sizeof(Elf64_Sym);
}
- if (ehdr.e_ident[EI_CLASS] != eclass) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "incorrect ELF class for object file: %s", obj));
- }
+ if (ehdr.e_ident[EI_CLASS] != eclass)
+ return dt_link_error(dtp, elf, fd, bufs,
+ "incorrect ELF class for object file: %s", obj);
- if (ehdr.e_machine != emachine1 && ehdr.e_machine != emachine2) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "incorrect ELF machine type for object file: %s", obj));
- }
+ if (ehdr.e_machine != emachine1 && ehdr.e_machine != emachine2)
+ return dt_link_error(dtp, elf, fd, bufs,
+ "incorrect ELF machine type for object file: %s", obj);
/*
* We use this token as a relatively unique handle for this file on the
* system in order to disambiguate potential conflicts between files of
* the same name which contain identially named local symbols.
*/
- if ((objkey = ftok(obj, 0)) == (key_t)-1) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "failed to generate unique key for object file: %s", obj));
- }
+ if ((objkey = ftok(obj, 0)) == (key_t)-1)
+ return dt_link_error(dtp, elf, fd, bufs,
+ "failed to generate unique key for object file: %s", obj);
scn_rel = NULL;
while ((scn_rel = elf_nextscn(elf, scn_rel)) != NULL) {
@@ -1285,7 +1282,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
s = (char *)data_str->d_buf + rsym.st_name;
- if (strncmp(s, dt_prefix, sizeof (dt_prefix) - 1) != 0)
+ if (strncmp(s, dt_prefix, sizeof(dt_prefix) - 1) != 0)
continue;
if (dt_elf_symtab_lookup(data_sym, isym, rela.r_offset,
@@ -1310,8 +1307,8 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
*/
if (GELF_ST_TYPE(fsym.st_info) != STT_FUNC) {
dt_strtab_destroy(strtab);
- return (dt_link_error(dtp, elf, fd, bufs,
- "expected %s to be of type function", s));
+ return dt_link_error(dtp, elf, fd, bufs,
+ "expected %s to be of type function", s);
}
len = snprintf(NULL, 0, dt_symfmt, dt_symprefix,
@@ -1320,12 +1317,11 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
dt_strtab_destroy(strtab);
goto err;
}
- (void) snprintf(p, len, dt_symfmt, dt_symprefix,
- objkey, s);
+ snprintf(p, len, dt_symfmt, dt_symprefix, objkey, s);
if (dt_strtab_index(strtab, p) == -1) {
nsym++;
- (void) dt_strtab_insert(strtab, p);
+ dt_strtab_insert(strtab, p);
}
dt_free(dtp, p);
@@ -1351,7 +1347,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
dt_strtab_destroy(strtab);
- if ((pair = dt_alloc(dtp, sizeof (*pair))) == NULL)
+ if ((pair = dt_alloc(dtp, sizeof(*pair))) == NULL)
goto err;
if ((pair->dlp_str = dt_alloc(dtp, data_str->d_size +
@@ -1374,19 +1370,19 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
data_str->d_size);
data_str->d_buf = pair->dlp_str;
data_str->d_size += len;
- (void) elf_flagdata(data_str, ELF_C_SET, ELF_F_DIRTY);
+ elf_flagdata(data_str, ELF_C_SET, ELF_F_DIRTY);
shdr_str.sh_size += len;
- (void) gelf_update_shdr(scn_str, &shdr_str);
+ gelf_update_shdr(scn_str, &shdr_str);
memcpy(pair->dlp_sym, data_sym->d_buf,
data_sym->d_size);
data_sym->d_buf = pair->dlp_sym;
data_sym->d_size += nsym * symsize;
- (void) elf_flagdata(data_sym, ELF_C_SET, ELF_F_DIRTY);
+ elf_flagdata(data_sym, ELF_C_SET, ELF_F_DIRTY);
shdr_sym.sh_size += nsym * symsize;
- (void) gelf_update_shdr(scn_sym, &shdr_sym);
+ gelf_update_shdr(scn_sym, &shdr_sym);
nsym += isym;
} else {
@@ -1419,18 +1415,18 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
s = (char *)data_str->d_buf + rsym.st_name;
- if (strncmp(s, dt_prefix, sizeof (dt_prefix) - 1) != 0)
+ if (strncmp(s, dt_prefix, sizeof(dt_prefix) - 1) != 0)
continue;
- s += sizeof (dt_prefix) - 1;
+ s += sizeof(dt_prefix) - 1;
/*
* Check to see if this is an 'is-enabled' check as
* opposed to a normal probe.
*/
if (strncmp(s, dt_enabled,
- sizeof (dt_enabled) - 1) == 0) {
- s += sizeof (dt_enabled) - 1;
+ sizeof(dt_enabled) - 1) == 0) {
+ s += sizeof(dt_enabled) - 1;
eprobe = 1;
*eprobesp = 1;
dt_dprintf("is-enabled probe\n");
@@ -1443,7 +1439,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
goto err;
if ((p = strstr(s, "___")) == NULL ||
- p - s >= sizeof (pname))
+ p - s >= sizeof(pname))
goto err;
memcpy(pname, s, p - s);
@@ -1479,7 +1475,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
STT_FUNC);
dsym.st_other =
ELF64_ST_VISIBILITY(STV_ELIMINATE);
- (void) gelf_update_sym(data_sym, isym, &dsym);
+ gelf_update_sym(data_sym, isym, &dsym);
r = (char *)data_str->d_buf + istr;
istr += 1 + sprintf(r, dt_symfmt,
@@ -1495,15 +1491,13 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
s++;
}
- if ((pvp = dt_provider_lookup(dtp, pname)) == NULL) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "no such provider %s", pname));
- }
+ if ((pvp = dt_provider_lookup(dtp, pname)) == NULL)
+ return dt_link_error(dtp, elf, fd, bufs,
+ "no such provider %s", pname);
- if ((prp = dt_probe_lookup2(pvp, p)) == NULL) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "no such probe %s", p));
- }
+ if ((prp = dt_probe_lookup2(pvp, p)) == NULL)
+ return dt_link_error(dtp, elf, fd, bufs,
+ "no such probe %s", p);
assert(fsym.st_value <= rela.r_offset);
@@ -1513,13 +1507,12 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
goto err;
}
- if (dt_probe_define(pvp, prp, s, r, off, eprobe) != 0) {
- return (dt_link_error(dtp, elf, fd, bufs,
- "failed to allocate space for probe"));
- }
+ if (dt_probe_define(pvp, prp, s, r, off, eprobe) != 0)
+ return dt_link_error(dtp, elf, fd, bufs,
+ "failed to allocate space for probe");
mod = 1;
- (void) elf_flagdata(data_tgt, ELF_C_SET, ELF_F_DIRTY);
+ elf_flagdata(data_tgt, ELF_C_SET, ELF_F_DIRTY);
/*
* This symbol may already have been marked to
@@ -1530,7 +1523,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
*/
if (rsym.st_shndx != SHN_SUNW_IGNORE) {
rsym.st_shndx = SHN_SUNW_IGNORE;
- (void) gelf_update_sym(data_sym, ndx, &rsym);
+ gelf_update_sym(data_sym, ndx, &rsym);
}
/*
@@ -1542,13 +1535,13 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
*/
if (shdr_rel.sh_type == SHT_RELA) {
rela.r_info = GELF_R_INFO(ndx, 0);
- (void) gelf_update_rela(data_rel, i, &rela);
+ gelf_update_rela(data_rel, i, &rela);
} else {
GElf_Rel rel;
rel.r_offset = rela.r_offset;
rel.r_info = GELF_R_INFO(ndx, 0);
- (void) gelf_update_rel(data_rel, i, &rel);
+ gelf_update_rel(data_rel, i, &rel);
}
}
}
@@ -1556,8 +1549,8 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
if (mod && elf_update(elf, ELF_C_WRITE) == -1)
goto err;
- (void) elf_end(elf);
- (void) close(fd);
+ elf_end(elf);
+ close(fd);
while ((pair = bufs) != NULL) {
bufs = pair->dlp_next;
@@ -1566,11 +1559,11 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
dt_free(dtp, pair);
}
- return (0);
+ return 0;
err:
- return (dt_link_error(dtp, elf, fd, bufs,
- "an error was encountered while processing %s", obj));
+ return dt_link_error(dtp, elf, fd, bufs,
+ "an error was encountered while processing %s", obj);
}
int
@@ -1603,36 +1596,31 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
for (i = 0; i < objc; i++)
cur += snprintf(cmd + cur, len - cur, " %s", objv[i]);
- if ((status = system(cmd)) == -1) {
- return (dt_link_error(dtp, NULL, -1, NULL,
+ if ((status = system(cmd)) == -1)
+ return dt_link_error(dtp, NULL, -1, NULL,
"failed to run %s: %s", dtp->dt_ld_path,
- strerror(errno)));
- }
+ strerror(errno));
- if (WIFSIGNALED(status)) {
- return (dt_link_error(dtp, NULL, -1, NULL,
+ if (WIFSIGNALED(status))
+ return dt_link_error(dtp, NULL, -1, NULL,
"failed to link %s: %s failed due to signal %d",
- file, dtp->dt_ld_path, WTERMSIG(status)));
- }
+ file, dtp->dt_ld_path, WTERMSIG(status));
- if (WEXITSTATUS(status) != 0) {
- return (dt_link_error(dtp, NULL, -1, NULL,
+ if (WEXITSTATUS(status) != 0)
+ return dt_link_error(dtp, NULL, -1, NULL,
"failed to link %s: %s exited with status %d\n",
- file, dtp->dt_ld_path, WEXITSTATUS(status)));
- }
+ file, dtp->dt_ld_path, WEXITSTATUS(status));
- for (i = 0; i < objc; i++) {
+ for (i = 0; i < objc; i++)
if (strcmp(objv[i], file) != 0)
- (void) unlink(objv[i]);
- }
+ unlink(objv[i]);
- return (0);
+ return 0;
}
- for (i = 0; i < objc; i++) {
+ for (i = 0; i < objc; i++)
if (process_obj(dtp, objv[i], &eprobes) != 0)
- return (-1); /* errno is set for us */
- }
+ return -1; /* errno is set for us */
/*
* If there are is-enabled probes then we need to force use of DOF
@@ -1642,17 +1630,16 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
pgp->dp_dofversion = DOF_VERSION_2;
if ((dof = dtrace_dof_create(dtp, pgp, dflags)) == NULL)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
/*
* Create a temporary file and then unlink it if we're going to
* link later. We can still refer to it in child processes as
* /dev/fd/<fd>.
*/
- if ((fd = open64(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1) {
- return (dt_link_error(dtp, NULL, -1, NULL,
- "failed to open %s: %s", file, strerror(errno)));
- }
+ if ((fd = open64(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1)
+ return dt_link_error(dtp, NULL, -1, NULL,
+ "failed to open %s: %s", file, strerror(errno));
/*
* If -xlinktype=DOF has been selected, just write out the DOF.
@@ -1666,34 +1653,32 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
if (close(fd) != 0 && ret == 0)
ret = errno;
- if (ret != 0) {
- return (dt_link_error(dtp, NULL, -1, NULL,
- "failed to write %s: %s", file, strerror(ret)));
- }
+ if (ret != 0)
+ return dt_link_error(dtp, NULL, -1, NULL,
+ "failed to write %s: %s", file, strerror(ret));
- return (0);
+ return 0;
case DT_LTYP_ELF:
break; /* fall through to the rest of dtrace_program_link() */
default:
- return (dt_link_error(dtp, NULL, -1, NULL,
- "invalid link type %u\n", dtp->dt_linktype));
+ return dt_link_error(dtp, NULL, -1, NULL,
+ "invalid link type %u\n", dtp->dt_linktype);
}
if (!dtp->dt_lazyload)
- (void) unlink(file);
+ unlink(file);
if (dtp->dt_oflags & DTRACE_O_ILP32)
status = dump_elf32(dtp, dof, fd);
else
status = dump_elf64(dtp, dof, fd);
- if (status != 0 || lseek(fd, 0, SEEK_SET) != 0) {
- return (dt_link_error(dtp, NULL, -1, NULL,
- "failed to write %s: %s", file, strerror(errno)));
- }
+ if (status != 0 || lseek(fd, 0, SEEK_SET) != 0)
+ return dt_link_error(dtp, NULL, -1, NULL,
+ "failed to write %s: %s", file, strerror(errno));
if (!dtp->dt_lazyload) {
const char *fmt = "%s%s -o %s -r /dev/fd/%d";
@@ -1710,9 +1695,8 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
#elif defined(__i386) || defined(__amd64)
emu = " -m elf_i386";
#endif
- } else {
+ } else
emu = "";
- }
len = snprintf(NULL, 0, fmt, dtp->dt_ld_path, emu, file, fd) +
1;
@@ -1727,7 +1711,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
goto done;
}
- (void) close(fd);
+ close(fd);
if (WIFSIGNALED(status)) {
ret = dt_link_error(dtp, NULL, -1, NULL,
@@ -1742,11 +1726,10 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
file, dtp->dt_ld_path, WEXITSTATUS(status));
goto done;
}
- } else {
- (void) close(fd); /* release temporary file */
- }
+ } else
+ close(fd); /* release temporary file */
done:
dtrace_dof_destroy(dtp, dof);
- return (ret);
+ return ret;
}
diff --git a/libdtrace/dt_module.c b/libdtrace/dt_module.c
index 8af3695d..80c5ac48 100644
--- a/libdtrace/dt_module.c
+++ b/libdtrace/dt_module.c
@@ -71,16 +71,16 @@ dt_module_symgelf32(const Elf32_Sym *src, GElf_Sym *dst)
dst->st_size = src->st_size;
}
- return (dst);
+ return dst;
}
static GElf_Sym *
dt_module_symgelf64(const Elf64_Sym *src, GElf_Sym *dst)
{
if (dst != NULL)
- memcpy(dst, src, sizeof (GElf_Sym));
+ memcpy(dst, src, sizeof(GElf_Sym));
- return (dst);
+ return dst;
}
#ifdef BITS
@@ -100,16 +100,15 @@ dt_module_create(dtrace_hdl_t *dtp, const char *name)
uint_t h = dt_strtab_hash(name, NULL) % dtp->dt_modbuckets;
dt_module_t *dmp;
- for (dmp = dtp->dt_mods[h]; dmp != NULL; dmp = dmp->dm_next) {
+ for (dmp = dtp->dt_mods[h]; dmp != NULL; dmp = dmp->dm_next)
if (strcmp(dmp->dm_name, name) == 0)
- return (dmp);
- }
+ return dmp;
- if ((dmp = malloc(sizeof (dt_module_t))) == NULL)
- return (NULL); /* caller must handle allocation failure */
+ if ((dmp = malloc(sizeof(dt_module_t))) == NULL)
+ return NULL; /* caller must handle allocation failure */
- memset(dmp, 0, sizeof (dt_module_t));
- strlcpy(dmp->dm_name, name, sizeof (dmp->dm_name));
+ memset(dmp, 0, sizeof(dt_module_t));
+ strlcpy(dmp->dm_name, name, sizeof(dmp->dm_name));
dt_list_append(&dtp->dt_modlist, dmp);
dmp->dm_next = dtp->dt_mods[h];
dtp->dt_mods[h] = dmp;
@@ -120,7 +119,7 @@ dt_module_create(dtrace_hdl_t *dtp, const char *name)
else
dmp->dm_ops = &dt_modops_32;
- return (dmp);
+ return dmp;
}
dt_module_t *
@@ -135,19 +134,18 @@ dt_module_lookup_by_name(dtrace_hdl_t *dtp, const char *name)
name = "vmlinux";
}
- for (dmp = dtp->dt_mods[h]; dmp != NULL; dmp = dmp->dm_next) {
+ for (dmp = dtp->dt_mods[h]; dmp != NULL; dmp = dmp->dm_next)
if (strcmp(dmp->dm_name, name) == 0)
- return (dmp);
- }
+ return dmp;
- return (NULL);
+ return NULL;
}
/*ARGSUSED*/
dt_module_t *
dt_module_lookup_by_ctf(dtrace_hdl_t *dtp, ctf_file_t *ctfp)
{
- return (ctfp ? ctf_getspecific(ctfp) : NULL);
+ return ctfp ? ctf_getspecific(ctfp) : NULL;
}
static int
@@ -167,7 +165,7 @@ dt_module_init_elf(dtrace_hdl_t *dtp, dt_module_t *dmp)
if (!dmp->dm_file) {
dt_dprintf("failed to open ELF file for module %s: "
"no file name known\n", dmp->dm_name);
- return (dt_set_errno(dtp, EDT_NOTLOADED));
+ return dt_set_errno(dtp, EDT_NOTLOADED);
}
if ((fd = open(dmp->dm_file, O_RDONLY)) == -1) {
@@ -232,7 +230,7 @@ dt_module_load_sect(dtrace_hdl_t *dtp, dt_module_t *dmp, ctf_sect_t *ctsp)
Elf_Scn *sp;
if (elf_getshdrstrndx(dmp->dm_elf, &shstrs) == -1)
- return (dt_set_errno(dtp, EDT_NOTLOADED));
+ return dt_set_errno(dtp, EDT_NOTLOADED);
for (sp = NULL; (sp = elf_nextscn(dmp->dm_elf, sp)) != NULL; ) {
if (gelf_getshdr(sp, &sh) == NULL || sh.sh_type == SHT_NULL ||
@@ -256,7 +254,7 @@ dt_module_load_sect(dtrace_hdl_t *dtp, dt_module_t *dmp, ctf_sect_t *ctsp)
* to NULL and cts_size set to zero for our caller.
*/
if (sp == NULL || (dp = elf_getdata(sp, NULL)) == NULL)
- return (0);
+ return 0;
ctsp->cts_data = dp->d_buf;
ctsp->cts_size = dp->d_size;
@@ -264,7 +262,7 @@ dt_module_load_sect(dtrace_hdl_t *dtp, dt_module_t *dmp, ctf_sect_t *ctsp)
dt_dprintf("loaded %s [%s] (%lu bytes)\n",
dmp->dm_name, ctsp->cts_name, (ulong_t)ctsp->cts_size);
- return (0);
+ return 0;
}
/*
@@ -361,7 +359,7 @@ static int
dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
{
if (dmp->dm_flags & DT_DM_LOADED)
- return (0); /* module is already loaded */
+ return 0; /* module is already loaded */
/*
* First find out where the module is, and preliminarily load its CTF.
@@ -426,7 +424,7 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
if (dt_module_load_sect(dtp, dmp, &dmp->dm_ctdata) == -1) {
dt_module_unload(dtp, dmp);
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
}
/*
@@ -445,7 +443,7 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
if ((dmp->dm_flags & DT_DM_KERNEL) &&
(!(dmp->dm_flags & DT_DM_KERN_UNLOADED))) {
dmp->dm_flags |= DT_DM_LOADED;
- return (0);
+ return 0;
}
dmp->dm_symtab.cts_name = ".symtab";
@@ -457,7 +455,7 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
dmp->dm_symtab.cts_data = NULL;
dmp->dm_symtab.cts_size = 0;
dmp->dm_symtab.cts_entsize = dmp->dm_ops == &dt_modops_64 ?
- sizeof (Elf64_Sym) : sizeof (Elf32_Sym);
+ sizeof(Elf64_Sym) : sizeof(Elf32_Sym);
dmp->dm_strtab.cts_name = ".strtab";
#ifndef HAVE_LIBCTF
@@ -475,7 +473,7 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
if (dt_module_load_sect(dtp, dmp, &dmp->dm_symtab) == -1 ||
dt_module_load_sect(dtp, dmp, &dmp->dm_strtab) == -1) {
dt_module_unload(dtp, dmp);
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
}
/*
@@ -490,14 +488,14 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
dmp->dm_nsymbuckets = _dtrace_strbuckets;
dmp->dm_symfree = 1; /* first free element is index 1 */
- dmp->dm_symbuckets = malloc(sizeof (uint_t) * dmp->dm_nsymbuckets);
- dmp->dm_symchains = malloc(sizeof (dt_modsym_t) * dmp->dm_nsymelems + 1);
+ dmp->dm_symbuckets = malloc(sizeof(uint_t) * dmp->dm_nsymbuckets);
+ dmp->dm_symchains = malloc(sizeof(dt_modsym_t) * dmp->dm_nsymelems + 1);
if (dmp->dm_symbuckets == NULL || dmp->dm_symchains == NULL)
goto oom;
- memset(dmp->dm_symbuckets, 0, sizeof (uint_t) * dmp->dm_nsymbuckets);
- memset(dmp->dm_symchains, 0, sizeof (dt_modsym_t) * dmp->dm_nsymelems
+ memset(dmp->dm_symbuckets, 0, sizeof(uint_t) * dmp->dm_nsymbuckets);
+ memset(dmp->dm_symchains, 0, sizeof(dt_modsym_t) * dmp->dm_nsymelems
+ 1);
/*
@@ -510,7 +508,7 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
dt_dprintf("hashed %s [%s] (%u symbols)\n",
dmp->dm_name, dmp->dm_symtab.cts_name, dmp->dm_symfree - 1);
- if ((dmp->dm_asmap = malloc(sizeof (void *) * dmp->dm_asrsv)) == NULL)
+ if ((dmp->dm_asmap = malloc(sizeof(void *) * dmp->dm_asrsv)) == NULL)
goto oom;
dmp->dm_ops->do_symsort(dmp);
@@ -519,10 +517,10 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
dmp->dm_name, dmp->dm_symtab.cts_name, dmp->dm_aslen);
dmp->dm_flags |= DT_DM_LOADED;
- return (0);
+ return 0;
oom:
dt_module_unload(dtp, dmp);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
/*
@@ -538,10 +536,10 @@ dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
if (!(dmp->dm_flags & DT_DM_LOADED))
if (dt_module_load(dtp, dmp) != 0)
- return (NULL);
+ return NULL;
if (dmp->dm_ctfp != NULL)
- return (dmp->dm_ctfp);
+ return dmp->dm_ctfp;
assert(!(dmp->dm_flags & DT_DM_CTF_ARCHIVED));
@@ -558,13 +556,13 @@ dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
*/
if (dtp->dt_conf.dtc_ctfmodel != model) {
dt_set_errno(dtp, EDT_DATAMODEL);
- return (NULL);
+ return NULL;
}
if ((dmp->dm_ctdata.cts_size == 0) ||
(dmp->dm_ctdata.cts_size == 1)) {
dt_set_errno(dtp, EDT_NOCTF);
- return (NULL);
+ return NULL;
}
if (dmp->dm_flags & DT_DM_KERNEL)
@@ -578,7 +576,7 @@ dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
dt_dprintf("ctf loading for module %s failed: error: %s\n",
dmp->dm_name, ctf_errmsg(dtp->dt_ctferr));
dt_set_errno(dtp, EDT_CTF);
- return (NULL);
+ return NULL;
}
ctf_setmodel(dmp->dm_ctfp, model);
@@ -602,12 +600,12 @@ dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
dt_dprintf("loaded CTF container for %s (%p)\n",
dmp->dm_name, (void *)dmp->dm_ctfp);
- return (dmp->dm_ctfp);
+ return dmp->dm_ctfp;
err:
ctf_close(dmp->dm_ctfp);
dmp->dm_ctfp = NULL;
- return (NULL);
+ return NULL;
}
/*ARGSUSED*/
@@ -623,9 +621,9 @@ dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp)
free(dmp->dm_ctdata_data);
dmp->dm_ctdata_data = NULL;
- memset(&dmp->dm_ctdata, 0, sizeof (ctf_sect_t));
- memset(&dmp->dm_symtab, 0, sizeof (ctf_sect_t));
- memset(&dmp->dm_strtab, 0, sizeof (ctf_sect_t));
+ memset(&dmp->dm_ctdata, 0, sizeof(ctf_sect_t));
+ memset(&dmp->dm_symtab, 0, sizeof(ctf_sect_t));
+ memset(&dmp->dm_strtab, 0, sizeof(ctf_sect_t));
free(dmp->dm_symbuckets);
dmp->dm_symbuckets = NULL;
@@ -712,17 +710,17 @@ dt_module_extern(dtrace_hdl_t *dtp, dt_module_t *dmp,
if (dmp->dm_extern == NULL && (dmp->dm_extern = dt_idhash_create(
"extern", NULL, dmp->dm_nsymelems, UINT_MAX)) == NULL) {
dt_set_errno(dtp, EDT_NOMEM);
- return (NULL);
+ return NULL;
}
if (dt_idhash_nextid(dmp->dm_extern, &id) == -1) {
dt_set_errno(dtp, EDT_SYMOFLOW);
- return (NULL);
+ return NULL;
}
- if ((sip = malloc(sizeof (dtrace_syminfo_t))) == NULL) {
+ if ((sip = malloc(sizeof(dtrace_syminfo_t))) == NULL) {
dt_set_errno(dtp, EDT_NOMEM);
- return (NULL);
+ return NULL;
}
idp = dt_idhash_insert(dmp->dm_extern, name, DT_IDENT_SYMBOL, 0, id,
@@ -731,7 +729,7 @@ dt_module_extern(dtrace_hdl_t *dtp, dt_module_t *dmp,
if (idp == NULL) {
dt_set_errno(dtp, EDT_NOMEM);
free(sip);
- return (NULL);
+ return NULL;
}
sip->object = dmp->dm_name;
@@ -742,16 +740,16 @@ dt_module_extern(dtrace_hdl_t *dtp, dt_module_t *dmp,
idp->di_ctfp = tip->dtt_ctfp;
idp->di_type = tip->dtt_type;
- return (idp);
+ return idp;
}
const char *
dt_module_modelname(dt_module_t *dmp)
{
if ((dmp->dm_ops == &dt_modops_64) || (dmp->dm_ops == NULL))
- return ("64-bit");
+ return "64-bit";
else
- return ("32-bit");
+ return "32-bit";
}
/*
@@ -792,7 +790,7 @@ dtrace_addr_range_grow(dt_module_t *dmp, int is_text)
size = &dmp->dm_data_addrs_size;
}
- new_range = realloc(*range, sizeof (struct dtrace_addr_range) *
+ new_range = realloc(*range, sizeof(struct dtrace_addr_range) *
(*size+1));
if (new_range == NULL)
return NULL;
@@ -1065,7 +1063,7 @@ dt_kern_module_find_ctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
dmp->dm_flags |= DT_DM_BUILTIN & DT_DM_SHARED;
else
strlcpy(dmp->dm_file, dkpp->dkp_path,
- sizeof (dmp->dm_file));
+ sizeof(dmp->dm_file));
}
}
@@ -1433,7 +1431,7 @@ dt_module_from_object(dtrace_hdl_t *dtp, const char *object)
if (dmp == NULL)
dt_set_errno(dtp, err);
- return (dmp);
+ return dmp;
}
/*
@@ -1463,10 +1461,10 @@ dtrace_lookup_by_name(dtrace_hdl_t *dtp, const char *object, const char *name,
object != DTRACE_OBJ_KMODS &&
object != DTRACE_OBJ_UMODS) {
if ((dmp = dt_module_from_object(dtp, object)) == NULL)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (dt_module_load(dtp, dmp) == -1)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
n = 1;
} else {
@@ -1508,7 +1506,7 @@ dtrace_lookup_by_name(dtrace_hdl_t *dtp, const char *object, const char *name,
}
dt_symbol_to_elfsym(dtp, dt_symp, symp);
- return (0);
+ return 0;
} else {
uint_t id;
@@ -1519,7 +1517,7 @@ dtrace_lookup_by_name(dtrace_hdl_t *dtp, const char *object, const char *name,
dmp->dm_strtab.cts_data + symp->st_name;
sip->id = id;
}
- return (0);
+ return 0;
}
}
@@ -1542,11 +1540,11 @@ dtrace_lookup_by_name(dtrace_hdl_t *dtp, const char *object, const char *name,
sip->id = idp->di_id;
}
- return (0);
+ return 0;
}
}
- return (dt_set_errno(dtp, EDT_NOSYM));
+ return dt_set_errno(dtp, EDT_NOSYM);
}
/*
@@ -1567,20 +1565,20 @@ dtrace_lookup_by_addr(dtrace_hdl_t *dtp, GElf_Addr addr,
const dtrace_vector_t *v = dtp->dt_vector;
if (v != NULL)
- return (v->dtv_lookup_by_addr(dtp->dt_varg, addr, symp, sip));
+ return v->dtv_lookup_by_addr(dtp->dt_varg, addr, symp, sip);
for (dmp = dt_list_next(&dtp->dt_modlist); dmp != NULL;
dmp = dt_list_next(dmp)) {
void *i;
i = bsearch(&addr, dmp->dm_text_addrs, dmp->dm_text_addrs_size,
- sizeof (struct dtrace_addr_range), dtrace_addr_range_cmp);
+ sizeof(struct dtrace_addr_range), dtrace_addr_range_cmp);
if (i)
break;
i = bsearch(&addr, dmp->dm_data_addrs, dmp->dm_data_addrs_size,
- sizeof (struct dtrace_addr_range), dtrace_addr_range_cmp);
+ sizeof(struct dtrace_addr_range), dtrace_addr_range_cmp);
if (i)
break;
@@ -1588,11 +1586,11 @@ dtrace_lookup_by_addr(dtrace_hdl_t *dtp, GElf_Addr addr,
if (dmp == NULL) {
dt_dprintf("No module corresponds to %lx\n", addr);
- return (dt_set_errno(dtp, EDT_NOSYMADDR));
+ return dt_set_errno(dtp, EDT_NOSYMADDR);
}
if (dt_module_load(dtp, dmp) == -1)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (dmp->dm_flags & DT_DM_KERNEL) {
dt_symbol_t *dt_symp;
@@ -1602,12 +1600,12 @@ dtrace_lookup_by_addr(dtrace_hdl_t *dtp, GElf_Addr addr,
* anything up by address in this case is hopeless.
*/
if (!dmp->dm_kernsyms)
- return (dt_set_errno(dtp, EDT_NOSYMADDR));
+ return dt_set_errno(dtp, EDT_NOSYMADDR);
dt_symp = dt_symbol_by_addr(dmp->dm_kernsyms, addr);
if (!dt_symp)
- return (dt_set_errno(dtp, EDT_NOSYMADDR));
+ return dt_set_errno(dtp, EDT_NOSYMADDR);
if (sip != NULL) {
sip->object = dmp->dm_name;
@@ -1618,11 +1616,11 @@ dtrace_lookup_by_addr(dtrace_hdl_t *dtp, GElf_Addr addr,
if (symp != NULL)
dt_symbol_to_elfsym(dtp, dt_symp, symp);
- return (0);
+ return 0;
} else {
if (symp != NULL) {
if (dmp->dm_ops->do_symaddr(dmp, addr, symp, &id) == NULL)
- return (dt_set_errno(dtp, EDT_NOSYMADDR));
+ return dt_set_errno(dtp, EDT_NOSYMADDR);
}
if (sip != NULL) {
@@ -1639,7 +1637,7 @@ dtrace_lookup_by_addr(dtrace_hdl_t *dtp, GElf_Addr addr,
}
}
- return (0);
+ return 0;
}
int
@@ -1660,10 +1658,10 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
object != DTRACE_OBJ_KMODS &&
object != DTRACE_OBJ_UMODS) {
if ((dmp = dt_module_from_object(dtp, object)) == NULL)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (dt_module_load(dtp, dmp) == -1)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
n = 1;
justone = 1;
@@ -1692,7 +1690,7 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
*/
if (dt_module_getctf(dtp, dmp) == NULL) {
if (justone)
- return (-1);
+ return -1;
continue;
}
@@ -1709,16 +1707,16 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
if (ctf_type_kind(dmp->dm_ctfp, ctf_type_resolve(
dmp->dm_ctfp, id)) != CTF_K_FORWARD)
- return (0);
+ return 0;
found++;
}
}
if (found == 0)
- return (dt_set_errno(dtp, EDT_NOTYPE));
+ return dt_set_errno(dtp, EDT_NOTYPE);
- return (0);
+ return 0;
}
int
@@ -1733,15 +1731,14 @@ dtrace_symbol_type(dtrace_hdl_t *dtp, const GElf_Sym *symp,
tip->dtt_type = CTF_ERR;
if ((dmp = dt_module_lookup_by_name(dtp, sip->object)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMOD));
+ return dt_set_errno(dtp, EDT_NOMOD);
- if (dmp->dm_flags & DT_DM_KERNEL)
- {
+ if (dmp->dm_flags & DT_DM_KERNEL) {
if (dmp->dm_flags & DT_DM_KERN_UNLOADED)
- return (dt_set_errno(dtp, EDT_NOSYMADDR));
+ return dt_set_errno(dtp, EDT_NOSYMADDR);
if (dt_module_getctf(dtp, dmp) == NULL)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
tip->dtt_ctfp = dmp->dm_ctfp;
tip->dtt_type = ctf_lookup_variable(dmp->dm_ctfp, sip->name);
@@ -1752,7 +1749,7 @@ dtrace_symbol_type(dtrace_hdl_t *dtp, const GElf_Sym *symp,
if (ctf_errno(tip->dtt_ctfp) == ECTF_NOTYPEDAT)
undefined = 1;
else
- return (dt_set_errno(dtp, EDT_CTF));
+ return dt_set_errno(dtp, EDT_CTF);
}
} else if (symp->st_shndx == SHN_UNDEF) {
@@ -1760,14 +1757,14 @@ dtrace_symbol_type(dtrace_hdl_t *dtp, const GElf_Sym *symp,
} else if (GELF_ST_TYPE(symp->st_info) != STT_FUNC) {
if (dt_module_getctf(dtp, dmp) == NULL)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
tip->dtt_ctfp = dmp->dm_ctfp;
tip->dtt_type = ctf_lookup_by_symbol(dmp->dm_ctfp, sip->id);
if (tip->dtt_type == CTF_ERR) {
dtp->dt_ctferr = ctf_errno(tip->dtt_ctfp);
- return (dt_set_errno(dtp, EDT_CTF));
+ return dt_set_errno(dtp, EDT_CTF);
}
} else {
@@ -1780,14 +1777,14 @@ dtrace_symbol_type(dtrace_hdl_t *dtp, const GElf_Sym *symp,
dt_idhash_lookup(dmp->dm_extern, sip->name);
if (idp == NULL)
- return (dt_set_errno(dtp, EDT_NOSYM));
+ return dt_set_errno(dtp, EDT_NOSYM);
tip->dtt_ctfp = idp->di_ctfp;
tip->dtt_type = idp->di_type;
}
tip->dtt_object = dmp->dm_name;
- return (0);
+ return 0;
}
static dtrace_objinfo_t *
@@ -1805,7 +1802,7 @@ dt_module_info(const dt_module_t *dmp, dtrace_objinfo_t *dto)
dto->dto_data_addrs = dmp->dm_data_addrs;
dto->dto_data_addrs_size = dmp->dm_data_addrs_size;
- return (dto);
+ return dto;
}
int
@@ -1817,10 +1814,10 @@ dtrace_object_iter(dtrace_hdl_t *dtp, dtrace_obj_f *func, void *data)
for (; dmp != NULL; dmp = dt_list_next(dmp)) {
if ((rv = (*func)(dtp, dt_module_info(dmp, &dto), data)) != 0)
- return (rv);
+ return rv;
}
- return (0);
+ return 0;
}
int
@@ -1830,14 +1827,14 @@ dtrace_object_info(dtrace_hdl_t *dtp, const char *object, dtrace_objinfo_t *dto)
if (object == DTRACE_OBJ_EVERY || object == DTRACE_OBJ_KMODS ||
object == DTRACE_OBJ_UMODS || dto == NULL)
- return (dt_set_errno(dtp, EINVAL));
+ return dt_set_errno(dtp, EINVAL);
if ((dmp = dt_module_from_object(dtp, object)) == NULL)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (dt_module_load(dtp, dmp) == -1)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
dt_module_info(dmp, dto);
- return (0);
+ return 0;
}
diff --git a/libdtrace/dt_open.c b/libdtrace/dt_open.c
index c26ddf1e..8d1870c7 100644
--- a/libdtrace/dt_open.c
+++ b/libdtrace/dt_open.c
@@ -630,7 +630,7 @@ set_open_errno(dtrace_hdl_t *dtp, int *errp, int err)
dtrace_close(dtp);
if (errp != NULL)
*errp = err;
- return (NULL);
+ return NULL;
}
static dtrace_hdl_t *
@@ -656,10 +656,10 @@ dt_vopen(int version, int flags, int *errp,
char isadef[32], utsdef[4 + sizeof(dtp->dt_uts.sysname)];
if (version <= 0)
- return (set_open_errno(dtp, errp, EINVAL));
+ return set_open_errno(dtp, errp, EINVAL);
if (version > DTRACE_VERSION)
- return (set_open_errno(dtp, errp, EDT_VERSION));
+ return set_open_errno(dtp, errp, EDT_VERSION);
if (version < DTRACE_VERSION) {
/*
@@ -673,20 +673,20 @@ dt_vopen(int version, int flags, int *errp,
* if the specified version number is less than the version
* number at the time of interface commitment.
*/
- return (set_open_errno(dtp, errp, EDT_OVERSION));
+ return set_open_errno(dtp, errp, EDT_OVERSION);
}
if (flags & ~DTRACE_O_MASK)
- return (set_open_errno(dtp, errp, EINVAL));
+ return set_open_errno(dtp, errp, EINVAL);
if ((flags & DTRACE_O_LP64) && (flags & DTRACE_O_ILP32))
- return (set_open_errno(dtp, errp, EINVAL));
+ return set_open_errno(dtp, errp, EINVAL);
if (vector == NULL && arg != NULL)
- return (set_open_errno(dtp, errp, EINVAL));
+ return set_open_errno(dtp, errp, EINVAL);
if (elf_version(EV_CURRENT) == EV_NONE)
- return (set_open_errno(dtp, errp, EDT_ELFVERSION));
+ return set_open_errno(dtp, errp, EDT_ELFVERSION);
/*
* Before we get going, crank our limit on file descriptors up to the
@@ -698,7 +698,7 @@ dt_vopen(int version, int flags, int *errp,
*/
if (getrlimit(RLIMIT_NOFILE, &rl) == 0) {
rl.rlim_cur = rl.rlim_max;
- (void) setrlimit(RLIMIT_NOFILE, &rl);
+ setrlimit(RLIMIT_NOFILE, &rl);
}
/*
@@ -714,10 +714,10 @@ dt_vopen(int version, int flags, int *errp,
}
}
- if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ if ((dtp = malloc(sizeof(dtrace_hdl_t))) == NULL)
+ return set_open_errno(dtp, errp, EDT_NOMEM);
- memset(dtp, 0, sizeof (dtrace_hdl_t));
+ memset(dtp, 0, sizeof(dtrace_hdl_t));
dtp->dt_oflags = flags;
dtp->dt_prcmode = DT_PROC_STOP_POSTINIT;
dtp->dt_linkmode = DT_LINK_KERNEL;
@@ -731,17 +731,17 @@ dt_vopen(int version, int flags, int *errp,
dtp->dt_stdout_fd = -1;
dtp->dt_poll_fd = -1;
dtp->dt_modbuckets = _dtrace_strbuckets;
- dtp->dt_mods = calloc(dtp->dt_modbuckets, sizeof (dt_module_t *));
+ dtp->dt_mods = calloc(dtp->dt_modbuckets, sizeof(dt_module_t *));
dtp->dt_kernpathbuckets = _dtrace_strbuckets;
- dtp->dt_kernpaths = calloc(dtp->dt_kernpathbuckets, sizeof (dt_kern_path_t *));
+ dtp->dt_kernpaths = calloc(dtp->dt_kernpathbuckets, sizeof(dt_kern_path_t *));
dtp->dt_provbuckets = _dtrace_strbuckets;
- dtp->dt_provs = calloc(dtp->dt_provbuckets, sizeof (dt_provider_t *));
+ dtp->dt_provs = calloc(dtp->dt_provbuckets, sizeof(dt_provider_t *));
dt_proc_hash_create(dtp);
dtp->dt_nextepid = 1;
dtp->dt_maxprobe = 0;
dtp->dt_vmax = DT_VERS_LATEST;
dtp->dt_cpp_path = strdup(_dtrace_defcpp);
- dtp->dt_cpp_argv = malloc(sizeof (char *));
+ dtp->dt_cpp_argv = malloc(sizeof(char *));
dtp->dt_cpp_argc = 1;
dtp->dt_cpp_args = 1;
dtp->dt_ld_path = strdup(_dtrace_defld);
@@ -765,13 +765,13 @@ dt_vopen(int version, int flags, int *errp,
/* Obtain current kernel version. */
if (dt_str2kver(dtp->dt_uts.release, &dtp->dt_kernver) < 0)
- return (set_open_errno(dtp, errp, EDT_VERSINVAL));
+ return set_open_errno(dtp, errp, EDT_VERSINVAL);
if (dtp->dt_mods == NULL || dtp->dt_kernpaths == NULL ||
dtp->dt_provs == NULL || dtp->dt_procs == NULL ||
dtp->dt_ld_path == NULL || dtp->dt_cpp_path == NULL ||
dtp->dt_cpp_argv == NULL || dtp->dt_sysslice == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
for (i = 0; i < DTRACEOPT_MAX; i++)
dtp->dt_options[i] = DTRACEOPT_UNSET;
@@ -787,7 +787,7 @@ dt_vopen(int version, int flags, int *errp,
dtp->dt_cpp_argv[0] = (char *)strbasename(dtp->dt_cpp_path);
snprintf(isadef, sizeof(isadef), "-D__SUNW_D_%u",
- (uint_t)(sizeof (void *) * NBBY));
+ (uint_t)(sizeof(void *) * NBBY));
snprintf(utsdef, sizeof(utsdef), "-D__%s", dtp->dt_uts.sysname);
@@ -798,9 +798,9 @@ dt_vopen(int version, int flags, int *errp,
dt_cpp_add_arg(dtp, "-U__GNUC__") == NULL ||
dt_cpp_add_arg(dtp, isadef) == NULL ||
dt_cpp_add_arg(dtp, utsdef) == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
- memcpy(&dtp->dt_conf, &_dtrace_conf, sizeof (_dtrace_conf));
+ memcpy(&dtp->dt_conf, &_dtrace_conf, sizeof(_dtrace_conf));
dt_conf_init(dtp);
dt_dprintf("detected %u CPUs online (%u possible, highest cpuid %u)\n",
dtp->dt_conf.num_online_cpus, dtp->dt_conf.num_possible_cpus,
@@ -817,11 +817,11 @@ dt_vopen(int version, int flags, int *errp,
* and __sparcv9 is defined if we are doing a 64-bit compile.
*/
if (dt_cpp_add_arg(dtp, "-D__sparc") == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
if (dtp->dt_conf.dtc_ctfmodel == CTF_MODEL_LP64 &&
dt_cpp_add_arg(dtp, "-D__sparcv9") == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
#endif
#ifdef __x86
@@ -832,20 +832,20 @@ dt_vopen(int version, int flags, int *errp,
*/
if (dtp->dt_conf.dtc_ctfmodel == CTF_MODEL_LP64) {
if (dt_cpp_add_arg(dtp, "-D__amd64") == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
} else {
if (dt_cpp_add_arg(dtp, "-D__i386") == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
}
#endif
if (dtp->dt_conf.dtc_difversion < DIF_VERSION)
- return (set_open_errno(dtp, errp, EDT_DIFVERS));
+ return set_open_errno(dtp, errp, EDT_DIFVERS);
if (dtp->dt_conf.dtc_ctfmodel == CTF_MODEL_ILP32)
- memcpy(dtp->dt_ints, _dtrace_ints_32, sizeof (_dtrace_ints_32));
+ memcpy(dtp->dt_ints, _dtrace_ints_32, sizeof(_dtrace_ints_32));
else
- memcpy(dtp->dt_ints, _dtrace_ints_64, sizeof (_dtrace_ints_64));
+ memcpy(dtp->dt_ints, _dtrace_ints_64, sizeof(_dtrace_ints_64));
dtp->dt_macros = dt_idhash_create("macro", NULL, 0, UINT_MAX);
dtp->dt_aggs = dt_idhash_create("aggregation", NULL,
@@ -864,7 +864,7 @@ dt_vopen(int version, int flags, int *errp,
if (dtp->dt_macros == NULL || dtp->dt_aggs == NULL ||
dtp->dt_globals == NULL || dtp->dt_tls == NULL ||
dtp->dt_ccstab == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
/*
* Populate the dt_macros identifier hash table by hand: we can't use
@@ -876,7 +876,7 @@ dt_vopen(int version, int flags, int *errp,
idp->di_kind, idp->di_flags, idp->di_id, idp->di_attr,
idp->di_vers, idp->di_ops ? idp->di_ops : &dt_idops_thaw,
idp->di_iarg, 0) == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
}
/*
@@ -885,7 +885,7 @@ dt_vopen(int version, int flags, int *errp,
*/
updateerr = dtrace_update(dtp);
if (updateerr != 0)
- return (set_open_errno(dtp, errp, updateerr));
+ return set_open_errno(dtp, errp, updateerr);
/*
* Select the intrinsics and typedefs we want based on the data model.
@@ -904,15 +904,15 @@ dt_vopen(int version, int flags, int *errp,
* types and types defined in ANSI-C header files that are included.
*/
if ((dmp = dtp->dt_cdefs = dt_module_create(dtp, "C")) == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
if ((dmp->dm_ctfp = ctf_create(&dtp->dt_ctferr)) == NULL)
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
dt_dprintf("created CTF container for %s (%p)\n",
dmp->dm_name, (void *)dmp->dm_ctfp);
- (void) ctf_setmodel(dmp->dm_ctfp, dtp->dt_conf.dtc_ctfmodel);
+ ctf_setmodel(dmp->dm_ctfp, dtp->dt_conf.dtc_ctfmodel);
ctf_setspecific(dmp->dm_ctfp, dmp);
dmp->dm_flags = DT_DM_LOADED; /* fake up loaded bit */
@@ -934,33 +934,33 @@ dt_vopen(int version, int flags, int *errp,
dt_dprintf("failed to add %s to C container: %s\n",
dinp->din_name, ctf_errmsg(
ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
}
if (ctf_update(dmp->dm_ctfp) != 0) {
dt_dprintf("failed to update C container: %s\n",
ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
/*
* Add intrinsic pointer types that are needed to initialize printf
* format dictionary types (see table in dt_printf.c).
*/
- (void) ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT,
+ ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT,
ctf_lookup_by_name(dmp->dm_ctfp, "void"));
- (void) ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT,
+ ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT,
ctf_lookup_by_name(dmp->dm_ctfp, "char"));
- (void) ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT,
+ ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT,
ctf_lookup_by_name(dmp->dm_ctfp, "int"));
if (ctf_update(dmp->dm_ctfp) != 0) {
dt_dprintf("failed to update C container: %s\n",
ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
/*
@@ -969,15 +969,15 @@ dt_vopen(int version, int flags, int *errp,
* The "D" CTF container is a child of the "C" CTF container.
*/
if ((dmp = dtp->dt_ddefs = dt_module_create(dtp, "D")) == NULL)
- return (set_open_errno(dtp, errp, EDT_NOMEM));
+ return set_open_errno(dtp, errp, EDT_NOMEM);
if ((dmp->dm_ctfp = ctf_create(&dtp->dt_ctferr)) == NULL)
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
dt_dprintf("created CTF container for %s (%p)\n",
dmp->dm_name, (void *)dmp->dm_ctfp);
- (void) ctf_setmodel(dmp->dm_ctfp, dtp->dt_conf.dtc_ctfmodel);
+ ctf_setmodel(dmp->dm_ctfp, dtp->dt_conf.dtc_ctfmodel);
ctf_setspecific(dmp->dm_ctfp, dmp);
dmp->dm_flags = DT_DM_LOADED; /* fake up loaded bit */
@@ -985,7 +985,7 @@ dt_vopen(int version, int flags, int *errp,
if (ctf_import(dmp->dm_ctfp, dtp->dt_cdefs->dm_ctfp) == CTF_ERR) {
dt_dprintf("failed to import D parent container: %s\n",
ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
/*
@@ -1000,7 +1000,7 @@ dt_vopen(int version, int flags, int *errp,
dt_dprintf("failed to add typedef %s %s to D "
"container: %s", dtyp->dty_src, dtyp->dty_dst,
ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
}
@@ -1050,13 +1050,13 @@ dt_vopen(int version, int flags, int *errp,
dtp->dt_type_usymaddr == CTF_ERR) {
dt_dprintf("failed to add intrinsic to D container: %s\n",
ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
if (ctf_update(dmp->dm_ctfp) != 0) {
dt_dprintf("failed update D container: %s\n",
ctf_errmsg(ctf_errno(dmp->dm_ctfp)));
- return (set_open_errno(dtp, errp, EDT_CTF));
+ return set_open_errno(dtp, errp, EDT_CTF);
}
/*
@@ -1075,20 +1075,20 @@ dt_vopen(int version, int flags, int *errp,
* constants to the appropriate types. Refer to the comments above
* dt_node_int() for a complete description of how this table is used.
*/
- for (i = 0; i < sizeof (dtp->dt_ints) / sizeof (dtp->dt_ints[0]); i++) {
+ for (i = 0; i < sizeof(dtp->dt_ints) / sizeof(dtp->dt_ints[0]); i++) {
if (dtrace_lookup_by_type(dtp, DTRACE_OBJ_EVERY,
dtp->dt_ints[i].did_name, &dtt) != 0) {
dt_dprintf("failed to lookup integer type %s: %s\n",
dtp->dt_ints[i].did_name,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- return (set_open_errno(dtp, errp, dtp->dt_errno));
+ return set_open_errno(dtp, errp, dtp->dt_errno);
}
dtp->dt_ints[i].did_ctfp = dtt.dtt_ctfp;
dtp->dt_ints[i].did_type = dtt.dtt_type;
}
if (dt_pfdict_create(dtp) == -1)
- return (set_open_errno(dtp, errp, dtp->dt_errno));
+ return set_open_errno(dtp, errp, dtp->dt_errno);
/*
* Initialize the BPF library handling.
@@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp,
DTRACE_PROBESPEC_NONE, DTRACE_C_EMPTY, 0, NULL)) == NULL) {
dt_dprintf("failed to load hard-wired definitions: %s\n",
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- return (set_open_errno(dtp, errp, EDT_HARDWIRE));
+ return set_open_errno(dtp, errp, EDT_HARDWIRE);
}
dt_program_destroy(dtp, pgp);
@@ -1129,9 +1129,9 @@ dt_vopen(int version, int flags, int *errp,
* reporting of compiler errors requires dtrace_open() to succeed).
*/
if (dtrace_setopt(dtp, "libdir", _dtrace_libdir) != 0)
- return (set_open_errno(dtp, errp, dtp->dt_errno));
+ return set_open_errno(dtp, errp, dtp->dt_errno);
- return (dtp);
+ return dtp;
}
void
@@ -1143,14 +1143,14 @@ dtrace_size_dbg_print(const char *type, size_t size)
dtrace_hdl_t *
dtrace_open(int version, int flags, int *errp)
{
- return (dt_vopen(version, flags, errp, NULL, NULL));
+ return dt_vopen(version, flags, errp, NULL, NULL);
}
dtrace_hdl_t *
dtrace_vopen(int version, int flags, int *errp,
const dtrace_vector_t *vector, void *arg)
{
- return (dt_vopen(version, flags, errp, vector, arg));
+ return dt_vopen(version, flags, errp, vector, arg);
}
void
diff --git a/libdtrace/dt_options.c b/libdtrace/dt_options.c
index 53c9507a..8d45117e 100644
--- a/libdtrace/dt_options.c
+++ b/libdtrace/dt_options.c
@@ -30,10 +30,10 @@ dt_opt_agg(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dt_aggregate_t *agp = &dtp->dt_aggregate;
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
agp->dtat_flags |= option;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -44,10 +44,10 @@ dt_opt_amin(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dtrace_attribute_t attr;
if (arg == NULL || dtrace_str2attr(arg, &attr) == -1)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dt_dprintf("set compiler attribute minimum to %s\n",
- dtrace_attr2str(attr, str, sizeof (str)));
+ dtrace_attr2str(attr, str, sizeof(str)));
if (dtp->dt_pcb != NULL) {
dtp->dt_pcb->pcb_cflags |= DTRACE_C_EATTR;
@@ -57,7 +57,7 @@ dt_opt_amin(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dtp->dt_amin = attr;
}
- return (0);
+ return 0;
}
static void
@@ -68,18 +68,18 @@ dt_coredump(void)
struct sigaction act;
struct rlimit lim;
- (void) write(STDERR_FILENO, msg, sizeof (msg) - 1);
+ write(STDERR_FILENO, msg, sizeof(msg) - 1);
act.sa_handler = SIG_DFL;
act.sa_flags = 0;
- (void) sigemptyset(&act.sa_mask);
- (void) sigaction(SIGABRT, &act, NULL);
+ sigemptyset(&act.sa_mask);
+ sigaction(SIGABRT, &act, NULL);
lim.rlim_cur = RLIM_INFINITY;
lim.rlim_max = RLIM_INFINITY;
- (void) setrlimit(RLIMIT_CORE, &lim);
+ setrlimit(RLIMIT_CORE, &lim);
abort();
}
@@ -90,12 +90,12 @@ dt_opt_core(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
static int enabled = 0;
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (enabled++ || atexit(dt_coredump) == 0)
- return (0);
+ return 0;
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
static int
@@ -107,24 +107,24 @@ dt_opt_cpp_args(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *save = NULL;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if ((splitarg = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
for (p = strtok_r(splitarg, ws, &save); p != NULL;
p = strtok_r(NULL, ws, &save))
if (dt_cpp_add_arg(dtp, p) == NULL) {
free(splitarg);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
free(splitarg);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -132,15 +132,15 @@ static int
dt_opt_cpp_hdrs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if (dt_cpp_add_arg(dtp, "-H") == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -150,19 +150,19 @@ dt_opt_cpp_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *cpp;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if ((cpp = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
dtp->dt_cpp_argv[0] = (char *)strbasename(cpp);
free(dtp->dt_cpp_path);
dtp->dt_cpp_path = cpp;
- return (0);
+ return 0;
}
static int
@@ -173,21 +173,21 @@ dt_opt_cpp_opts(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
const char *opt = (const char *)option;
if (opt == NULL || arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
len = strlen(opt) + strlen(arg) + 1;
buf = alloca(len);
- (void) strcpy(buf, opt);
- (void) strcat(buf, arg);
+ strcpy(buf, opt);
+ strcat(buf, arg);
if (dt_cpp_add_arg(dtp, buf) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -197,14 +197,14 @@ dt_opt_ctypes(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int fd;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if ((fd = open(arg, O_CREAT | O_WRONLY, 0666)) == -1)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- (void) close(dtp->dt_cdefs_fd);
+ close(dtp->dt_cdefs_fd);
dtp->dt_cdefs_fd = fd;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -212,7 +212,7 @@ static int
dt_opt_droptags(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dtp->dt_droptags = 1;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -222,14 +222,14 @@ dt_opt_dtypes(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int fd;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if ((fd = open(arg, O_CREAT | O_WRONLY, 0666)) == -1)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- (void) close(dtp->dt_ddefs_fd);
+ close(dtp->dt_ddefs_fd);
dtp->dt_ddefs_fd = fd;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -237,10 +237,10 @@ static int
dt_opt_debug(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
_dtrace_debug = 1;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -248,14 +248,14 @@ static int
dt_opt_debug_assert(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (strcmp(arg, "mutexes") == 0)
_dtrace_debug_assert |= DT_DEBUG_MUTEXES;
else
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -265,10 +265,10 @@ dt_opt_iregs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int n;
if (arg == NULL || (n = atoi(arg)) <= 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_conf.dtc_difintregs = n;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -277,7 +277,7 @@ dt_opt_lazyload(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
dtp->dt_lazyload = 1;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -287,18 +287,18 @@ dt_opt_ld_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *ld;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if ((ld = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
free(dtp->dt_ld_path);
dtp->dt_ld_path = ld;
- return (0);
+ return 0;
}
static int
@@ -307,18 +307,18 @@ dt_opt_ctfa_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *ctfa;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if ((ctfa = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
free(dtp->dt_ctfa_path);
dtp->dt_ctfa_path = ctfa;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -328,16 +328,16 @@ dt_opt_libdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dt_dirpath_t *dp;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- if ((dp = malloc(sizeof (dt_dirpath_t))) == NULL ||
+ if ((dp = malloc(sizeof(dt_dirpath_t))) == NULL ||
(dp->dir_path = strdup(arg)) == NULL) {
free(dp);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
dt_list_append(&dtp->dt_lib_path, dp);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -345,7 +345,7 @@ static int
dt_opt_linkmode(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (strcmp(arg, "kernel") == 0)
dtp->dt_linkmode = DT_LINK_KERNEL;
@@ -354,9 +354,9 @@ dt_opt_linkmode(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
else if (strcmp(arg, "static") == 0)
dtp->dt_linkmode = DT_LINK_STATIC;
else
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -364,16 +364,16 @@ static int
dt_opt_linktype(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (strcasecmp(arg, "elf") == 0)
dtp->dt_linktype = DT_LTYP_ELF;
else if (strcasecmp(arg, "dof") == 0)
dtp->dt_linktype = DT_LTYP_DOF;
else
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -383,18 +383,18 @@ dt_opt_module_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *proc;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if ((proc = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
free(dtp->dt_module_path);
dtp->dt_module_path = proc;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -415,7 +415,7 @@ static int
dt_opt_evaltime(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (strcmp(arg, "exec") == 0)
dtp->dt_prcmode = DT_PROC_STOP_CREATE;
@@ -426,9 +426,9 @@ dt_opt_evaltime(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
else if (strcmp(arg, "main") == 0)
dtp->dt_prcmode = DT_PROC_STOP_MAIN;
else
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -438,10 +438,10 @@ dt_opt_pgmax(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int n;
if (arg == NULL || (n = atoi(arg)) < 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_procs->dph_lrulim = n;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -451,17 +451,17 @@ dt_opt_procfs_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *proc;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if ((proc = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
Pset_procfs_path(proc);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -469,10 +469,10 @@ static int
dt_opt_stdc(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTCTX));
+ return dt_set_errno(dtp, EDT_BADOPTCTX);
if (strcmp(arg, "a") == 0)
dtp->dt_stdcmode = DT_STDC_XA;
@@ -483,9 +483,9 @@ dt_opt_stdc(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
else if (strcmp(arg, "s") == 0)
dtp->dt_stdcmode = DT_STDC_XS;
else
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -496,15 +496,15 @@ dt_opt_syslibdir(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *path;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if ((path = strdup(arg)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
free(dp->dir_path);
dp->dir_path = path;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -514,19 +514,19 @@ dt_opt_sysslice(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
char *slice;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
/*
* This string needs decorating suitably for grepping out of
* /proc/$pid/cgroups.
*/
if (asprintf(&slice, ":/%s/", arg) < 0)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
free(dtp->dt_sysslice);
dtp->dt_sysslice = slice;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -536,10 +536,10 @@ dt_opt_tree(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int m;
if (arg == NULL || (m = atoi(arg)) <= 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_treedump = m;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -549,10 +549,10 @@ dt_opt_tregs(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int n;
if (arg == NULL || (n = atoi(arg)) <= 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_conf.dtc_diftupregs = n;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -562,10 +562,10 @@ dt_opt_useruid(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
uid_t n;
if (arg == NULL || (n = atoi(arg)) < 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_useruid = n;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -573,16 +573,16 @@ static int
dt_opt_xlate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (strcmp(arg, "dynamic") == 0)
dtp->dt_xlatemode = DT_XL_DYNAMIC;
else if (strcmp(arg, "static") == 0)
dtp->dt_xlatemode = DT_XL_STATIC;
else
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -590,38 +590,38 @@ static int
dt_opt_cflags(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
dtp->dt_pcb->pcb_cflags |= option;
else
dtp->dt_cflags |= option;
- return (0);
+ return 0;
}
static int
dt_opt_dflags(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_dflags |= option;
- return (0);
+ return 0;
}
static int
dt_opt_invcflags(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
{
if (arg != NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dtp->dt_pcb != NULL)
dtp->dt_pcb->pcb_cflags &= ~option;
else
dtp->dt_cflags &= ~option;
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -631,15 +631,15 @@ dt_opt_version(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dt_version_t v;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (dt_version_str2num(arg, &v) == -1)
- return (dt_set_errno(dtp, EDT_VERSINVAL));
+ return dt_set_errno(dtp, EDT_VERSINVAL);
if (!dt_version_defined(v))
- return (dt_set_errno(dtp, EDT_VERSUNDEF));
+ return dt_set_errno(dtp, EDT_VERSUNDEF);
- return (dt_reduce(dtp, v));
+ return dt_reduce(dtp, v);
}
static int
@@ -687,12 +687,12 @@ dt_opt_runtime(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
val = strtoull(arg, &end, 0);
if (*end != '\0' || errno != 0 || val < 0 || negtest < 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
}
out:
dtp->dt_options[option] = val;
- return (0);
+ return 0;
}
static int
@@ -733,9 +733,9 @@ dt_optval_parse(const char *arg, dtrace_optval_t *rval)
if ((mul > 1 && end != &arg[len - 1]) || (mul == 1 && *end != '\0') ||
*rval < 0 || negtest < 0 || errno != 0)
- return (-1);
+ return -1;
- return (0);
+ return 0;
}
static int
@@ -744,10 +744,10 @@ dt_opt_size(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dtrace_optval_t val = 0;
if (arg != NULL && dt_optval_parse(arg, &val) != 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_options[option] = val;
- return (0);
+ return 0;
}
static int
@@ -758,7 +758,7 @@ dt_opt_pcapsize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
if (arg != NULL) {
if ((rval = dt_opt_size(dtp, arg, option)) != 0)
- return (rval);
+ return rval;
val = dtp->dt_options[option];
@@ -767,7 +767,7 @@ dt_opt_pcapsize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
}
dtp->dt_options[option] = P2ROUNDUP(val, 8);
- return (0);
+ return 0;
}
static int
@@ -815,7 +815,7 @@ dt_opt_rate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
if ((suffix[i].name == NULL && *end != '\0') || val < 0 ||
negtest < 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (mul == 0) {
/*
@@ -829,7 +829,7 @@ dt_opt_rate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
}
dtp->dt_options[option] = val;
- return (0);
+ return 0;
}
/*
@@ -847,17 +847,17 @@ dt_opt_strsize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
ctf_arinfo_t r;
if (dt_opt_size(dtp, arg, option) != 0)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (dtp->dt_options[option] > UINT_MAX) {
dtp->dt_options[option] = val;
- return (dt_set_errno(dtp, EOVERFLOW));
+ return dt_set_errno(dtp, EOVERFLOW);
}
if (ctf_array_info(fp, type, &r) == CTF_ERR) {
dtp->dt_options[option] = val;
dtp->dt_ctferr = ctf_errno(fp);
- return (dt_set_errno(dtp, EDT_CTF));
+ return dt_set_errno(dtp, EDT_CTF);
}
r.ctr_nelems = (uint_t)dtp->dt_options[option];
@@ -866,10 +866,10 @@ dt_opt_strsize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
ctf_update(fp) == CTF_ERR) {
dtp->dt_options[option] = val;
dtp->dt_ctferr = ctf_errno(fp);
- return (dt_set_errno(dtp, EDT_CTF));
+ return dt_set_errno(dtp, EDT_CTF);
}
- return (0);
+ return 0;
}
static const struct {
@@ -890,7 +890,7 @@ dt_opt_bufpolicy(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int i;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
for (i = 0; _dtrace_bufpolicies[i].dtbp_name != NULL; i++) {
if (strcmp(_dtrace_bufpolicies[i].dtbp_name, arg) == 0) {
@@ -900,11 +900,11 @@ dt_opt_bufpolicy(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
}
if (policy == DTRACEOPT_UNSET)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_options[DTRACEOPT_BUFPOLICY] = policy;
- return (0);
+ return 0;
}
static const struct {
@@ -924,7 +924,7 @@ dt_opt_bufresize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
int i;
if (arg == NULL)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
for (i = 0; _dtrace_bufresize[i].dtbr_name != NULL; i++) {
if (strcmp(_dtrace_bufresize[i].dtbr_name, arg) == 0) {
@@ -934,11 +934,11 @@ dt_opt_bufresize(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
}
if (policy == DTRACEOPT_UNSET)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
dtp->dt_options[DTRACEOPT_BUFRESIZE] = policy;
- return (0);
+ return 0;
}
int
@@ -954,24 +954,24 @@ dt_options_load(dtrace_hdl_t *dtp)
* To load the option values, we need to ask the kernel to provide its
* DOF, which we'll sift through to look for OPTDESC sections.
*/
- memset(&hdr, 0, sizeof (dof_hdr_t));
- hdr.dofh_loadsz = sizeof (dof_hdr_t);
+ memset(&hdr, 0, sizeof(dof_hdr_t));
+ hdr.dofh_loadsz = sizeof(dof_hdr_t);
if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &hdr) == -1)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- if (hdr.dofh_loadsz < sizeof (dof_hdr_t))
- return (dt_set_errno(dtp, EINVAL));
+ if (hdr.dofh_loadsz < sizeof(dof_hdr_t))
+ return dt_set_errno(dtp, EINVAL);
dof = alloca(hdr.dofh_loadsz);
- memset(dof, 0, sizeof (dof_hdr_t));
+ memset(dof, 0, sizeof(dof_hdr_t));
dof->dofh_loadsz = hdr.dofh_loadsz;
for (i = 0; i < DTRACEOPT_MAX; i++)
dtp->dt_options[i] = DTRACEOPT_UNSET;
if (dt_ioctl(dtp, DTRACEIOC_DOFGET, dof) == -1)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
/* FIXME: can we get a zero-section DOF back? */
@@ -999,7 +999,7 @@ dt_options_load(dtrace_hdl_t *dtp)
}
#endif
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -1010,7 +1010,7 @@ dt_opt_preallocate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
void *p;
if (arg == NULL || dt_optval_parse(arg, &size) != 0)
- return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ return dt_set_errno(dtp, EDT_BADOPTVAL);
if (size > SIZE_MAX)
size = SIZE_MAX;
@@ -1023,7 +1023,7 @@ dt_opt_preallocate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
dt_free(dtp, p);
- return (0);
+ return 0;
}
typedef struct dt_option {
@@ -1138,7 +1138,7 @@ dtrace_getopt(dtrace_hdl_t *dtp, const char *opt, dtrace_optval_t *val)
const dt_option_t *op;
if (opt == NULL)
- return (dt_set_errno(dtp, EINVAL));
+ return dt_set_errno(dtp, EINVAL);
/*
* We only need to search the run-time options -- it's not legal
@@ -1147,18 +1147,18 @@ dtrace_getopt(dtrace_hdl_t *dtp, const char *opt, dtrace_optval_t *val)
for (op = _dtrace_rtoptions; op->o_name != NULL; op++) {
if (strcmp(op->o_name, opt) == 0) {
*val = dtp->dt_options[op->o_option];
- return (0);
+ return 0;
}
}
for (op = _dtrace_drtoptions; op->o_name != NULL; op++) {
if (strcmp(op->o_name, opt) == 0) {
*val = dtp->dt_options[op->o_option];
- return (0);
+ return 0;
}
}
- return (dt_set_errno(dtp, EDT_BADOPTNAME));
+ return dt_set_errno(dtp, EDT_BADOPTNAME);
}
int
@@ -1167,16 +1167,16 @@ dtrace_setopt(dtrace_hdl_t *dtp, const char *opt, const char *val)
const dt_option_t *op;
if (opt == NULL)
- return (dt_set_errno(dtp, EINVAL));
+ return dt_set_errno(dtp, EINVAL);
for (op = _dtrace_ctoptions; op->o_name != NULL; op++) {
if (strcmp(op->o_name, opt) == 0)
- return (op->o_func(dtp, val, op->o_option));
+ return op->o_func(dtp, val, op->o_option);
}
for (op = _dtrace_drtoptions; op->o_name != NULL; op++) {
if (strcmp(op->o_name, opt) == 0)
- return (op->o_func(dtp, val, op->o_option));
+ return op->o_func(dtp, val, op->o_option);
}
for (op = _dtrace_rtoptions; op->o_name != NULL; op++) {
@@ -1186,13 +1186,13 @@ dtrace_setopt(dtrace_hdl_t *dtp, const char *opt, const char *val)
* tracing is active.
*/
if (dtp->dt_active)
- return (dt_set_errno(dtp, EDT_ACTIVE));
+ return dt_set_errno(dtp, EDT_ACTIVE);
- return (op->o_func(dtp, val, op->o_option));
+ return op->o_func(dtp, val, op->o_option);
}
}
- return (dt_set_errno(dtp, EDT_BADOPTNAME));
+ return dt_set_errno(dtp, EDT_BADOPTNAME);
}
static const char *
diff --git a/libdtrace/dt_parser.c b/libdtrace/dt_parser.c
index 6bd19937..c0301192 100644
--- a/libdtrace/dt_parser.c
+++ b/libdtrace/dt_parser.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -104,67 +104,67 @@ static const char *
opstr(int op)
{
switch (op) {
- case DT_TOK_COMMA: return (",");
- case DT_TOK_ELLIPSIS: return ("...");
- case DT_TOK_ASGN: return ("=");
- case DT_TOK_ADD_EQ: return ("+=");
- case DT_TOK_SUB_EQ: return ("-=");
- case DT_TOK_MUL_EQ: return ("*=");
- case DT_TOK_DIV_EQ: return ("/=");
- case DT_TOK_MOD_EQ: return ("%=");
- case DT_TOK_AND_EQ: return ("&=");
- case DT_TOK_XOR_EQ: return ("^=");
- case DT_TOK_OR_EQ: return ("|=");
- case DT_TOK_LSH_EQ: return ("<<=");
- case DT_TOK_RSH_EQ: return (">>=");
- case DT_TOK_QUESTION: return ("?");
- case DT_TOK_COLON: return (":");
- case DT_TOK_LOR: return ("||");
- case DT_TOK_LXOR: return ("^^");
- case DT_TOK_LAND: return ("&&");
- case DT_TOK_BOR: return ("|");
- case DT_TOK_XOR: return ("^");
- case DT_TOK_BAND: return ("&");
- case DT_TOK_EQU: return ("==");
- case DT_TOK_NEQ: return ("!=");
- case DT_TOK_LT: return ("<");
- case DT_TOK_LE: return ("<=");
- case DT_TOK_GT: return (">");
- case DT_TOK_GE: return (">=");
- case DT_TOK_LSH: return ("<<");
- case DT_TOK_RSH: return (">>");
- case DT_TOK_ADD: return ("+");
- case DT_TOK_SUB: return ("-");
- case DT_TOK_MUL: return ("*");
- case DT_TOK_DIV: return ("/");
- case DT_TOK_MOD: return ("%");
- case DT_TOK_LNEG: return ("!");
- case DT_TOK_BNEG: return ("~");
- case DT_TOK_ADDADD: return ("++");
- case DT_TOK_PREINC: return ("++");
- case DT_TOK_POSTINC: return ("++");
- case DT_TOK_SUBSUB: return ("--");
- case DT_TOK_PREDEC: return ("--");
- case DT_TOK_POSTDEC: return ("--");
- case DT_TOK_IPOS: return ("+");
- case DT_TOK_INEG: return ("-");
- case DT_TOK_DEREF: return ("*");
- case DT_TOK_ADDROF: return ("&");
- case DT_TOK_OFFSETOF: return ("offsetof");
- case DT_TOK_SIZEOF: return ("sizeof");
- case DT_TOK_STRINGOF: return ("stringof");
- case DT_TOK_XLATE: return ("xlate");
- case DT_TOK_LPAR: return ("(");
- case DT_TOK_RPAR: return (")");
- case DT_TOK_LBRAC: return ("[");
- case DT_TOK_RBRAC: return ("]");
- case DT_TOK_PTR: return ("->");
- case DT_TOK_DOT: return (".");
- case DT_TOK_STRING: return ("<string>");
- case DT_TOK_IDENT: return ("<ident>");
- case DT_TOK_TNAME: return ("<type>");
- case DT_TOK_INT: return ("<int>");
- default: return ("<?>");
+ case DT_TOK_COMMA: return ",";
+ case DT_TOK_ELLIPSIS: return "...";
+ case DT_TOK_ASGN: return "=";
+ case DT_TOK_ADD_EQ: return "+=";
+ case DT_TOK_SUB_EQ: return "-=";
+ case DT_TOK_MUL_EQ: return "*=";
+ case DT_TOK_DIV_EQ: return "/=";
+ case DT_TOK_MOD_EQ: return "%=";
+ case DT_TOK_AND_EQ: return "&=";
+ case DT_TOK_XOR_EQ: return "^=";
+ case DT_TOK_OR_EQ: return "|=";
+ case DT_TOK_LSH_EQ: return "<<=";
+ case DT_TOK_RSH_EQ: return ">>=";
+ case DT_TOK_QUESTION: return "?";
+ case DT_TOK_COLON: return ":";
+ case DT_TOK_LOR: return "||";
+ case DT_TOK_LXOR: return "^^";
+ case DT_TOK_LAND: return "&&";
+ case DT_TOK_BOR: return "|";
+ case DT_TOK_XOR: return "^";
+ case DT_TOK_BAND: return "&";
+ case DT_TOK_EQU: return "==";
+ case DT_TOK_NEQ: return "!=";
+ case DT_TOK_LT: return "<";
+ case DT_TOK_LE: return "<=";
+ case DT_TOK_GT: return ">";
+ case DT_TOK_GE: return ">=";
+ case DT_TOK_LSH: return "<<";
+ case DT_TOK_RSH: return ">>";
+ case DT_TOK_ADD: return "+";
+ case DT_TOK_SUB: return "-";
+ case DT_TOK_MUL: return "*";
+ case DT_TOK_DIV: return "/";
+ case DT_TOK_MOD: return "%";
+ case DT_TOK_LNEG: return "!";
+ case DT_TOK_BNEG: return "~";
+ case DT_TOK_ADDADD: return "++";
+ case DT_TOK_PREINC: return "++";
+ case DT_TOK_POSTINC: return "++";
+ case DT_TOK_SUBSUB: return "--";
+ case DT_TOK_PREDEC: return "--";
+ case DT_TOK_POSTDEC: return "--";
+ case DT_TOK_IPOS: return "+";
+ case DT_TOK_INEG: return "-";
+ case DT_TOK_DEREF: return "*";
+ case DT_TOK_ADDROF: return "&";
+ case DT_TOK_OFFSETOF: return "offsetof";
+ case DT_TOK_SIZEOF: return "sizeof";
+ case DT_TOK_STRINGOF: return "stringof";
+ case DT_TOK_XLATE: return "xlate";
+ case DT_TOK_LPAR: return "(";
+ case DT_TOK_RPAR: return ")";
+ case DT_TOK_LBRAC: return "[";
+ case DT_TOK_RBRAC: return "]";
+ case DT_TOK_PTR: return "->";
+ case DT_TOK_DOT: return ".";
+ case DT_TOK_STRING: return "<string>";
+ case DT_TOK_IDENT: return "<ident>";
+ case DT_TOK_TNAME: return "<type>";
+ case DT_TOK_INT: return "<int>";
+ default: return "<?>";
}
}
@@ -203,9 +203,9 @@ dt_type_lookup(const char *s, dtrace_typeinfo_t *tip)
strlen(q + 1) + 1);
if (strchr(q + 1, '`') != NULL)
- return (dt_set_errno(dtp, EDT_BADSCOPE));
+ return dt_set_errno(dtp, EDT_BADSCOPE);
- return (dtrace_lookup_by_type(dtp, object, type, tip));
+ return dtrace_lookup_by_type(dtp, object, type, tip);
}
}
@@ -214,7 +214,7 @@ dt_type_lookup(const char *s, dtrace_typeinfo_t *tip)
else
obj = DTRACE_OBJ_EVERY;
- return (dtrace_lookup_by_type(dtp, obj, s, tip));
+ return dtrace_lookup_by_type(dtp, obj, s, tip);
}
/*
@@ -240,7 +240,7 @@ dt_type_pointer(dtrace_typeinfo_t *tip)
if ((ptr = ctf_type_pointer(ctfp, type)) != CTF_ERR ||
(ptr = ctf_type_pointer(ctfp, base)) != CTF_ERR) {
tip->dtt_type = ptr;
- return (0);
+ return 0;
}
if (yypcb->pcb_idepth != 0)
@@ -251,21 +251,21 @@ dt_type_pointer(dtrace_typeinfo_t *tip)
if (ctfp != dmp->dm_ctfp && ctfp != ctf_parent_file(dmp->dm_ctfp) &&
(type = ctf_add_type(dmp->dm_ctfp, ctfp, type)) == CTF_ERR) {
dtp->dt_ctferr = ctf_errno(dmp->dm_ctfp);
- return (dt_set_errno(dtp, EDT_CTF));
+ return dt_set_errno(dtp, EDT_CTF);
}
ptr = ctf_add_pointer(dmp->dm_ctfp, CTF_ADD_ROOT, type);
if (ptr == CTF_ERR || ctf_update(dmp->dm_ctfp) == CTF_ERR) {
dtp->dt_ctferr = ctf_errno(dmp->dm_ctfp);
- return (dt_set_errno(dtp, EDT_CTF));
+ return dt_set_errno(dtp, EDT_CTF);
}
tip->dtt_object = dmp->dm_name;
tip->dtt_ctfp = dmp->dm_ctfp;
tip->dtt_type = ptr;
- return (0);
+ return 0;
}
const char *
@@ -274,17 +274,17 @@ dt_type_name(ctf_file_t *ctfp, ctf_id_t type, char *buf, size_t len)
dtrace_hdl_t *dtp = yypcb->pcb_hdl;
if (ctfp == DT_FPTR_CTFP(dtp) && type == DT_FPTR_TYPE(dtp))
- (void) snprintf(buf, len, "function pointer");
+ snprintf(buf, len, "function pointer");
else if (ctfp == DT_FUNC_CTFP(dtp) && type == DT_FUNC_TYPE(dtp))
- (void) snprintf(buf, len, "function");
+ snprintf(buf, len, "function");
else if (ctfp == DT_DYN_CTFP(dtp) && type == DT_DYN_TYPE(dtp))
- (void) snprintf(buf, len, "dynamic variable");
+ snprintf(buf, len, "dynamic variable");
else if (ctfp == NULL)
- (void) snprintf(buf, len, "<none>");
+ snprintf(buf, len, "<none>");
else if (ctf_type_name(ctfp, type, buf, len) == NULL)
- (void) snprintf(buf, len, "unknown");
+ snprintf(buf, len, "unknown");
- return (buf);
+ return buf;
}
/*
@@ -383,17 +383,17 @@ dt_node_name(const dt_node_t *dnp, char *buf, size_t len)
switch (dnp->dn_kind) {
case DT_NODE_INT:
- (void) snprintf(buf, len, "integer constant 0x%llx",
+ snprintf(buf, len, "integer constant 0x%llx",
(u_longlong_t)dnp->dn_value);
break;
case DT_NODE_STRING:
s = strchr2esc(dnp->dn_string, strlen(dnp->dn_string));
- (void) snprintf(buf, len, "string constant \"%s\"",
+ snprintf(buf, len, "string constant \"%s\"",
s != NULL ? s : dnp->dn_string);
free(s);
break;
case DT_NODE_IDENT:
- (void) snprintf(buf, len, "identifier %s", dnp->dn_string);
+ snprintf(buf, len, "identifier %s", dnp->dn_string);
break;
case DT_NODE_VAR:
case DT_NODE_FUNC:
@@ -409,7 +409,7 @@ dt_node_name(const dt_node_t *dnp, char *buf, size_t len)
prefix = "@";
break;
}
- (void) snprintf(buf, len, "%s %s%s%s",
+ snprintf(buf, len, "%s %s%s%s",
dt_idkind_name(dnp->dn_ident->di_kind),
prefix, dnp->dn_ident->di_name, suffix);
break;
@@ -418,19 +418,19 @@ dt_node_name(const dt_node_t *dnp, char *buf, size_t len)
snprintf(buf, len, "symbol %s`%s", dts->object, dts->name);
break;
case DT_NODE_TYPE:
- (void) snprintf(buf, len, "type %s",
- dt_node_type_name(dnp, n1, sizeof (n1)));
+ snprintf(buf, len, "type %s",
+ dt_node_type_name(dnp, n1, sizeof(n1)));
break;
case DT_NODE_OP1:
case DT_NODE_OP2:
case DT_NODE_OP3:
- (void) snprintf(buf, len, "operator %s", opstr(dnp->dn_op));
+ snprintf(buf, len, "operator %s", opstr(dnp->dn_op));
break;
case DT_NODE_DEXPR:
case DT_NODE_DFUNC:
if (dnp->dn_expr)
- return (dt_node_name(dnp->dn_expr, buf, len));
- (void) snprintf(buf, len, "%s", "statement");
+ return dt_node_name(dnp->dn_expr, buf, len);
+ snprintf(buf, len, "%s", "statement");
break;
case DT_NODE_PDESC:
if (dnp->dn_desc->id == 0) {
@@ -443,30 +443,30 @@ dt_node_name(const dt_node_t *dnp, char *buf, size_t len)
}
break;
case DT_NODE_CLAUSE:
- (void) snprintf(buf, len, "%s", "clause");
+ snprintf(buf, len, "%s", "clause");
break;
case DT_NODE_MEMBER:
- (void) snprintf(buf, len, "member %s", dnp->dn_membname);
+ snprintf(buf, len, "member %s", dnp->dn_membname);
break;
case DT_NODE_XLATOR:
- (void) snprintf(buf, len, "translator <%s> (%s)",
+ snprintf(buf, len, "translator <%s> (%s)",
dt_type_name(dnp->dn_xlator->dx_dst_ctfp,
- dnp->dn_xlator->dx_dst_type, n1, sizeof (n1)),
+ dnp->dn_xlator->dx_dst_type, n1, sizeof(n1)),
dt_type_name(dnp->dn_xlator->dx_src_ctfp,
- dnp->dn_xlator->dx_src_type, n2, sizeof (n2)));
+ dnp->dn_xlator->dx_src_type, n2, sizeof(n2)));
break;
case DT_NODE_PROG:
- (void) snprintf(buf, len, "%s", "program");
+ snprintf(buf, len, "%s", "program");
break;
case DT_NODE_TRAMPOLINE:
- (void) snprintf(buf, len, "%s", "trampoline");
+ snprintf(buf, len, "%s", "trampoline");
break;
default:
- (void) snprintf(buf, len, "node <%u>", dnp->dn_kind);
+ snprintf(buf, len, "node <%u>", dnp->dn_kind);
break;
}
- return (buf);
+ return buf;
}
/*
@@ -476,10 +476,10 @@ dt_node_name(const dt_node_t *dnp, char *buf, size_t len)
dt_node_t *
dt_node_xalloc(dtrace_hdl_t *dtp, int kind)
{
- dt_node_t *dnp = dt_alloc(dtp, sizeof (dt_node_t));
+ dt_node_t *dnp = dt_alloc(dtp, sizeof(dt_node_t));
if (dnp == NULL)
- return (NULL);
+ return NULL;
dnp->dn_ctfp = NULL;
dnp->dn_type = CTF_ERR;
@@ -491,9 +491,9 @@ dt_node_xalloc(dtrace_hdl_t *dtp, int kind)
dnp->dn_attr = _dtrace_defattr;
dnp->dn_list = NULL;
dnp->dn_link = NULL;
- memset(&dnp->dn_u, 0, sizeof (dnp->dn_u));
+ memset(&dnp->dn_u, 0, sizeof(dnp->dn_u));
- return (dnp);
+ return dnp;
}
/*
@@ -514,7 +514,7 @@ dt_node_alloc(int kind)
dnp->dn_link = yypcb->pcb_list;
yypcb->pcb_list = dnp;
- return (dnp);
+ return dnp;
}
void
@@ -629,8 +629,8 @@ dt_node_attr_assign(dt_node_t *dnp, dtrace_attribute_t attr)
char s[BUFSIZ];
dnerror(dnp, D_ATTR_MIN, "attributes for %s (%s) are less than "
- "predefined minimum\n", dt_node_name(dnp, s, sizeof (s)),
- dtrace_attr2str(attr, a, sizeof (a)));
+ "predefined minimum\n", dt_node_name(dnp, s, sizeof(s)),
+ dtrace_attr2str(attr, a, sizeof(a)));
}
dnp->dn_attr = attr;
@@ -657,7 +657,7 @@ dt_node_type_assign(dt_node_t *dnp, ctf_file_t *fp, ctf_id_t type)
}
if (kind == CTF_K_FLOAT && ctf_type_encoding(fp, base, &e) == 0) {
- if (e.cte_bits / NBBY > sizeof (uint64_t))
+ if (e.cte_bits / NBBY > sizeof(uint64_t))
dnp->dn_flags |= DT_NF_REF;
}
@@ -687,31 +687,31 @@ const char *
dt_node_type_name(const dt_node_t *dnp, char *buf, size_t len)
{
if (dt_node_is_dynamic(dnp) && dnp->dn_ident != NULL) {
- (void) snprintf(buf, len, "%s",
+ snprintf(buf, len, "%s",
dt_idkind_name(dt_ident_resolve(dnp->dn_ident)->di_kind));
- return (buf);
+ return buf;
}
if (dnp->dn_flags & DT_NF_USERLAND) {
size_t n = snprintf(buf, len, "userland ");
len = len > n ? len - n : 0;
- (void) dt_type_name(dnp->dn_ctfp, dnp->dn_type, buf + n, len);
- return (buf);
+ dt_type_name(dnp->dn_ctfp, dnp->dn_type, buf + n, len);
+ return buf;
}
- return (dt_type_name(dnp->dn_ctfp, dnp->dn_type, buf, len));
+ return dt_type_name(dnp->dn_ctfp, dnp->dn_type, buf, len);
}
size_t
dt_node_type_size(const dt_node_t *dnp)
{
if (dnp->dn_kind == DT_NODE_STRING)
- return (strlen(dnp->dn_string) + 1);
+ return strlen(dnp->dn_string) + 1;
if (dt_node_is_dynamic(dnp) && dnp->dn_ident != NULL)
- return (dt_ident_size(dnp->dn_ident));
+ return dt_ident_size(dnp->dn_ident);
- return (ctf_type_size(dnp->dn_ctfp, dnp->dn_type));
+ return ctf_type_size(dnp->dn_ctfp, dnp->dn_type);
}
/*
@@ -732,15 +732,15 @@ dt_node_resolve(const dt_node_t *dnp, uint_t idkind)
case DT_NODE_INLINE:
case DT_NODE_PROBE:
idp = dt_ident_resolve(dnp->dn_ident);
- return (idp->di_kind == idkind ? idp : NULL);
+ return idp->di_kind == idkind ? idp : NULL;
}
if (dt_node_is_dynamic(dnp)) {
idp = dt_ident_resolve(dnp->dn_ident);
- return (idp->di_kind == idkind ? idp : NULL);
+ return idp->di_kind == idkind ? idp : NULL;
}
- return (NULL);
+ return NULL;
}
size_t
@@ -760,15 +760,15 @@ dt_node_sizeof(const dt_node_t *dnp)
* the function type.
*/
if (dnp->dn_kind != DT_NODE_SYM)
- return (dt_node_type_size(dnp));
+ return dt_node_type_size(dnp);
sip = dnp->dn_ident->di_data;
if (dtrace_lookup_by_name(dtp, sip->object, sip->name,
&sym, NULL) == -1)
- return (0);
+ return 0;
- return (sym.st_size);
+ return sym.st_size;
}
int
@@ -786,9 +786,9 @@ dt_node_is_integer(const dt_node_t *dnp)
if (kind == CTF_K_INTEGER &&
ctf_type_encoding(fp, type, &e) == 0 && IS_VOID(e))
- return (0); /* void integer */
+ return 0; /* void integer */
- return (kind == CTF_K_INTEGER || kind == CTF_K_ENUM);
+ return kind == CTF_K_INTEGER || kind == CTF_K_ENUM;
}
int
@@ -804,10 +804,10 @@ dt_node_is_float(const dt_node_t *dnp)
type = ctf_type_resolve(fp, dnp->dn_type);
kind = ctf_type_kind(fp, type);
- return (kind == CTF_K_FLOAT &&
+ return kind == CTF_K_FLOAT &&
ctf_type_encoding(dnp->dn_ctfp, type, &e) == 0 && (
e.cte_format == CTF_FP_SINGLE || e.cte_format == CTF_FP_DOUBLE ||
- e.cte_format == CTF_FP_LDOUBLE));
+ e.cte_format == CTF_FP_LDOUBLE);
}
int
@@ -825,10 +825,10 @@ dt_node_is_scalar(const dt_node_t *dnp)
if (kind == CTF_K_INTEGER &&
ctf_type_encoding(fp, type, &e) == 0 && IS_VOID(e))
- return (0); /* void cannot be used as a scalar */
+ return 0; /* void cannot be used as a scalar */
- return (kind == CTF_K_INTEGER || kind == CTF_K_ENUM ||
- kind == CTF_K_POINTER);
+ return kind == CTF_K_INTEGER || kind == CTF_K_ENUM ||
+ kind == CTF_K_POINTER;
}
int
@@ -845,9 +845,9 @@ dt_node_is_arith(const dt_node_t *dnp)
kind = ctf_type_kind(fp, type);
if (kind == CTF_K_INTEGER)
- return (ctf_type_encoding(fp, type, &e) == 0 && !IS_VOID(e));
+ return ctf_type_encoding(fp, type, &e) == 0 && !IS_VOID(e);
else
- return (kind == CTF_K_ENUM);
+ return kind == CTF_K_ENUM;
}
int
@@ -862,13 +862,13 @@ dt_node_is_vfptr(const dt_node_t *dnp)
type = ctf_type_resolve(fp, dnp->dn_type);
if (ctf_type_kind(fp, type) != CTF_K_POINTER)
- return (0); /* type is not a pointer */
+ return 0; /* type is not a pointer */
type = ctf_type_resolve(fp, ctf_type_reference(fp, type));
kind = ctf_type_kind(fp, type);
- return (kind == CTF_K_FUNCTION || (kind == CTF_K_INTEGER &&
- ctf_type_encoding(fp, type, &e) == 0 && IS_VOID(e)));
+ return kind == CTF_K_FUNCTION || (kind == CTF_K_INTEGER &&
+ ctf_type_encoding(fp, type, &e) == 0 && IS_VOID(e));
}
int
@@ -877,39 +877,39 @@ dt_node_is_dynamic(const dt_node_t *dnp)
if (dnp->dn_kind == DT_NODE_VAR &&
(dnp->dn_ident->di_flags & DT_IDFLG_INLINE)) {
const dt_idnode_t *inp = dnp->dn_ident->di_iarg;
- return (inp->din_root ? dt_node_is_dynamic(inp->din_root) : 0);
+ return inp->din_root ? dt_node_is_dynamic(inp->din_root) : 0;
}
- return (dnp->dn_ctfp == DT_DYN_CTFP(yypcb->pcb_hdl) &&
- dnp->dn_type == DT_DYN_TYPE(yypcb->pcb_hdl));
+ return dnp->dn_ctfp == DT_DYN_CTFP(yypcb->pcb_hdl) &&
+ dnp->dn_type == DT_DYN_TYPE(yypcb->pcb_hdl);
}
int
dt_node_is_string(const dt_node_t *dnp)
{
- return (dnp->dn_ctfp == DT_STR_CTFP(yypcb->pcb_hdl) &&
- dnp->dn_type == DT_STR_TYPE(yypcb->pcb_hdl));
+ return dnp->dn_ctfp == DT_STR_CTFP(yypcb->pcb_hdl) &&
+ dnp->dn_type == DT_STR_TYPE(yypcb->pcb_hdl);
}
int
dt_node_is_stack(const dt_node_t *dnp)
{
- return (dnp->dn_ctfp == DT_STACK_CTFP(yypcb->pcb_hdl) &&
- dnp->dn_type == DT_STACK_TYPE(yypcb->pcb_hdl));
+ return dnp->dn_ctfp == DT_STACK_CTFP(yypcb->pcb_hdl) &&
+ dnp->dn_type == DT_STACK_TYPE(yypcb->pcb_hdl);
}
int
dt_node_is_symaddr(const dt_node_t *dnp)
{
- return (dnp->dn_ctfp == DT_SYMADDR_CTFP(yypcb->pcb_hdl) &&
- dnp->dn_type == DT_SYMADDR_TYPE(yypcb->pcb_hdl));
+ return dnp->dn_ctfp == DT_SYMADDR_CTFP(yypcb->pcb_hdl) &&
+ dnp->dn_type == DT_SYMADDR_TYPE(yypcb->pcb_hdl);
}
int
dt_node_is_usymaddr(const dt_node_t *dnp)
{
- return (dnp->dn_ctfp == DT_USYMADDR_CTFP(yypcb->pcb_hdl) &&
- dnp->dn_type == DT_USYMADDR_TYPE(yypcb->pcb_hdl));
+ return dnp->dn_ctfp == DT_USYMADDR_CTFP(yypcb->pcb_hdl) &&
+ dnp->dn_type == DT_USYMADDR_TYPE(yypcb->pcb_hdl);
}
int
@@ -930,14 +930,14 @@ dt_node_is_strcompat(const dt_node_t *dnp)
(base = ctf_type_reference(fp, base)) != CTF_ERR &&
(base = ctf_type_resolve(fp, base)) != CTF_ERR &&
ctf_type_encoding(fp, base, &e) == 0 && IS_CHAR(e))
- return (1); /* promote char pointer to string */
+ return 1; /* promote char pointer to string */
if (kind == CTF_K_ARRAY && ctf_array_info(fp, base, &r) == 0 &&
(base = ctf_type_resolve(fp, r.ctr_contents)) != CTF_ERR &&
ctf_type_encoding(fp, base, &e) == 0 && IS_CHAR(e))
- return (1); /* promote char array to string */
+ return 1; /* promote char array to string */
- return (0);
+ return 0;
}
int
@@ -949,10 +949,10 @@ dt_node_is_pointer(const dt_node_t *dnp)
assert(dnp->dn_flags & DT_NF_COOKED);
if (dt_node_is_string(dnp))
- return (0); /* string are pass-by-ref but act like structs */
+ return 0; /* string are pass-by-ref but act like structs */
kind = ctf_type_kind(fp, ctf_type_resolve(fp, dnp->dn_type));
- return (kind == CTF_K_POINTER || kind == CTF_K_ARRAY);
+ return kind == CTF_K_POINTER || kind == CTF_K_ARRAY;
}
int
@@ -963,18 +963,18 @@ dt_node_is_void(const dt_node_t *dnp)
ctf_id_t type;
if (dt_node_is_dynamic(dnp))
- return (0); /* <DYN> is an alias for void but not the same */
+ return 0; /* <DYN> is an alias for void but not the same */
if (dt_node_is_stack(dnp))
- return (0);
+ return 0;
if (dt_node_is_symaddr(dnp) || dt_node_is_usymaddr(dnp))
- return (0);
+ return 0;
type = ctf_type_resolve(fp, dnp->dn_type);
- return (ctf_type_kind(fp, type) == CTF_K_INTEGER &&
- ctf_type_encoding(fp, type, &e) == 0 && IS_VOID(e));
+ return ctf_type_kind(fp, type) == CTF_K_INTEGER &&
+ ctf_type_encoding(fp, type, &e) == 0 && IS_VOID(e);
}
int
@@ -997,23 +997,23 @@ dt_node_is_ptrcompat(const dt_node_t *lp, const dt_node_t *rp,
assert(rp->dn_flags & DT_NF_COOKED);
if (dt_node_is_dynamic(lp) || dt_node_is_dynamic(rp))
- return (0); /* fail if either node is a dynamic variable */
+ return 0; /* fail if either node is a dynamic variable */
lp_is_int = dt_node_is_integer(lp);
rp_is_int = dt_node_is_integer(rp);
if (lp_is_int && rp_is_int)
- return (0); /* fail if both nodes are integers */
+ return 0; /* fail if both nodes are integers */
if (lp_is_int && (lp->dn_kind != DT_NODE_INT || lp->dn_value != 0))
- return (0); /* fail if lp is an integer that isn't 0 constant */
+ return 0; /* fail if lp is an integer that isn't 0 constant */
if (rp_is_int && (rp->dn_kind != DT_NODE_INT || rp->dn_value != 0))
- return (0); /* fail if rp is an integer that isn't 0 constant */
+ return 0; /* fail if rp is an integer that isn't 0 constant */
if ((lp_is_int == 0 && rp_is_int == 0) && (
(lp->dn_flags & DT_NF_USERLAND) ^ (rp->dn_flags & DT_NF_USERLAND)))
- return (0); /* fail if only one pointer is a userland address */
+ return 0; /* fail if only one pointer is a userland address */
/*
* Resolve the left-hand and right-hand types to their base type, and
@@ -1082,7 +1082,7 @@ dt_node_is_ptrcompat(const dt_node_t *lp, const dt_node_t *rp,
*tp = rp_is_void ? lbase : rbase;
}
- return (compat);
+ return compat;
}
/*
@@ -1100,27 +1100,27 @@ dt_node_is_argcompat(const dt_node_t *lp, const dt_node_t *rp)
assert(rp->dn_flags & DT_NF_COOKED);
if (dt_node_is_integer(lp) && dt_node_is_integer(rp))
- return (1); /* integer types are compatible */
+ return 1; /* integer types are compatible */
if (dt_node_is_strcompat(lp) && dt_node_is_strcompat(rp))
- return (1); /* string types are compatible */
+ return 1; /* string types are compatible */
if (dt_node_is_stack(lp) && dt_node_is_stack(rp))
- return (1); /* stack types are compatible */
+ return 1; /* stack types are compatible */
if (dt_node_is_symaddr(lp) && dt_node_is_symaddr(rp))
- return (1); /* symaddr types are compatible */
+ return 1; /* symaddr types are compatible */
if (dt_node_is_usymaddr(lp) && dt_node_is_usymaddr(rp))
- return (1); /* usymaddr types are compatible */
+ return 1; /* usymaddr types are compatible */
switch (ctf_type_kind(lfp, ctf_type_resolve(lfp, lp->dn_type))) {
case CTF_K_FUNCTION:
case CTF_K_STRUCT:
case CTF_K_UNION:
- return (ctf_type_compat(lfp, lp->dn_type, rfp, rp->dn_type));
+ return ctf_type_compat(lfp, lp->dn_type, rfp, rp->dn_type);
default:
- return (dt_node_is_ptrcompat(lp, rp, NULL, NULL));
+ return dt_node_is_ptrcompat(lp, rp, NULL, NULL);
}
}
@@ -1131,15 +1131,15 @@ dt_node_is_argcompat(const dt_node_t *lp, const dt_node_t *rp)
int
dt_node_is_posconst(const dt_node_t *dnp)
{
- return (dnp->dn_kind == DT_NODE_INT && dnp->dn_value != 0 && (
- (dnp->dn_flags & DT_NF_SIGNED) == 0 || (int64_t)dnp->dn_value > 0));
+ return dnp->dn_kind == DT_NODE_INT && dnp->dn_value != 0 && (
+ (dnp->dn_flags & DT_NF_SIGNED) == 0 || (int64_t)dnp->dn_value > 0);
}
int
dt_node_is_actfunc(const dt_node_t *dnp)
{
- return (dnp->dn_kind == DT_NODE_FUNC &&
- dnp->dn_ident->di_kind == DT_IDENT_ACTFUNC);
+ return dnp->dn_kind == DT_NODE_FUNC &&
+ dnp->dn_ident->di_kind == DT_IDENT_ACTFUNC;
}
/*
@@ -1194,7 +1194,7 @@ dt_node_int(uintmax_t value)
i += 2;
}
- for (; i < sizeof (dtp->dt_ints) / sizeof (dtp->dt_ints[0]); i += n) {
+ for (; i < sizeof(dtp->dt_ints) / sizeof(dtp->dt_ints[0]); i += n) {
if (value <= dtp->dt_ints[i].did_limit) {
dt_node_type_assign(dnp,
dtp->dt_ints[i].did_ctfp,
@@ -1206,11 +1206,11 @@ dt_node_int(uintmax_t value)
*/
switch (yyintprefix) {
case '+':
- return (dt_node_op1(DT_TOK_IPOS, dnp));
+ return dt_node_op1(DT_TOK_IPOS, dnp);
case '-':
- return (dt_node_op1(DT_TOK_INEG, dnp));
+ return dt_node_op1(DT_TOK_INEG, dnp);
default:
- return (dnp);
+ return dnp;
}
}
}
@@ -1218,7 +1218,7 @@ dt_node_int(uintmax_t value)
xyerror(D_INT_OFLOW, "integer constant 0x%llx cannot be represented "
"in any built-in integral type\n", (u_longlong_t)value);
/*NOTREACHED*/
- return (NULL); /* keep gcc happy */
+ return NULL; /* keep gcc happy */
}
dt_node_t *
@@ -1235,7 +1235,7 @@ dt_node_string(char *string)
dnp->dn_string = string;
dt_node_type_assign(dnp, DT_STR_CTFP(dtp), DT_STR_TYPE(dtp));
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -1266,7 +1266,7 @@ dt_node_ident(char *name)
dnp->dn_value = inp->din_root->dn_value;
dt_node_type_propagate(inp->din_root, dnp);
- return (dnp);
+ return dnp;
}
}
@@ -1274,7 +1274,7 @@ dt_node_ident(char *name)
dnp->dn_op = name[0] == '@' ? DT_TOK_AGG : DT_TOK_IDENT;
dnp->dn_string = name;
- return (dnp);
+ return dnp;
}
/*
@@ -1317,7 +1317,7 @@ dt_node_type(dt_decl_t *ddp)
else
dt_node_attr_assign(dnp, _dtrace_typattr);
- return (dnp);
+ return dnp;
}
/*
@@ -1334,7 +1334,7 @@ dt_node_vatype(void)
dnp->dn_type = CTF_ERR;
dnp->dn_attr = _dtrace_defattr;
- return (dnp);
+ return dnp;
}
/*
@@ -1373,9 +1373,9 @@ dt_node_decl(void)
xyerror(D_DECL_USELESS, "useless declaration\n");
dt_dprintf("type %s added as id %ld\n", dt_type_name(
- ddp->dd_ctfp, ddp->dd_type, n1, sizeof (n1)), ddp->dd_type);
+ ddp->dd_ctfp, ddp->dd_type, n1, sizeof(n1)), ddp->dd_type);
- return (NULL);
+ return NULL;
}
if (strchr(dsp->ds_ident, '`') != NULL) {
@@ -1423,9 +1423,9 @@ dt_node_decl(void)
"\t current: %s\n\tprevious: %s\n",
dmp->dm_name, dsp->ds_ident,
dt_type_name(dtt.dtt_ctfp, dtt.dtt_type,
- n1, sizeof (n1)),
+ n1, sizeof(n1)),
dt_type_name(ott.dtt_ctfp, ott.dtt_type,
- n2, sizeof (n2)));
+ n2, sizeof(n2)));
} else if (!exists && dt_module_extern(dtp, dmp,
dsp->ds_ident, &dtt) == NULL) {
xyerror(D_UNKNOWN,
@@ -1435,7 +1435,7 @@ dt_node_decl(void)
dt_dprintf("extern %s`%s type=<%s>\n",
dmp->dm_name, dsp->ds_ident,
dt_type_name(dtt.dtt_ctfp, dtt.dtt_type,
- n1, sizeof (n1)));
+ n1, sizeof(n1)));
}
break;
}
@@ -1550,12 +1550,12 @@ dt_node_decl(void)
* arrays (yet); otherwise we use dt_ident_cook() on the ident
* to ensure it is fully initialized before looking at it.
*/
- memset(&idn, 0, sizeof (dt_node_t));
+ memset(&idn, 0, sizeof(dt_node_t));
if (idp != NULL && idp->di_type != CTF_ERR)
dt_node_type_assign(&idn, idp->di_ctfp, idp->di_type);
else if (idp != NULL)
- (void) dt_ident_cook(&idn, idp, NULL);
+ dt_ident_cook(&idn, idp, NULL);
if (assc) {
if (class == DT_DC_THIS) {
@@ -1575,9 +1575,9 @@ dt_node_decl(void)
"\t current: %s %s\n\tprevious: %s %s\n",
dsp->ds_ident, dt_idkind_name(idkind),
dt_type_name(dtt.dtt_ctfp,
- dtt.dtt_type, n1, sizeof (n1)),
+ dtt.dtt_type, n1, sizeof(n1)),
dt_idkind_name(idp->di_kind),
- dt_node_type_name(&idn, n2, sizeof (n2)));
+ dt_node_type_name(&idn, n2, sizeof(n2)));
} else if (idp != NULL && assc) {
const dt_idsig_t *isp = idp->di_data;
@@ -1600,9 +1600,9 @@ dt_node_decl(void)
"\tprevious: %s, key #%d of type %s\n",
dsp->ds_ident,
dt_idkind_name(idkind), argc + 1,
- dt_node_type_name(dnp, n1, sizeof (n1)),
+ dt_node_type_name(dnp, n1, sizeof(n1)),
dt_idkind_name(idp->di_kind), argc + 1,
- dt_node_type_name(pnp, n2, sizeof (n2)));
+ dt_node_type_name(pnp, n2, sizeof(n2)));
}
if (isp->dis_argc != argc) {
@@ -1612,9 +1612,9 @@ dt_node_decl(void)
"\tprevious: %s of %s, tuple length %d\n",
dsp->ds_ident, dt_idkind_name(idkind),
dt_type_name(dtt.dtt_ctfp, dtt.dtt_type,
- n1, sizeof (n1)), argc,
+ n1, sizeof(n1)), argc,
dt_idkind_name(idp->di_kind),
- dt_node_type_name(&idn, n2, sizeof (n2)),
+ dt_node_type_name(&idn, n2, sizeof(n2)),
isp->dis_argc);
}
@@ -1639,7 +1639,7 @@ dt_node_decl(void)
xyerror(D_DECL_INCOMPLETE,
"incomplete struct/union/enum %s: %s\n",
dt_type_name(dtt.dtt_ctfp, dtt.dtt_type,
- n1, sizeof (n1)), dsp->ds_ident);
+ n1, sizeof(n1)), dsp->ds_ident);
/*NOTREACHED*/
}
@@ -1683,7 +1683,7 @@ dt_node_decl(void)
free(dsp->ds_ident);
dsp->ds_ident = NULL;
- return (NULL);
+ return NULL;
}
dt_node_t *
@@ -1719,7 +1719,7 @@ dt_node_func(dt_node_t *dnp, dt_node_t *args)
dnp->dn_args = args;
dnp->dn_list = NULL;
- return (dnp);
+ return dnp;
}
/*
@@ -1740,7 +1740,7 @@ dt_node_offsetof(dt_decl_t *ddp, char *s)
uint_t kind;
name = alloca(strlen(s) + 1);
- (void) strcpy(name, s);
+ strcpy(name, s);
free(s);
err = dt_decl_type(ddp, &dtt);
@@ -1762,7 +1762,7 @@ dt_node_offsetof(dt_decl_t *ddp, char *s)
name, ctf_errmsg(ctf_errno(dtt.dtt_ctfp)));
}
- memset(&dn, 0, sizeof (dn));
+ memset(&dn, 0, sizeof(dn));
dt_node_type_assign(&dn, dtt.dtt_ctfp, ctm.ctm_type);
if (dn.dn_flags & DT_NF_BITFIELD) {
@@ -1770,7 +1770,7 @@ dt_node_offsetof(dt_decl_t *ddp, char *s)
"cannot take offset of a bit-field: %s\n", name);
}
- return (dt_node_int(ctm.ctm_offset / NBBY));
+ return dt_node_int(ctm.ctm_offset / NBBY);
}
dt_node_t *
@@ -1793,13 +1793,13 @@ dt_node_op1(int op, dt_node_t *cp)
}
/*FALLTHRU*/
case DT_TOK_IPOS:
- return (cp);
+ return cp;
case DT_TOK_BNEG:
cp->dn_value = ~cp->dn_value;
- return (cp);
+ return cp;
case DT_TOK_LNEG:
cp->dn_value = !cp->dn_value;
- return (cp);
+ return cp;
}
}
@@ -1825,7 +1825,7 @@ dt_node_op1(int op, dt_node_t *cp)
cp->dn_op = DT_TOK_INT;
cp->dn_value = size;
- return (cp);
+ return cp;
}
dnp = dt_node_alloc(DT_NODE_OP1);
@@ -1833,7 +1833,7 @@ dt_node_op1(int op, dt_node_t *cp)
dnp->dn_op = (ushort_t)op;
dnp->dn_child = cp;
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -1981,7 +1981,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
if (dnp != NULL) {
dt_node_free(lp);
dt_node_free(rp);
- return (dnp);
+ return dnp;
}
}
@@ -2001,8 +2001,8 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
if ((dstsize < srcsize) || ((lp->dn_flags & DT_NF_SIGNED) ^
(rp->dn_flags & DT_NF_SIGNED))) {
int n = dstsize < srcsize ?
- (sizeof (uint64_t) * NBBY - dstsize * NBBY) :
- (sizeof (uint64_t) * NBBY - srcsize * NBBY);
+ (sizeof(uint64_t) * NBBY - dstsize * NBBY) :
+ (sizeof(uint64_t) * NBBY - srcsize * NBBY);
rp->dn_value <<= n;
if (lp->dn_flags & DT_NF_SIGNED)
@@ -2015,7 +2015,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
dt_node_attr_assign(rp, dt_attr_min(lp->dn_attr, rp->dn_attr));
dt_node_free(lp);
- return (rp);
+ return rp;
}
/*
@@ -2028,7 +2028,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
dnp->dn_left = lp;
dnp->dn_right = rp;
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2037,7 +2037,7 @@ dt_node_op3(dt_node_t *expr, dt_node_t *lp, dt_node_t *rp)
dt_node_t *dnp;
if (expr->dn_kind == DT_NODE_INT)
- return (expr->dn_value != 0 ? lp : rp);
+ return expr->dn_value != 0 ? lp : rp;
dnp = dt_node_alloc(DT_NODE_OP3);
dnp->dn_op = DT_TOK_QUESTION;
@@ -2045,7 +2045,7 @@ dt_node_op3(dt_node_t *expr, dt_node_t *lp, dt_node_t *rp)
dnp->dn_left = lp;
dnp->dn_right = rp;
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2054,7 +2054,7 @@ dt_node_statement(dt_node_t *expr)
dt_node_t *dnp;
if (expr->dn_kind == DT_NODE_AGG)
- return (expr);
+ return expr;
if (expr->dn_kind == DT_NODE_FUNC &&
expr->dn_ident->di_kind == DT_IDENT_ACTFUNC)
@@ -2063,7 +2063,7 @@ dt_node_statement(dt_node_t *expr)
dnp = dt_node_alloc(DT_NODE_DEXPR);
dnp->dn_expr = expr;
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2077,7 +2077,7 @@ dt_node_pdesc_by_name(char *spec)
dnp = dt_node_alloc(DT_NODE_PDESC);
dnp->dn_spec = spec;
- dnp->dn_desc = malloc(sizeof (dtrace_probedesc_t));
+ dnp->dn_desc = malloc(sizeof(dtrace_probedesc_t));
if (dnp->dn_desc == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -2091,7 +2091,7 @@ dt_node_pdesc_by_name(char *spec)
free(dnp->dn_spec);
dnp->dn_spec = NULL;
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2104,7 +2104,7 @@ dt_node_pdesc_by_id(uintmax_t id)
dtrace_hdl_t *dtp = yypcb->pcb_hdl;
dt_node_t *dnp = dt_node_alloc(DT_NODE_PDESC);
- if ((dnp->dn_desc = malloc(sizeof (dtrace_probedesc_t))) == NULL)
+ if ((dnp->dn_desc = malloc(sizeof(dtrace_probedesc_t))) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
if (id > UINT_MAX) {
@@ -2123,7 +2123,7 @@ dt_node_pdesc_by_id(uintmax_t id)
(u_longlong_t)id, dtrace_errmsg(dtp, dtrace_errno(dtp)));
}
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2136,7 +2136,7 @@ dt_node_clause(dt_node_t *pdescs, dt_node_t *pred, dt_node_t *acts)
dnp->dn_acts = acts;
yybegin(YYS_CLAUSE);
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2209,13 +2209,13 @@ dt_node_inline(dt_node_t *expr)
dnp->dn_ctfp, dnp->dn_type)) == CTF_K_FORWARD) {
xyerror(D_DECL_INCOMPLETE,
"incomplete struct/union/enum %s: %s\n",
- dt_node_type_name(dnp, n, sizeof (n)), dsp->ds_ident);
+ dt_node_type_name(dnp, n, sizeof(n)), dsp->ds_ident);
}
- if ((inp = malloc(sizeof (dt_idnode_t))) == NULL)
+ if ((inp = malloc(sizeof(dt_idnode_t))) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- memset(inp, 0, sizeof (dt_idnode_t));
+ memset(inp, 0, sizeof(dt_idnode_t));
idp = dnp->dn_ident = dt_ident_create(dsp->ds_ident,
ddp->dd_kind == CTF_K_ARRAY ? DT_IDENT_ARRAY : DT_IDENT_SCALAR,
@@ -2242,7 +2242,7 @@ dt_node_inline(dt_node_t *expr)
i++; /* count up parameters for din_argv[] */
inp->din_hash = dt_idhash_create("inline args", NULL, 0, 0);
- inp->din_argv = calloc(i, sizeof (dt_ident_t *));
+ inp->din_argv = calloc(i, sizeof(dt_ident_t *));
if (inp->din_hash == NULL || inp->din_argv == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -2260,7 +2260,7 @@ dt_node_inline(dt_node_t *expr)
if (pnp->dn_string == NULL)
continue; /* ignore anonymous parameters */
- if ((pinp = malloc(sizeof (dt_idnode_t))) == NULL)
+ if ((pinp = malloc(sizeof(dt_idnode_t))) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
pidp = dt_idhash_insert(inp->din_hash, pnp->dn_string,
@@ -2274,7 +2274,7 @@ dt_node_inline(dt_node_t *expr)
}
inp->din_argv[i] = pidp;
- memset(pinp, 0, sizeof (dt_idnode_t));
+ memset(pinp, 0, sizeof(dt_idnode_t));
dt_ident_type_assign(pidp, pnp->dn_ctfp, pnp->dn_type);
}
@@ -2311,7 +2311,7 @@ dt_node_inline(dt_node_t *expr)
idp->di_attr = dt_attr_min(_dtrace_defattr, expr->dn_attr);
dt_ident_type_assign(idp, dtt.dtt_ctfp, dtt.dtt_type);
- (void) dt_ident_cook(dnp, idp, &ddp->dd_node);
+ dt_ident_cook(dnp, idp, &ddp->dd_node);
/*
* Store the parse tree nodes for 'expr' inside of idp->di_data ('inp')
@@ -2329,7 +2329,7 @@ dt_node_inline(dt_node_t *expr)
* visible, and then cook 'dnp' to check its type against 'expr'.
*/
dt_idhash_xinsert(dtp->dt_globals, idp);
- return (dt_node_cook(dnp, DT_IDFLG_REF));
+ return dt_node_cook(dnp, DT_IDFLG_REF);
}
dt_node_t *
@@ -2354,7 +2354,7 @@ dt_node_member(dt_decl_t *ddp, char *name, dt_node_t *expr)
if (ddp != NULL)
dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2382,17 +2382,17 @@ dt_node_xlator(dt_decl_t *ddp, dt_decl_t *sdp, char *name, dt_node_t *members)
longjmp(yypcb->pcb_jmpbuf, EDT_COMPILER);
}
- memset(&sn, 0, sizeof (sn));
+ memset(&sn, 0, sizeof(sn));
dt_node_type_assign(&sn, src.dtt_ctfp, src.dtt_type);
- memset(&dn, 0, sizeof (dn));
+ memset(&dn, 0, sizeof(dn));
dt_node_type_assign(&dn, dst.dtt_ctfp, dst.dtt_type);
if (dt_xlator_lookup(dtp, &sn, &dn, DT_XLATE_EXACT) != NULL) {
xyerror(D_XLATE_REDECL,
"translator from %s to %s has already been declared\n",
- dt_node_type_name(&sn, n1, sizeof (n1)),
- dt_node_type_name(&dn, n2, sizeof (n2)));
+ dt_node_type_name(&sn, n1, sizeof(n1)),
+ dt_node_type_name(&dn, n2, sizeof(n2)));
}
kind = ctf_type_kind(dst.dtt_ctfp,
@@ -2400,7 +2400,7 @@ dt_node_xlator(dt_decl_t *ddp, dt_decl_t *sdp, char *name, dt_node_t *members)
if (kind == CTF_K_FORWARD) {
xyerror(D_XLATE_SOU, "incomplete struct/union/enum %s\n",
- dt_type_name(dst.dtt_ctfp, dst.dtt_type, n1, sizeof (n1)));
+ dt_type_name(dst.dtt_ctfp, dst.dtt_type, n1, sizeof(n1)));
}
if (kind != CTF_K_STRUCT && kind != CTF_K_UNION) {
@@ -2419,7 +2419,7 @@ dt_node_xlator(dt_decl_t *ddp, dt_decl_t *sdp, char *name, dt_node_t *members)
dnp->dn_xlator = dxp;
dnp->dn_members = members;
- return (dt_node_cook(dnp, DT_IDFLG_REF));
+ return dt_node_cook(dnp, DT_IDFLG_REF);
}
dt_node_t *
@@ -2432,19 +2432,17 @@ dt_node_probe(char *s, int protoc, dt_node_t *nargs, dt_node_t *xargs)
size_t len = strlen(s) + 3; /* +3 for :: and \0 */
char *name = alloca(len);
- (void) snprintf(name, len, "::%s", s);
- (void) strhyphenate(name);
+ snprintf(name, len, "::%s", s);
+ strhyphenate(name);
free(s);
- if (strchr(name, '`') != NULL) {
+ if (strchr(name, '`') != NULL)
xyerror(D_PROV_BADNAME, "probe name may not "
"contain scoping operator: %s\n", name);
- }
- if (strlen(name) - 2 >= DTRACE_NAMELEN) {
+ if (strlen(name) - 2 >= DTRACE_NAMELEN)
xyerror(D_PROV_BADNAME, "probe name may not exceed %d "
"characters: %s\n", DTRACE_NAMELEN - 1, name);
- }
dnp = dt_node_alloc(DT_NODE_PROBE);
@@ -2472,7 +2470,7 @@ dt_node_probe(char *s, int protoc, dt_node_t *nargs, dt_node_t *xargs)
dnp->dn_ident, protoc, nargs, nargc, xargs, xargc) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2530,7 +2528,7 @@ dt_node_provider(char *name, dt_node_t *probes)
dnp->dn_provider->pv_nodes = yypcb->pcb_list;
yybegin(YYS_CLAUSE);
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2538,7 +2536,7 @@ dt_node_program(dt_node_t *lnp)
{
dt_node_t *dnp = dt_node_alloc(DT_NODE_PROG);
dnp->dn_list = lnp;
- return (dnp);
+ return dnp;
}
dt_node_t *
@@ -2611,7 +2609,7 @@ dt_xcook_ident(dt_node_t *dnp, dt_idhash_t *dhp, uint_t idkind, int create)
* If we end up calling dtrace_lookup_by_name(), it will reset the
* errno appropriately and that error will be reported instead.
*/
- (void) dt_set_errno(dtp, EDT_NOVAR);
+ dt_set_errno(dtp, EDT_NOVAR);
mark = uref ? "``" : "`";
if (scope == DTRACE_OBJ_EXEC && (
@@ -2701,10 +2699,10 @@ dt_xcook_ident(dt_node_t *dnp, dt_idhash_t *dhp, uint_t idkind, int create)
idp->di_next = dtp->dt_externs;
dtp->dt_externs = idp;
- if ((sip = malloc(sizeof (dtrace_syminfo_t))) == NULL)
+ if ((sip = malloc(sizeof(dtrace_syminfo_t))) == NULL)
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
- memcpy(sip, &dts, sizeof (dtrace_syminfo_t));
+ memcpy(sip, &dts, sizeof(dtrace_syminfo_t));
idp->di_data = sip;
idp->di_ctfp = dtt.dtt_ctfp;
idp->di_type = dtt.dtt_type;
@@ -2795,7 +2793,7 @@ dt_cook_ident(dt_node_t *dnp, uint_t idflags)
else
dt_xcook_ident(dnp, dtp->dt_globals, DT_IDENT_SCALAR, B_FALSE);
- return (dt_node_cook(dnp, idflags));
+ return dt_node_cook(dnp, idflags);
}
/*
@@ -2818,7 +2816,7 @@ dt_cook_var(dt_node_t *dnp, uint_t idflags)
}
dt_node_attr_assign(dnp, dt_ident_cook(dnp, idp, &dnp->dn_args));
- return (dnp);
+ return dnp;
}
/*ARGSUSED*/
@@ -2828,7 +2826,7 @@ dt_cook_func(dt_node_t *dnp, uint_t idflags)
dt_node_attr_assign(dnp,
dt_ident_cook(dnp, dnp->dn_ident, &dnp->dn_args));
- return (dnp);
+ return dnp;
}
static dt_node_t *
@@ -2990,7 +2988,7 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
if (dt_type_pointer(&dtt) == -1) {
xyerror(D_TYPE_ERR, "cannot find type for \"&\": %s*\n",
- dt_node_type_name(cp, n, sizeof (n)));
+ dt_node_type_name(cp, n, sizeof(n)));
}
dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
@@ -3019,7 +3017,7 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
!dt_node_is_strcompat(cp)) {
xyerror(D_STRINGOF_TYPE,
"cannot apply stringof to a value of type %s\n",
- dt_node_type_name(cp, n, sizeof (n)));
+ dt_node_type_name(cp, n, sizeof(n)));
}
dt_node_type_assign(dnp, DT_STR_CTFP(dtp), DT_STR_TYPE(dtp));
break;
@@ -3056,7 +3054,7 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
}
dt_node_attr_assign(dnp, cp->dn_attr);
- return (dnp);
+ return dnp;
}
static dt_node_t *
@@ -3222,7 +3220,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
"ambiguous use of operator %s: %s is "
"both a %s enum tag and a global %s\n",
opstr(op), rp->dn_string,
- dt_node_type_name(lp, n1, sizeof (n1)),
+ dt_node_type_name(lp, n1, sizeof(n1)),
dt_idkind_name(idp->di_kind));
}
@@ -3261,8 +3259,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
else if (dt_node_is_ptrcompat(lp, rp, NULL, NULL) == 0) {
xyerror(D_OP_INCOMPAT, "operands have "
"incompatible types: \"%s\" %s \"%s\"\n",
- dt_node_type_name(lp, n1, sizeof (n1)), opstr(op),
- dt_node_type_name(rp, n2, sizeof (n2)));
+ dt_node_type_name(lp, n1, sizeof(n1)), opstr(op),
+ dt_node_type_name(rp, n2, sizeof(n2)));
}
dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
@@ -3310,12 +3308,11 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
ctfp = dtp->dt_ddefs->dm_ctfp;
type = ctf_lookup_by_name(ctfp, "ptrdiff_t");
uref = 0;
- } else {
+ } else
xyerror(D_OP_INCOMPAT, "operands have incompatible "
"types: \"%s\" %s \"%s\"\n",
- dt_node_type_name(lp, n1, sizeof (n1)), opstr(op),
- dt_node_type_name(rp, n2, sizeof (n2)));
- }
+ dt_node_type_name(lp, n1, sizeof(n1)), opstr(op),
+ dt_node_type_name(rp, n2, sizeof(n2)));
/*
* Array bounds-checking. (Non-associative arrays only.)
@@ -3334,7 +3331,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
rp->dn_value >= r.ctr_nelems)
xyerror(D_ARR_BOUNDS, "index outside "
"array bounds: %llu, max is %i\n",
- (long long unsigned) rp->dn_value,
+ (long long unsigned)rp->dn_value,
r.ctr_nelems);
}
@@ -3455,7 +3452,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
dnp->dn_left = dnp->dn_right = NULL;
dt_node_free(dnp);
- return (lp);
+ return lp;
}
/*
@@ -3504,7 +3501,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
xyerror(D_OP_ARRFUN, "operator %s may not be "
"applied to operand of type \"%s\"\n",
opstr(op),
- dt_node_type_name(lp, n1, sizeof (n1)));
+ dt_node_type_name(lp, n1, sizeof(n1)));
}
}
@@ -3517,8 +3514,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
xyerror(D_OP_INCOMPAT,
"operands have incompatible types: \"%s\" %s \"%s\"\n",
- dt_node_type_name(lp, n1, sizeof (n1)), opstr(op),
- dt_node_type_name(rp, n2, sizeof (n2)));
+ dt_node_type_name(lp, n1, sizeof(n1)), opstr(op),
+ dt_node_type_name(rp, n2, sizeof(n2)));
/*NOTREACHED*/
case DT_TOK_ADD_EQ:
@@ -3537,8 +3534,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
if (dt_node_is_string(lp) || dt_node_is_string(rp)) {
xyerror(D_OP_INCOMPAT, "operands have "
"incompatible types: \"%s\" %s \"%s\"\n",
- dt_node_type_name(lp, n1, sizeof (n1)), opstr(op),
- dt_node_type_name(rp, n2, sizeof (n2)));
+ dt_node_type_name(lp, n1, sizeof(n1)), opstr(op),
+ dt_node_type_name(rp, n2, sizeof(n2)));
}
/*
@@ -3556,9 +3553,9 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
dt_node_is_ptrcompat(lp, rp, NULL, NULL) == 0) {
xyerror(D_OP_INCOMPAT, "operands have "
"incompatible types: \"%s\" %s \"%s\"\n",
- dt_node_type_name(lp, n1, sizeof (n1)),
+ dt_node_type_name(lp, n1, sizeof(n1)),
opstr(op),
- dt_node_type_name(rp, n2, sizeof (n2)));
+ dt_node_type_name(rp, n2, sizeof(n2)));
}
}
asgn_common:
@@ -3594,7 +3591,7 @@ asgn_common:
dnp->dn_right = dnp->dn_left; /* avoid freeing rp */
dt_node_free(dnp);
- return (rp);
+ return rp;
}
/*
@@ -3613,7 +3610,7 @@ asgn_common:
dnp->dn_right = dnp->dn_left; /* avoid freeing rp */
dt_node_free(dnp);
- return (rp);
+ return rp;
}
/*FALLTHRU*/
@@ -3666,7 +3663,7 @@ asgn_common:
* search the entire type space for the actual definition.
*/
while (kind == CTF_K_FORWARD) {
- char *tag = ctf_type_name(ctfp, type, n1, sizeof (n1));
+ char *tag = ctf_type_name(ctfp, type, n1, sizeof(n1));
dtrace_typeinfo_t dtt;
if (tag != NULL && dt_type_lookup(tag, &dtt) == 0 &&
@@ -3683,24 +3680,22 @@ asgn_common:
}
if (kind != CTF_K_STRUCT && kind != CTF_K_UNION) {
- if (op == DT_TOK_PTR) {
+ if (op == DT_TOK_PTR)
xyerror(D_OP_SOU, "operator -> cannot be "
"applied to pointer to type \"%s\"; must "
"be applied to a struct or union pointer\n",
- ctf_type_name(ctfp, type, n1, sizeof (n1)));
- } else {
+ ctf_type_name(ctfp, type, n1, sizeof(n1)));
+ else
xyerror(D_OP_SOU, "operator %s cannot be "
"applied to type \"%s\"; must be applied "
"to a struct or union\n", opstr(op),
- ctf_type_name(ctfp, type, n1, sizeof (n1)));
- }
+ ctf_type_name(ctfp, type, n1, sizeof(n1)));
}
- if (ctf_member_info(ctfp, type, rp->dn_string, &m) == CTF_ERR) {
+ if (ctf_member_info(ctfp, type, rp->dn_string, &m) == CTF_ERR)
xyerror(D_TYPE_MEMBER,
"%s is not a member of %s\n", rp->dn_string,
- ctf_type_name(ctfp, type, n1, sizeof (n1)));
- }
+ ctf_type_name(ctfp, type, n1, sizeof(n1)));
type = ctf_type_resolve(ctfp, m.ctm_type);
kind = ctf_type_kind(ctfp, type);
@@ -3751,7 +3746,7 @@ asgn_common:
dnp->dn_left = dnp->dn_right = NULL;
dt_node_free(dnp);
- return (lp);
+ return lp;
}
assert(lp->dn_kind == DT_NODE_VAR);
@@ -3806,14 +3801,14 @@ asgn_common:
assert(lp->dn_args == NULL);
lnp = dnp->dn_link;
- memcpy(dnp, lp, sizeof (dt_node_t));
+ memcpy(dnp, lp, sizeof(dt_node_t));
dnp->dn_link = lnp;
dnp->dn_args = rp;
dnp->dn_list = NULL;
dt_node_free(lp);
- return (dt_node_cook(dnp, idflags));
+ return dt_node_cook(dnp, idflags);
}
case DT_TOK_XLATE: {
@@ -3826,8 +3821,8 @@ asgn_common:
if (dxp == NULL) {
xyerror(D_XLATE_NONE,
"cannot translate from \"%s\" to \"%s\"\n",
- dt_node_type_name(rp, n1, sizeof (n1)),
- dt_node_type_name(lp, n2, sizeof (n2)));
+ dt_node_type_name(rp, n1, sizeof(n1)),
+ dt_node_type_name(lp, n2, sizeof(n2)));
}
dnp->dn_ident = dt_xlator_ident(dxp, lp->dn_ctfp, lp->dn_type);
@@ -3873,8 +3868,8 @@ asgn_common:
else {
xyerror(D_CAST_INVAL,
"invalid cast expression: \"%s\" to \"%s\"\n",
- dt_node_type_name(rp, n1, sizeof (n1)),
- dt_node_type_name(lp, n2, sizeof (n2)));
+ dt_node_type_name(rp, n1, sizeof(n1)),
+ dt_node_type_name(lp, n2, sizeof(n2)));
}
dt_node_type_propagate(lp, dnp); /* see K&R[A7.5] */
@@ -3917,7 +3912,7 @@ asgn_common:
if (rp->dn_list != NULL) {
xyerror(D_ARR_BADREF,
"cannot access %s as an associative array\n",
- dt_node_name(lp, n1, sizeof (n1)));
+ dt_node_name(lp, n1, sizeof(n1)));
}
dnp->dn_op = DT_TOK_ADD;
@@ -3935,10 +3930,10 @@ asgn_common:
pnp->dn_link = dnp->dn_link;
dnp->dn_link = pnp;
- return (dt_node_cook(pnp, DT_IDFLG_REF));
+ return dt_node_cook(pnp, DT_IDFLG_REF);
}
- return (dnp);
+ return dnp;
}
/*ARGSUSED*/
@@ -3992,7 +3987,7 @@ dt_cook_op3(dt_node_t *dnp, uint_t idflags)
dt_node_attr_assign(dnp, dt_attr_min(dnp->dn_expr->dn_attr,
dt_attr_min(lp->dn_attr, rp->dn_attr)));
- return (dnp);
+ return dnp;
}
static dt_node_t *
@@ -4001,7 +3996,7 @@ dt_cook_statement(dt_node_t *dnp, uint_t idflags)
dnp->dn_expr = dt_node_cook(dnp->dn_expr, idflags);
dt_node_attr_assign(dnp, dnp->dn_expr->dn_attr);
- return (dnp);
+ return dnp;
}
/*
@@ -4025,7 +4020,7 @@ dt_cook_aggregation(dt_node_t *dnp, uint_t idflags)
dt_node_attr_assign(dnp, dnp->dn_ident->di_attr);
}
- return (dnp);
+ return dnp;
}
/*
@@ -4084,11 +4079,11 @@ dt_cook_clause(dt_node_t *dnp, uint_t idflags)
dt_node_attr_assign(dnp, yypcb->pcb_pinfo.dtp_attr);
dnp->dn_ctxattr = yypcb->pcb_pinfo.dtp_attr;
- memcpy(ojb, yypcb->pcb_jmpbuf, sizeof (jmp_buf));
+ memcpy(ojb, yypcb->pcb_jmpbuf, sizeof(jmp_buf));
tries = 0;
if (dnp->dn_pred != NULL && (err = setjmp(yypcb->pcb_jmpbuf)) != 0) {
- memcpy(yypcb->pcb_jmpbuf, ojb, sizeof (jmp_buf));
+ memcpy(yypcb->pcb_jmpbuf, ojb, sizeof(jmp_buf));
if (tries++ != 0 || err != EDT_COMPILER || (
yypcb->pcb_hdl->dt_errtag != dt_errtag(D_IDENT_UNDEF) &&
yypcb->pcb_hdl->dt_errtag != dt_errtag(D_VAR_UNDEF)))
@@ -4101,7 +4096,7 @@ dt_cook_clause(dt_node_t *dnp, uint_t idflags)
dt_node_attr_assign(dnp,
dt_node_list_cook(&dnp->dn_acts, idflags));
- memcpy(yypcb->pcb_jmpbuf, ojb, sizeof (jmp_buf));
+ memcpy(yypcb->pcb_jmpbuf, ojb, sizeof(jmp_buf));
yylabel(NULL);
}
@@ -4129,7 +4124,7 @@ dt_cook_clause(dt_node_t *dnp, uint_t idflags)
yylabel(NULL);
}
- return (dnp);
+ return dnp;
}
/*ARGSUSED*/
@@ -4169,19 +4164,19 @@ dt_cook_inline(dt_node_t *dnp, uint_t idflags)
dnerror(dnp, D_OP_INCOMPAT,
"inline %s definition uses incompatible types: "
"\"%s\" = \"%s\"\n", dnp->dn_ident->di_name,
- dt_type_name(lctfp, ltype, n1, sizeof (n1)),
- dt_type_name(rctfp, rtype, n2, sizeof (n2)));
+ dt_type_name(lctfp, ltype, n1, sizeof(n1)),
+ dt_type_name(rctfp, rtype, n2, sizeof(n2)));
}
} else if (dt_node_is_argcompat(dnp, inp->din_root) == 0) {
dnerror(dnp, D_OP_INCOMPAT,
"inline %s definition uses incompatible types: "
"\"%s\" = \"%s\"\n", dnp->dn_ident->di_name,
- dt_node_type_name(dnp, n1, sizeof (n1)),
- dt_node_type_name(inp->din_root, n2, sizeof (n2)));
+ dt_node_type_name(dnp, n1, sizeof(n1)),
+ dt_node_type_name(inp->din_root, n2, sizeof(n2)));
}
- return (dnp);
+ return dnp;
}
static dt_node_t *
@@ -4189,7 +4184,7 @@ dt_cook_member(dt_node_t *dnp, uint_t idflags)
{
dnp->dn_membexpr = dt_node_cook(dnp->dn_membexpr, idflags);
dt_node_attr_assign(dnp, dnp->dn_membexpr->dn_attr);
- return (dnp);
+ return dnp;
}
/*ARGSUSED*/
@@ -4219,10 +4214,10 @@ dt_cook_xlator(dt_node_t *dnp, uint_t idflags)
xyerror(D_XLATE_MEMB,
"translator member %s is not a member of %s\n",
mnp->dn_membname, ctf_type_name(dxp->dx_dst_ctfp,
- dxp->dx_dst_type, n1, sizeof (n1)));
+ dxp->dx_dst_type, n1, sizeof(n1)));
}
- (void) dt_node_cook(mnp, DT_IDFLG_REF);
+ dt_node_cook(mnp, DT_IDFLG_REF);
dt_node_type_assign(mnp, dxp->dx_dst_ctfp, ctm.ctm_type);
attr = dt_attr_min(attr, mnp->dn_attr);
@@ -4231,9 +4226,9 @@ dt_cook_xlator(dt_node_t *dnp, uint_t idflags)
"translator member %s definition uses "
"incompatible types: \"%s\" = \"%s\"\n",
mnp->dn_membname,
- dt_node_type_name(mnp, n1, sizeof (n1)),
+ dt_node_type_name(mnp, n1, sizeof(n1)),
dt_node_type_name(mnp->dn_membexpr,
- n2, sizeof (n2)));
+ n2, sizeof(n2)));
}
}
@@ -4245,7 +4240,7 @@ dt_cook_xlator(dt_node_t *dnp, uint_t idflags)
dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
dt_node_attr_assign(dnp, _dtrace_defattr);
- return (dnp);
+ return dnp;
}
static void
@@ -4277,8 +4272,8 @@ dt_node_provider_cmp_argv(dt_provider_t *pvp, dt_node_t *pnp, const char *kind,
"probe %s:%s %s prototype argument #%u mismatch:\n"
"\t current: %s\n\tprevious: %s\n",
pvp->desc.dtvd_name, prp->pr_ident->di_name, kind, i + 1,
- dt_node_type_name(new_argv, n1, sizeof (n1)),
- dt_node_type_name(old_argv, n2, sizeof (n2)));
+ dt_node_type_name(new_argv, n1, sizeof(n1)),
+ dt_node_type_name(old_argv, n2, sizeof(n2)));
}
}
@@ -4351,8 +4346,8 @@ dt_cook_probe(dt_node_t *dnp, dt_provider_t *pvp)
dnerror(dnp, D_PROV_PRXLATOR, "translator for %s:%s output "
"argument #%u from %s to %s is not defined\n",
pvp->desc.dtvd_name, dnp->dn_ident->di_name, i + 1,
- dt_node_type_name(nnp, n1, sizeof (n1)),
- dt_node_type_name(xnp, n2, sizeof (n2)));
+ dt_node_type_name(nnp, n1, sizeof(n1)),
+ dt_node_type_name(xnp, n2, sizeof(n2)));
}
}
@@ -4393,14 +4388,14 @@ dt_cook_provider(dt_node_t *dnp, uint_t idflags)
dt_cook_probe(pnp, pvp);
}
- return (dnp);
+ return dnp;
}
/*ARGSUSED*/
static dt_node_t *
dt_cook_none(dt_node_t *dnp, uint_t idflags)
{
- return (dnp);
+ return dnp;
}
static dt_node_t *(*dt_cook_funcs[])(dt_node_t *, uint_t) = {
@@ -4448,7 +4443,7 @@ dt_node_cook(dt_node_t *dnp, uint_t idflags)
dnp->dn_ident->di_flags |= idflags;
yylineno = oldlineno;
- return (dnp);
+ return dnp;
}
dtrace_attribute_t
@@ -4465,7 +4460,7 @@ dt_node_list_cook(dt_node_t **pnp, uint_t idflags)
pnp = &dnp->dn_list;
}
- return (attr);
+ return attr;
}
void
@@ -4507,15 +4502,15 @@ dt_node_link(dt_node_t *lp, dt_node_t *rp)
dt_node_t *dnp;
if (lp == NULL)
- return (rp);
+ return rp;
else if (rp == NULL)
- return (lp);
+ return lp;
for (dnp = lp; dnp->dn_list != NULL; dnp = dnp->dn_list)
continue;
dnp->dn_list = rp;
- return (lp);
+ return lp;
}
/*
@@ -4550,74 +4545,73 @@ dt_node_printr(dt_node_t *dnp, FILE *fp, int depth)
dt_node_t *arg;
char *s;
- (void) fprintf(fp, "%*s", depth * 2, "");
- (void) dt_attr_str(dnp->dn_attr, a, sizeof (a));
+ fprintf(fp, "%*s", depth * 2, "");
+ dt_attr_str(dnp->dn_attr, a, sizeof(a));
if (dnp->dn_ctfp != NULL && dnp->dn_type != CTF_ERR &&
- ctf_type_name(dnp->dn_ctfp, dnp->dn_type, n, sizeof (n)) != NULL) {
- (void) snprintf(buf, BUFSIZ, "type=<%s> attr=%s flags=", n, a);
- } else {
- (void) snprintf(buf, BUFSIZ, "type=<%ld> attr=%s flags=",
+ ctf_type_name(dnp->dn_ctfp, dnp->dn_type, n, sizeof(n)) != NULL)
+ snprintf(buf, BUFSIZ, "type=<%s> attr=%s flags=", n, a);
+ else
+ snprintf(buf, BUFSIZ, "type=<%ld> attr=%s flags=",
dnp->dn_type, a);
- }
if (dnp->dn_flags != 0) {
n[0] = '\0';
if (dnp->dn_flags & DT_NF_SIGNED)
- (void) strcat(n, ",SIGN");
+ strcat(n, ",SIGN");
if (dnp->dn_flags & DT_NF_COOKED)
- (void) strcat(n, ",COOK");
+ strcat(n, ",COOK");
if (dnp->dn_flags & DT_NF_REF)
- (void) strcat(n, ",REF");
+ strcat(n, ",REF");
if (dnp->dn_flags & DT_NF_LVALUE)
- (void) strcat(n, ",LVAL");
+ strcat(n, ",LVAL");
if (dnp->dn_flags & DT_NF_WRITABLE)
- (void) strcat(n, ",WRITE");
+ strcat(n, ",WRITE");
if (dnp->dn_flags & DT_NF_BITFIELD)
- (void) strcat(n, ",BITF");
+ strcat(n, ",BITF");
if (dnp->dn_flags & DT_NF_USERLAND)
- (void) strcat(n, ",USER");
- (void) strcat(buf, n + 1);
+ strcat(n, ",USER");
+ strcat(buf, n + 1);
} else
- (void) strcat(buf, "0");
+ strcat(buf, "0");
switch (dnp->dn_kind) {
case DT_NODE_FREE:
- (void) fprintf(fp, "FREE <node %p>\n", (void *)dnp);
+ fprintf(fp, "FREE <node %p>\n", (void *)dnp);
break;
case DT_NODE_INT:
- (void) fprintf(fp, "INT 0x%llx (%s)\n",
+ fprintf(fp, "INT 0x%llx (%s)\n",
(u_longlong_t)dnp->dn_value, buf);
break;
case DT_NODE_STRING:
s = strchr2esc(dnp->dn_string, strlen(dnp->dn_string));
- (void) fprintf(fp, "STRING \"%s\" (%s)\n", s, buf);
+ fprintf(fp, "STRING \"%s\" (%s)\n", s, buf);
free(s);
break;
case DT_NODE_IDENT:
- (void) fprintf(fp, "IDENT %s (%s)\n", dnp->dn_string, buf);
+ fprintf(fp, "IDENT %s (%s)\n", dnp->dn_string, buf);
break;
case DT_NODE_VAR:
- (void) fprintf(fp, "VARIABLE %s%s (%s)\n",
+ fprintf(fp, "VARIABLE %s%s (%s)\n",
(dnp->dn_ident->di_flags & DT_IDFLG_LOCAL) ? "this->" :
(dnp->dn_ident->di_flags & DT_IDFLG_TLS) ? "self->" : "",
dnp->dn_ident->di_name, buf);
if (dnp->dn_args != NULL)
- (void) fprintf(fp, "%*s[\n", depth * 2, "");
+ fprintf(fp, "%*s[\n", depth * 2, "");
for (arg = dnp->dn_args; arg != NULL; arg = arg->dn_list) {
dt_node_printr(arg, fp, depth + 1);
if (arg->dn_list != NULL)
- (void) fprintf(fp, "%*s,\n", depth * 2, "");
+ fprintf(fp, "%*s,\n", depth * 2, "");
}
if (dnp->dn_args != NULL)
- (void) fprintf(fp, "%*s]\n", depth * 2, "");
+ fprintf(fp, "%*s]\n", depth * 2, "");
break;
case DT_NODE_SYM:
@@ -4626,72 +4620,70 @@ dt_node_printr(dt_node_t *dnp, FILE *fp, int depth)
break;
case DT_NODE_TYPE:
- if (dnp->dn_string != NULL) {
- (void) fprintf(fp, "TYPE (%s) %s\n",
- buf, dnp->dn_string);
- } else
- (void) fprintf(fp, "TYPE (%s)\n", buf);
+ if (dnp->dn_string != NULL)
+ fprintf(fp, "TYPE (%s) %s\n", buf, dnp->dn_string);
+ else
+ fprintf(fp, "TYPE (%s)\n", buf);
break;
case DT_NODE_FUNC:
- (void) fprintf(fp, "FUNC %s (%s)\n",
- dnp->dn_ident->di_name, buf);
+ fprintf(fp, "FUNC %s (%s)\n", dnp->dn_ident->di_name, buf);
for (arg = dnp->dn_args; arg != NULL; arg = arg->dn_list) {
dt_node_printr(arg, fp, depth + 1);
if (arg->dn_list != NULL)
- (void) fprintf(fp, "%*s,\n", depth * 2, "");
+ fprintf(fp, "%*s,\n", depth * 2, "");
}
break;
case DT_NODE_OP1:
- (void) fprintf(fp, "OP1 %s (%s)\n", opstr(dnp->dn_op), buf);
+ fprintf(fp, "OP1 %s (%s)\n", opstr(dnp->dn_op), buf);
dt_node_printr(dnp->dn_child, fp, depth + 1);
break;
case DT_NODE_OP2:
- (void) fprintf(fp, "OP2 %s (%s)\n", opstr(dnp->dn_op), buf);
+ fprintf(fp, "OP2 %s (%s)\n", opstr(dnp->dn_op), buf);
dt_node_printr(dnp->dn_left, fp, depth + 1);
dt_node_printr(dnp->dn_right, fp, depth + 1);
break;
case DT_NODE_OP3:
- (void) fprintf(fp, "OP3 (%s)\n", buf);
+ fprintf(fp, "OP3 (%s)\n", buf);
dt_node_printr(dnp->dn_expr, fp, depth + 1);
- (void) fprintf(fp, "%*s?\n", depth * 2, "");
+ fprintf(fp, "%*s?\n", depth * 2, "");
dt_node_printr(dnp->dn_left, fp, depth + 1);
- (void) fprintf(fp, "%*s:\n", depth * 2, "");
+ fprintf(fp, "%*s:\n", depth * 2, "");
dt_node_printr(dnp->dn_right, fp, depth + 1);
break;
case DT_NODE_DEXPR:
- (void) fprintf(fp, "D EXPRESSION attr=%s\n", a);
+ fprintf(fp, "D EXPRESSION attr=%s\n", a);
dt_node_printr(dnp->dn_expr, fp, depth + 1);
break;
case DT_NODE_DFUNC:
- (void) fprintf(fp, "D PRODUCER attr=%s\n", a);
+ fprintf(fp, "D PRODUCER attr=%s\n", a);
dt_node_printr(dnp->dn_expr, fp, depth + 1);
break;
case DT_NODE_AGG:
- (void) fprintf(fp, "AGGREGATE @%s attr=%s [\n",
+ fprintf(fp, "AGGREGATE @%s attr=%s [\n",
dnp->dn_ident->di_name, a);
for (arg = dnp->dn_aggtup; arg != NULL; arg = arg->dn_list) {
dt_node_printr(arg, fp, depth + 1);
if (arg->dn_list != NULL)
- (void) fprintf(fp, "%*s,\n", depth * 2, "");
+ fprintf(fp, "%*s,\n", depth * 2, "");
}
if (dnp->dn_aggfun) {
- (void) fprintf(fp, "%*s] = ", depth * 2, "");
+ fprintf(fp, "%*s] = ", depth * 2, "");
dt_node_printr(dnp->dn_aggfun, fp, depth + 1);
} else
- (void) fprintf(fp, "%*s]\n", depth * 2, "");
+ fprintf(fp, "%*s]\n", depth * 2, "");
if (dnp->dn_aggfun)
- (void) fprintf(fp, "%*s)\n", depth * 2, "");
+ fprintf(fp, "%*s)\n", depth * 2, "");
break;
case DT_NODE_PDESC:
@@ -4701,21 +4693,21 @@ dt_node_printr(dt_node_t *dnp, FILE *fp, int depth)
break;
case DT_NODE_CLAUSE:
- (void) fprintf(fp, "CLAUSE attr=%s\n", a);
+ fprintf(fp, "CLAUSE attr=%s\n", a);
for (arg = dnp->dn_pdescs; arg != NULL; arg = arg->dn_list)
dt_node_printr(arg, fp, depth + 1);
- (void) fprintf(fp, "%*sCTXATTR %s\n", depth * 2, "",
- dt_attr_str(dnp->dn_ctxattr, a, sizeof (a)));
+ fprintf(fp, "%*sCTXATTR %s\n", depth * 2, "",
+ dt_attr_str(dnp->dn_ctxattr, a, sizeof(a)));
if (dnp->dn_pred != NULL) {
- (void) fprintf(fp, "%*sPREDICATE /\n", depth * 2, "");
+ fprintf(fp, "%*sPREDICATE /\n", depth * 2, "");
dt_node_printr(dnp->dn_pred, fp, depth + 1);
- (void) fprintf(fp, "%*s/\n", depth * 2, "");
+ fprintf(fp, "%*s/\n", depth * 2, "");
}
- (void) fprintf(fp, "%*sACTION\n", depth * 2, "");
+ fprintf(fp, "%*sACTION\n", depth * 2, "");
for (arg = dnp->dn_acts; arg != NULL; arg = arg->dn_list)
dt_node_printr(arg, fp, depth + 1);
break;
@@ -4723,57 +4715,57 @@ dt_node_printr(dt_node_t *dnp, FILE *fp, int depth)
case DT_NODE_INLINE:
inp = dnp->dn_ident->di_iarg;
- (void) fprintf(fp, "INLINE %s (%s)\n",
+ fprintf(fp, "INLINE %s (%s)\n",
dnp->dn_ident->di_name, buf);
dt_node_printr(inp->din_root, fp, depth + 1);
break;
case DT_NODE_MEMBER:
- (void) fprintf(fp, "MEMBER %s (%s)\n", dnp->dn_membname, buf);
+ fprintf(fp, "MEMBER %s (%s)\n", dnp->dn_membname, buf);
if (dnp->dn_membexpr)
dt_node_printr(dnp->dn_membexpr, fp, depth + 1);
break;
case DT_NODE_XLATOR:
- (void) fprintf(fp, "XLATOR (%s)", buf);
+ fprintf(fp, "XLATOR (%s)", buf);
if (ctf_type_name(dnp->dn_xlator->dx_src_ctfp,
- dnp->dn_xlator->dx_src_type, n, sizeof (n)) != NULL)
- (void) fprintf(fp, " from <%s>", n);
+ dnp->dn_xlator->dx_src_type, n, sizeof(n)) != NULL)
+ fprintf(fp, " from <%s>", n);
if (ctf_type_name(dnp->dn_xlator->dx_dst_ctfp,
- dnp->dn_xlator->dx_dst_type, n, sizeof (n)) != NULL)
- (void) fprintf(fp, " to <%s>", n);
+ dnp->dn_xlator->dx_dst_type, n, sizeof(n)) != NULL)
+ fprintf(fp, " to <%s>", n);
- (void) fprintf(fp, "\n");
+ fprintf(fp, "\n");
for (arg = dnp->dn_members; arg != NULL; arg = arg->dn_list)
dt_node_printr(arg, fp, depth + 1);
break;
case DT_NODE_PROBE:
- (void) fprintf(fp, "PROBE %s\n", dnp->dn_ident->di_name);
+ fprintf(fp, "PROBE %s\n", dnp->dn_ident->di_name);
break;
case DT_NODE_PROVIDER:
- (void) fprintf(fp, "PROVIDER %s (%s)\n",
+ fprintf(fp, "PROVIDER %s (%s)\n",
dnp->dn_provname, dnp->dn_provred ? "redecl" : "decl");
for (arg = dnp->dn_probes; arg != NULL; arg = arg->dn_list)
dt_node_printr(arg, fp, depth + 1);
break;
case DT_NODE_PROG:
- (void) fprintf(fp, "PROGRAM attr=%s\n", a);
+ fprintf(fp, "PROGRAM attr=%s\n", a);
for (arg = dnp->dn_list; arg != NULL; arg = arg->dn_list)
dt_node_printr(arg, fp, depth + 1);
break;
case DT_NODE_TRAMPOLINE:
- (void) fprintf(fp, "TRAMPOLINE %s\n", dnp->dn_ident->di_name);
+ fprintf(fp, "TRAMPOLINE %s\n", dnp->dn_ident->di_name);
break;
default:
- (void) fprintf(fp, "<bad node %p, kind %d>\n",
+ fprintf(fp, "<bad node %p, kind %d>\n",
(void *)dnp, dnp->dn_kind);
}
}
@@ -4782,7 +4774,7 @@ int
dt_node_root(dt_node_t *dnp)
{
yypcb->pcb_root = dnp;
- return (0);
+ return 0;
}
/*PRINTFLIKE3*/
@@ -4895,16 +4887,16 @@ yyvwarn(const char *format, va_list ap)
dtrace_hdl_t *dtp = yypcb->pcb_hdl;
size_t len = strlen(dtp->dt_errmsg);
char *p, *s = dtp->dt_errmsg + len;
- size_t n = sizeof (dtp->dt_errmsg) - len;
+ size_t n = sizeof(dtp->dt_errmsg) - len;
if (yytext[0] == '\0')
- (void) snprintf(s, n, " near end of input");
+ snprintf(s, n, " near end of input");
else if (yytext[0] == '\n')
- (void) snprintf(s, n, " near end of line");
+ snprintf(s, n, " near end of line");
else {
if ((p = strchr(yytext, '\n')) != NULL)
*p = '\0'; /* crop at newline */
- (void) snprintf(s, n, " near \"%s\"", yytext);
+ snprintf(s, n, " near \"%s\"", yytext);
}
}
}
@@ -4919,5 +4911,5 @@ yylabel(const char *label)
int
yywrap(void)
{
- return (1); /* indicate that lex should return a zero token for EOF */
+ return 1; /* indicate that lex should return a zero token for EOF */
}
diff --git a/libdtrace/dt_pcap.c b/libdtrace/dt_pcap.c
index cafed049..484816de 100644
--- a/libdtrace/dt_pcap.c
+++ b/libdtrace/dt_pcap.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -46,10 +46,10 @@ dt_pcap_create(dtrace_hdl_t *dtp, const char *filename, uint32_t maxlen)
dt_pcap_t *dpc;
struct sysinfo info;
- dpc = dt_zalloc(dtp, sizeof (dt_pcap_t));
+ dpc = dt_zalloc(dtp, sizeof(dt_pcap_t));
if (dpc == NULL) {
- (void) dt_set_errno(dtp, ENOMEM);
- return (NULL);
+ dt_set_errno(dtp, ENOMEM);
+ return NULL;
}
dpc->dpc_filename = strdup(filename);
@@ -65,9 +65,9 @@ dt_pcap_create(dtrace_hdl_t *dtp, const char *filename, uint32_t maxlen)
*/
if (sysinfo(&info) == 0)
dpc->dpc_boottime = time(NULL) - info.uptime;
- (void) pthread_mutex_init(&dpc->dpc_lock, NULL);
+ pthread_mutex_init(&dpc->dpc_lock, NULL);
dt_list_append(&dtp->dt_pcap.dt_pcaps, dpc);
- return (dpc);
+ return dpc;
}
void
@@ -118,7 +118,7 @@ dt_pcap_print(void *d)
if (inpipe == NULL) {
fprintf(stderr, "Cannot open tshark output pipe: %s\n",
strerror(errno));
- return (NULL);
+ return NULL;
}
while (getline(&line, &len, inpipe) >= 0) {
@@ -128,7 +128,7 @@ dt_pcap_print(void *d)
free(line);
fclose(inpipe);
dtp->dt_pcap.dt_pcap_pid = -1;
- return (NULL);
+ return NULL;
}
/*
@@ -155,7 +155,7 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
if (dtp->dt_freopen_filename != NULL &&
strcmp(dtp->dt_freopen_filename, DT_FREOPEN_RESTORE) != 0)
- return (dtp->dt_freopen_filename);
+ return dtp->dt_freopen_filename;
if (dtp->dt_pcap.dt_pcap_pid < 0) {
/*
@@ -164,11 +164,11 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
* the caller falling back to using tracemem() output of
* captured data.
*/
- return (NULL);
+ return NULL;
} else if (dtp->dt_pcap.dt_pcap_pid > 0) {
/* tshark is running, return the magic we-are-using-a-pipe
* value. */
- return ("");
+ return "";
}
/*
@@ -182,10 +182,10 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
*/
status = system("tshark -v >/dev/null 2>&1");
if (status < 0 || WEXITSTATUS(status) != 0)
- return (NULL);
+ return NULL;
if (pipe(pipe_in) < 0)
- return (NULL);
+ return NULL;
if (pipe(pipe_out) < 0)
goto fail_pipe_in;
@@ -210,7 +210,7 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
* present and almost certainly does not contain any files that may be
* confused with startup files.
*
- * Forcibly switch uid to (uid_t) -3 to try to get out from all
+ * Forcibly switch uid to (uid_t)-3 to try to get out from all
* privilege, since tshark is a nest of security vulnerabilities. (We
* use -3 because -1 is nobody, which can have files "owned" by it on
* NFS clients, and avoid -2 because other people have thought of this
@@ -278,7 +278,7 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
struct group wsg;
struct group *dummy;
char groups[1024];
- gid_t wireshark_group = (gid_t) UNPRIV_UID;
+ gid_t wireshark_group = (gid_t)UNPRIV_UID;
if (getgrnam_r(DUMPCAP_GROUP, &wsg, groups, 1024, &dummy) >= 0) {
wireshark_group = wsg.gr_gid;
@@ -290,7 +290,7 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
goto nopriv_die;
if (setgroups(1, &wireshark_group) < 0)
goto nopriv_die;
- if (setuid((uid_t) UNPRIV_UID) < 0)
+ if (setuid((uid_t)UNPRIV_UID) < 0)
goto nopriv_die;
}
@@ -358,7 +358,7 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
dt_pcap_print, dtp) < 0)
goto fail_pipe_close_wait;
- return ("");
+ return "";
fail_pipe_close_wait:
/*
@@ -370,7 +370,7 @@ dt_pcap_filename(dtrace_hdl_t *dtp, FILE *fp)
close(pipe_out[0]);
waitpid(pid, NULL, 0);
dtp->dt_pcap.dt_pcap_pid = -1;
- return (NULL);
+ return NULL;
}
}
@@ -383,7 +383,7 @@ fail_pipe_out:
fail_pipe_in:
close(pipe_in[0]);
close(pipe_in[1]);
- return (NULL);
+ return NULL;
}
void
@@ -410,7 +410,7 @@ dt_pcap_dump(dtrace_hdl_t *dtp, const char *filename, uint64_t linktype,
dpc->dpc_pcap = pcap_open_dead((int)linktype,
(int)dpc->dpc_maxlen);
if (dpc->dpc_pcap == NULL) {
- (void) dt_set_errno(dtp, EINVAL);
+ dt_set_errno(dtp, EINVAL);
return;
}
@@ -430,7 +430,7 @@ dt_pcap_dump(dtrace_hdl_t *dtp, const char *filename, uint64_t linktype,
close(fd);
dt_dprintf("Cannot connect pipe: "
"%s\n", strerror(errno));
- (void) dt_set_errno(dtp, errno);
+ dt_set_errno(dtp, errno);
pcap_close(dpc->dpc_pcap);
dpc->dpc_pcap = NULL;
return;
@@ -444,7 +444,7 @@ dt_pcap_dump(dtrace_hdl_t *dtp, const char *filename, uint64_t linktype,
/* Handle linktype mismatch here... */
dt_dprintf("pcap() expected linktype %lu, got %lu.\n",
dpc->dpc_linktype, linktype);
- (void) dt_set_errno(dtp, EINVAL);
+ dt_set_errno(dtp, EINVAL);
return;
}
@@ -460,9 +460,9 @@ dt_pcap_dump(dtrace_hdl_t *dtp, const char *filename, uint64_t linktype,
* Reset SIGPIPE here, to avoid SIGPIPEs if tshark dies before we do.
*/
- memset(&act, 0, sizeof (act));
+ memset(&act, 0, sizeof(act));
act.sa_handler = SIG_IGN;
- (void) sigaction(SIGPIPE, &act, &oact);
+ sigaction(SIGPIPE, &act, &oact);
pthread_mutex_lock(&dpc->dpc_lock);
pcap_dump((uchar_t *)dpc->dpc_pcap_dump, &hdr, data);
@@ -474,5 +474,5 @@ dt_pcap_dump(dtrace_hdl_t *dtp, const char *filename, uint64_t linktype,
if (dtp->dt_pcap.dt_pcap_pid > 0)
pcap_dump_flush(dpc->dpc_pcap_dump);
pthread_mutex_unlock(&dpc->dpc_lock);
- (void) sigaction(SIGCHLD, &oact, NULL);
+ sigaction(SIGCHLD, &oact, NULL);
}
diff --git a/libdtrace/dt_pcb.c b/libdtrace/dt_pcb.c
index 7a42c013..db12d011 100644
--- a/libdtrace/dt_pcb.c
+++ b/libdtrace/dt_pcb.c
@@ -52,7 +52,7 @@ dt_pcb_push(dtrace_hdl_t *dtp, dt_pcb_t *pcb)
assert(yypcb->pcb_yystate == YYS_DONE);
}
- memset(pcb, 0, sizeof (dt_pcb_t));
+ memset(pcb, 0, sizeof(dt_pcb_t));
dt_scope_create(&pcb->pcb_dstack);
dt_idstack_push(&pcb->pcb_globals, dtp->dt_globals);
@@ -76,7 +76,7 @@ dt_pcb_pop_ident(dt_idhash_t *dhp, dt_ident_t *idp, void *arg)
if (idp->di_gen == dtp->dt_gen)
dt_idhash_delete(dhp, idp);
- return (0);
+ return 0;
}
/*
@@ -94,7 +94,7 @@ dt_pcb_pop(dtrace_hdl_t *dtp, int err)
assert(pcb == dtp->dt_pcb);
while (pcb->pcb_dstack.ds_next != NULL)
- (void) dt_scope_pop();
+ dt_scope_pop();
dt_scope_destroy(&pcb->pcb_dstack);
dt_irlist_destroy(&pcb->pcb_ir);
@@ -125,17 +125,17 @@ dt_pcb_pop(dtrace_hdl_t *dtp, int err)
dt_provider_destroy(dtp, pvp);
}
- (void) dt_idhash_iter(dtp->dt_aggs, dt_pcb_pop_ident, dtp);
+ dt_idhash_iter(dtp->dt_aggs, dt_pcb_pop_ident, dtp);
dt_idhash_update(dtp->dt_aggs);
- (void) dt_idhash_iter(dtp->dt_globals, dt_pcb_pop_ident, dtp);
+ dt_idhash_iter(dtp->dt_globals, dt_pcb_pop_ident, dtp);
dt_idhash_update(dtp->dt_globals);
- (void) dt_idhash_iter(dtp->dt_tls, dt_pcb_pop_ident, dtp);
+ dt_idhash_iter(dtp->dt_tls, dt_pcb_pop_ident, dtp);
dt_idhash_update(dtp->dt_tls);
- (void) ctf_discard(dtp->dt_cdefs->dm_ctfp);
- (void) ctf_discard(dtp->dt_ddefs->dm_ctfp);
+ ctf_discard(dtp->dt_cdefs->dm_ctfp);
+ ctf_discard(dtp->dt_ddefs->dm_ctfp);
}
if (pcb->pcb_pragmas != NULL)
@@ -157,6 +157,6 @@ dt_pcb_pop(dtrace_hdl_t *dtp, int err)
free(pcb->pcb_sflagv);
dtp->dt_pcb = pcb->pcb_prev;
- memset(pcb, 0, sizeof (dt_pcb_t));
+ memset(pcb, 0, sizeof(dt_pcb_t));
yyinit(dtp->dt_pcb);
}
diff --git a/libdtrace/dt_pid.c b/libdtrace/dt_pid.c
index f61a541e..091108ba 100644
--- a/libdtrace/dt_pid.c
+++ b/libdtrace/dt_pid.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -73,7 +73,7 @@ dt_pid_error(dtrace_hdl_t *dtp, dt_pcb_t *pcb, dt_proc_t *dpr,
va_start(ap, fmt);
if (pcb == NULL) {
assert(dpr != NULL);
- len = vsnprintf(dpr->dpr_errmsg, sizeof (dpr->dpr_errmsg),
+ len = vsnprintf(dpr->dpr_errmsg, sizeof(dpr->dpr_errmsg),
fmt, ap);
assert(len >= 2);
if (dpr->dpr_errmsg[len - 2] == '\n')
@@ -84,7 +84,7 @@ dt_pid_error(dtrace_hdl_t *dtp, dt_pcb_t *pcb, dt_proc_t *dpr,
}
va_end(ap);
- return (1);
+ return 1;
}
static int
@@ -100,7 +100,7 @@ dt_pid_create_fbt_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
/* Create a probe using 'ftp'. */
- return (1);
+ return 1;
}
static int
@@ -116,7 +116,7 @@ dt_pid_create_glob_offset_probes(struct ps_prochandle *P, dtrace_hdl_t *dtp,
/* Create a probe using 'ftp'. */
- return (1);
+ return 1;
}
static int
@@ -143,7 +143,7 @@ dt_pid_per_sym(dt_pid_probe_t *pp, const GElf_Sym *symp, const char *func)
dt_dprintf("creating probe pid%d:%s:%s:%s at %lx\n", (int)pid,
pp->dpp_obj, func, pp->dpp_name, symp->st_value);
- sz = sizeof (fasttrap_probe_spec_t) + strlen(pp->dpp_name);
+ sz = sizeof(fasttrap_probe_spec_t) + strlen(pp->dpp_name);
if ((ftp = dt_zalloc(dtp, sz)) == NULL) {
dt_dprintf("proc_per_sym: dt_alloc(%lu) failed\n", sz);
@@ -151,7 +151,7 @@ dt_pid_per_sym(dt_pid_probe_t *pp, const GElf_Sym *symp, const char *func)
}
ftp->ftps_pid = pid;
- strcpy_safe(ftp->ftps_func, sizeof (ftp->ftps_func), func);
+ strcpy_safe(ftp->ftps_func, sizeof(ftp->ftps_func), func);
ftp->ftps_mod = dt_pid_objname(pp->dpp_lmid, pp->dpp_obj);
@@ -237,11 +237,11 @@ dt_pid_sym_filt(void *arg, const GElf_Sym *symp, const char *func)
dt_pid_probe_t *pp = arg;
if (symp->st_shndx == SHN_UNDEF)
- return (0);
+ return 0;
if (symp->st_size == 0) {
dt_dprintf("st_size of %s is zero\n", func);
- return (0);
+ return 0;
}
if (pp->dpp_last_taken == 0 ||
@@ -255,15 +255,15 @@ dt_pid_sym_filt(void *arg, const GElf_Sym *symp, const char *func)
* specify them explicitly.
*/
if (strcmp(func, "_init") == 0 || strcmp(func, "_fini") == 0)
- return (0);
+ return 0;
if ((pp->dpp_last_taken = gmatch(func, pp->dpp_func)) != 0) {
pp->dpp_last = *symp;
- return (dt_pid_per_sym(pp, symp, func));
+ return dt_pid_per_sym(pp, symp, func);
}
}
- return (0);
+ return 0;
}
static int
@@ -412,7 +412,7 @@ dt_pid_mod_filt(void *arg, const prmap_t *pmp, const char *obj)
pp->dpp_obj++;
if (gmatch(pp->dpp_obj, pp->dpp_mod))
- return (dt_pid_per_mod(pp, pmp, obj));
+ return dt_pid_per_mod(pp, pmp, obj);
dt_Plmid(pp->dpp_dtp, Pgetpid(dpr->dpr_proc), pmp->pr_vaddr,
&pp->dpp_lmid);
@@ -443,23 +443,22 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, pid_t pid)
if (strlen(pdp->mod) < 3 || strncmp(pdp->mod, "LM", 2) != 0 ||
!isdigit(pdp->mod[2]))
- return (NULL);
+ return NULL;
lmid = strtoul(&pdp->mod[2], &end, 16);
obj = end + 1;
if (*end != '`' || strchr(obj, '`') != NULL)
- return (NULL);
+ return NULL;
- } else {
+ } else
obj = pdp->mod;
- }
if ((pmp = dt_Plmid_to_map(dtp, pid, lmid, obj)) == NULL)
- return (NULL);
+ return NULL;
- dt_Pobjname(dtp, pid, pmp->pr_vaddr, m, sizeof (m));
+ dt_Pobjname(dtp, pid, pmp->pr_vaddr, m, sizeof(m));
if ((obj = strrchr(m, '/')) == NULL)
obj = &m[0];
else
@@ -468,7 +467,7 @@ dt_pid_fix_mod(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, pid_t pid)
dt_Plmid(dtp, pid, pmp->pr_vaddr, &lmid);
pdp->mod = dt_pid_objname(lmid, obj);
- return (pmp);
+ return pmp;
}
static int
@@ -519,15 +518,15 @@ dt_pid_create_pid_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp,
(aout = dt_Pname_to_map(dtp, pid, "a.out")) == NULL ||
(pmp = dt_Pname_to_map(dtp, pid, pp.dpp_mod)) == NULL ||
aout->pr_vaddr != pmp->pr_vaddr) {
- return (dt_pid_error(dtp, pcb, dpr, D_PROC_LIB,
+ return dt_pid_error(dtp, pcb, dpr, D_PROC_LIB,
"only the a.out module is valid with the "
- "'-' function"));
+ "'-' function");
}
if (strisglob(pp.dpp_name)) {
- return (dt_pid_error(dtp, pcb, dpr, D_PROC_NAME,
+ return dt_pid_error(dtp, pcb, dpr, D_PROC_NAME,
"only individual addresses may be specified "
- "with the '-' function"));
+ "with the '-' function");
}
}
@@ -557,7 +556,7 @@ dt_pid_create_pid_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp,
}
}
- return (ret);
+ return ret;
}
#if 0
@@ -594,8 +593,8 @@ dt_pid_usdt_mapping(void *data, const prmap_t *pmp, const char *oname)
dt_dprintf("lookup of %s succeeded for %s\n", syms[i], mname);
if (dt_Pread(dpr->dpr_hdl, dpr->dpr_pid, &e_type,
- sizeof (e_type), pmp->pr_vaddr + offsetof(Elf64_Ehdr,
- e_type)) != sizeof (e_type)) {
+ sizeof(e_type), pmp->pr_vaddr + offsetof(Elf64_Ehdr,
+ e_type)) != sizeof(e_type)) {
dt_dprintf("read of ELF header failed");
continue;
}
@@ -607,16 +606,16 @@ dt_pid_usdt_mapping(void *data, const prmap_t *pmp, const char *oname)
(fd = pr_open(dpr->dpr_proc, "/dev/dtrace/helper", O_RDWR, 0)) < 0) {
dt_dprintf("pr_open of helper device failed: %s\n",
strerror(errno));
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
}
- if (pr_ioctl(P.P, fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0)
+ if (pr_ioctl(P.P, fd, DTRACEHIOC_ADDDOF, &dh, sizeof(dh)) < 0)
dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod);
}
if (fd != -1)
- (void) pr_close(P.P, fd);
+ pr_close(P.P, fd);
- return (0);
+ return 0;
}
static int
@@ -639,7 +638,7 @@ dt_pid_create_usdt_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp,
*/
dt_pid_fix_mod(pdp, dtp, dpr->dpr_pid);
- return (ret);
+ return ret;
}
#endif
@@ -685,16 +684,16 @@ dt_pid_create_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, dt_pcb_t *pcb)
assert(pcb != NULL);
if ((pid = dt_pid_get_pid(pdp, dtp, pcb, NULL)) == -1)
- return (-1);
+ return -1;
- snprintf(provname, sizeof (provname), "pid%d", (int)pid);
+ snprintf(provname, sizeof(provname), "pid%d", (int)pid);
if (gmatch(provname, pdp->prv) != 0) {
pid = dt_proc_grab_lock(dtp, pid, DTRACE_PROC_WAITING);
if (pid < 0) {
dt_pid_error(dtp, pcb, NULL, D_PROC_GRAB,
"failed to grab process %d", (int)pid);
- return (-1);
+ return -1;
}
dpr = dt_proc_lookup(dtp, pid);
@@ -719,7 +718,7 @@ dt_pid_create_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, dt_pcb_t *pcb)
if (pid < 0) {
dt_pid_error(dtp, pcb, NULL, D_PROC_GRAB,
"failed to grab process %d", (int)pid);
- return (-1);
+ return -1;
}
dpr = dt_proc_lookup(dtp, pid);
@@ -735,7 +734,7 @@ dt_pid_create_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, dt_pcb_t *pcb)
dt_proc_release_unlock(dtp, pid);
}
- return (err ? -1 : 0);
+ return err ? -1 : 0;
}
int
@@ -748,8 +747,7 @@ dt_pid_create_probes_module(dtrace_hdl_t *dtp, dt_proc_t *dpr)
int ret = 0, found = B_FALSE;
char provname[DTRACE_PROVNAMELEN];
- (void) snprintf(provname, sizeof (provname), "pid%d",
- (int)dpr->dpr_pid);
+ snprintf(provname, sizeof(provname), "pid%d", (int)dpr->dpr_pid);
for (pgp = dt_list_next(&dtp->dt_programs); pgp != NULL;
pgp = dt_list_next(pgp)) {
@@ -782,13 +780,12 @@ dt_pid_create_probes_module(dtrace_hdl_t *dtp, dt_proc_t *dpr)
}
}
- if (found) {
- /*
- * Give DTrace a shot to the ribs to get it to check
- * out the newly created probes.
- */
- (void) dt_ioctl(dtp, DTRACEIOC_ENABLE, NULL);
- }
+ /*
+ * Give DTrace a shot to the ribs to get it to check
+ * out the newly created probes.
+ */
+ if (found)
+ dt_ioctl(dtp, DTRACEIOC_ENABLE, NULL);
- return (ret);
+ return ret;
}
diff --git a/libdtrace/dt_pragma.c b/libdtrace/dt_pragma.c
index 72f5f32e..0c97edfc 100644
--- a/libdtrace/dt_pragma.c
+++ b/libdtrace/dt_pragma.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -215,14 +215,13 @@ dt_pragma_depends(const char *prname, dt_node_t *cnp)
dtp->dt_filetag);
assert(dld != NULL);
- (void) snprintf(lib, sizeof (lib), "%s%s",
+ snprintf(lib, sizeof(lib), "%s%s",
dld->dtld_libpath, nnp->dn_string);
if ((dt_lib_depend_add(dtp, &dld->dtld_dependencies,
- lib)) != 0) {
+ lib)) != 0)
xyerror(D_PRAGMA_DEPEND,
"failed to add dependency %s:%s\n", lib,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- }
} else {
/*
* By this point we have already performed a topological
@@ -238,7 +237,7 @@ dt_pragma_depends(const char *prname, dt_node_t *cnp)
dtp->dt_filetag);
assert(dld != NULL);
- (void) snprintf(lib, sizeof (lib), "%s%s",
+ snprintf(lib, sizeof(lib), "%s%s",
dld->dtld_libpath, nnp->dn_string);
dld = dt_lib_depend_lookup(&dtp->dt_lib_dep_sorted,
lib);
@@ -285,8 +284,8 @@ dt_pragma_error(const char *prname, dt_node_t *dnp)
for (enp = dnp; enp != NULL; enp = enp->dn_list) {
if (enp->dn_kind == DT_NODE_IDENT ||
enp->dn_kind == DT_NODE_STRING) {
- (void) strcat(s, enp->dn_string);
- (void) strcat(s, " ");
+ strcat(s, enp->dn_string);
+ strcat(s, " ");
}
}
@@ -317,7 +316,7 @@ dt_pragma_option(const char *prname, dt_node_t *dnp)
}
opt = alloca(strlen(dnp->dn_string) + 1);
- (void) strcpy(opt, dnp->dn_string);
+ strcpy(opt, dnp->dn_string);
if ((val = strchr(opt, '=')) != NULL)
*val++ = '\0';
diff --git a/libdtrace/dt_printf.c b/libdtrace/dt_printf.c
index d6803cc8..73090a00 100644
--- a/libdtrace/dt_printf.c
+++ b/libdtrace/dt_printf.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -22,15 +22,15 @@
static int
pfcheck_addr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_pointer(dnp) || dt_node_is_integer(dnp));
+ return dt_node_is_pointer(dnp) || dt_node_is_integer(dnp);
}
/*ARGSUSED*/
static int
pfcheck_kaddr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_pointer(dnp) || dt_node_is_integer(dnp) ||
- dt_node_is_symaddr(dnp));
+ return dt_node_is_pointer(dnp) || dt_node_is_integer(dnp) ||
+ dt_node_is_symaddr(dnp);
}
/*ARGSUSED*/
@@ -41,27 +41,27 @@ pfcheck_uaddr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
if (dt_node_is_usymaddr(dnp))
- return (1);
+ return 1;
if (idp == NULL || idp->di_id == 0)
- return (0);
+ return 0;
- return (dt_node_is_pointer(dnp) || dt_node_is_integer(dnp));
+ return dt_node_is_pointer(dnp) || dt_node_is_integer(dnp);
}
/*ARGSUSED*/
static int
pfcheck_stack(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_stack(dnp));
+ return dt_node_is_stack(dnp);
}
/*ARGSUSED*/
static int
pfcheck_time(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_integer(dnp) &&
- dt_node_type_size(dnp) == sizeof (uint64_t));
+ return dt_node_is_integer(dnp) &&
+ dt_node_type_size(dnp) == sizeof(uint64_t);
}
/*ARGSUSED*/
@@ -75,15 +75,15 @@ pfcheck_str(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
uint_t kind;
if (dt_node_is_string(dnp))
- return (1);
+ return 1;
ctfp = dnp->dn_ctfp;
base = ctf_type_resolve(ctfp, dnp->dn_type);
kind = ctf_type_kind(ctfp, base);
- return (kind == CTF_K_ARRAY && ctf_array_info(ctfp, base, &r) == 0 &&
+ return kind == CTF_K_ARRAY && ctf_array_info(ctfp, base, &r) == 0 &&
(base = ctf_type_resolve(ctfp, r.ctr_contents)) != CTF_ERR &&
- ctf_type_encoding(ctfp, base, &e) == 0 && IS_CHAR(e));
+ ctf_type_encoding(ctfp, base, &e) == 0 && IS_CHAR(e);
}
/*ARGSUSED*/
@@ -97,32 +97,32 @@ pfcheck_wstr(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_encoding_t e;
ctf_arinfo_t r;
- return (kind == CTF_K_ARRAY && ctf_array_info(ctfp, base, &r) == 0 &&
+ return kind == CTF_K_ARRAY && ctf_array_info(ctfp, base, &r) == 0 &&
(base = ctf_type_resolve(ctfp, r.ctr_contents)) != CTF_ERR &&
ctf_type_kind(ctfp, base) == CTF_K_INTEGER &&
- ctf_type_encoding(ctfp, base, &e) == 0 && e.cte_bits == 32);
+ ctf_type_encoding(ctfp, base, &e) == 0 && e.cte_bits == 32;
}
/*ARGSUSED*/
static int
pfcheck_csi(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_integer(dnp) &&
- dt_node_type_size(dnp) <= sizeof (int));
+ return dt_node_is_integer(dnp) &&
+ dt_node_type_size(dnp) <= sizeof(int);
}
/*ARGSUSED*/
static int
pfcheck_fp(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_float(dnp));
+ return dt_node_is_float(dnp);
}
/*ARGSUSED*/
static int
pfcheck_xint(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (dt_node_is_integer(dnp));
+ return dt_node_is_integer(dnp);
}
/*ARGSUSED*/
@@ -134,7 +134,7 @@ pfcheck_dint(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
else
pfd->pfd_fmt[strlen(pfd->pfd_fmt) - 1] = 'u';
- return (dt_node_is_integer(dnp));
+ return dt_node_is_integer(dnp);
}
/*ARGSUSED*/
@@ -145,9 +145,9 @@ pfcheck_xshort(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_id_t type = ctf_type_resolve(ctfp, dnp->dn_type);
char n[DT_TYPE_NAMELEN];
- return (ctf_type_name(ctfp, type, n, sizeof (n)) != NULL && (
+ return ctf_type_name(ctfp, type, n, sizeof(n)) != NULL && (
strcmp(n, "short") == 0 || strcmp(n, "signed short") == 0 ||
- strcmp(n, "unsigned short") == 0));
+ strcmp(n, "unsigned short") == 0);
}
/*ARGSUSED*/
@@ -158,9 +158,9 @@ pfcheck_xlong(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
ctf_id_t type = ctf_type_resolve(ctfp, dnp->dn_type);
char n[DT_TYPE_NAMELEN];
- return (ctf_type_name(ctfp, type, n, sizeof (n)) != NULL && (
+ return ctf_type_name(ctfp, type, n, sizeof(n)) != NULL && (
strcmp(n, "long") == 0 || strcmp(n, "signed long") == 0 ||
- strcmp(n, "unsigned long") == 0));
+ strcmp(n, "unsigned long") == 0);
}
/*ARGSUSED*/
@@ -172,10 +172,10 @@ pfcheck_xlonglong(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
char n[DT_TYPE_NAMELEN];
if (ctf_type_name(ctfp, ctf_type_resolve(ctfp, type), n,
- sizeof (n)) != NULL && (strcmp(n, "long long") == 0 ||
+ sizeof(n)) != NULL && (strcmp(n, "long long") == 0 ||
strcmp(n, "signed long long") == 0 ||
strcmp(n, "unsigned long long") == 0))
- return (1);
+ return 1;
/*
* If the type used for %llx or %llX is not an [unsigned] long long, we
@@ -184,22 +184,22 @@ pfcheck_xlonglong(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
* compilation environment even though they alias to "long" in LP64.
*/
while (ctf_type_kind(ctfp, type) == CTF_K_TYPEDEF) {
- if (ctf_type_name(ctfp, type, n, sizeof (n)) != NULL &&
+ if (ctf_type_name(ctfp, type, n, sizeof(n)) != NULL &&
(strcmp(n, "int64_t") == 0 || strcmp(n, "uint64_t") == 0))
- return (1);
+ return 1;
type = ctf_type_reference(ctfp, type);
}
- return (0);
+ return 0;
}
/*ARGSUSED*/
static int
pfcheck_type(dt_pfargv_t *pfv, dt_pfargd_t *pfd, dt_node_t *dnp)
{
- return (ctf_type_compat(dnp->dn_ctfp, ctf_type_resolve(dnp->dn_ctfp,
- dnp->dn_type), pfd->pfd_conv->pfc_dctfp, pfd->pfd_conv->pfc_dtype));
+ return ctf_type_compat(dnp->dn_ctfp, ctf_type_resolve(dnp->dn_ctfp,
+ dnp->dn_type), pfd->pfd_conv->pfc_dctfp, pfd->pfd_conv->pfc_dtype);
}
/*ARGSUSED*/
@@ -212,20 +212,20 @@ pfprint_sint(dtrace_hdl_t *dtp, FILE *fp, const char *format,
int32_t n = (int32_t)normal;
switch (size) {
- case sizeof (int8_t):
- return (dt_printf(dtp, fp, format,
- (int32_t)*((int8_t *)addr) / n));
- case sizeof (int16_t):
- return (dt_printf(dtp, fp, format,
- (int32_t)*((int16_t *)addr) / n));
- case sizeof (int32_t):
- return (dt_printf(dtp, fp, format,
- *((int32_t *)addr) / n));
- case sizeof (int64_t):
- return (dt_printf(dtp, fp, format,
- *((int64_t *)addr) / normal));
+ case sizeof(int8_t):
+ return dt_printf(dtp, fp, format,
+ (int32_t)*((int8_t *)addr) / n);
+ case sizeof(int16_t):
+ return dt_printf(dtp, fp, format,
+ (int32_t)*((int16_t *)addr) / n);
+ case sizeof(int32_t):
+ return dt_printf(dtp, fp, format,
+ *((int32_t *)addr) / n);
+ case sizeof(int64_t):
+ return dt_printf(dtp, fp, format,
+ *((int64_t *)addr) / normal);
default:
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
}
}
@@ -238,20 +238,18 @@ pfprint_uint(dtrace_hdl_t *dtp, FILE *fp, const char *format,
uint32_t n = (uint32_t)normal;
switch (size) {
- case sizeof (uint8_t):
- return (dt_printf(dtp, fp, format,
- (uint32_t)*((uint8_t *)addr) / n));
- case sizeof (uint16_t):
- return (dt_printf(dtp, fp, format,
- (uint32_t)*((uint16_t *)addr) / n));
- case sizeof (uint32_t):
- return (dt_printf(dtp, fp, format,
- *((uint32_t *)addr) / n));
- case sizeof (uint64_t):
- return (dt_printf(dtp, fp, format,
- *((uint64_t *)addr) / normal));
+ case sizeof(uint8_t):
+ return dt_printf(dtp, fp, format,
+ (uint32_t)*((uint8_t *)addr) / n);
+ case sizeof(uint16_t):
+ return dt_printf(dtp, fp, format,
+ (uint32_t)*((uint16_t *)addr) / n);
+ case sizeof(uint32_t):
+ return dt_printf(dtp, fp, format, *((uint32_t *)addr) / n);
+ case sizeof(uint64_t):
+ return dt_printf(dtp, fp, format, *((uint64_t *)addr) / normal);
default:
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
}
}
@@ -278,17 +276,14 @@ pfprint_fp(dtrace_hdl_t *dtp, FILE *fp, const char *format,
long double ldn = (long double)normal;
switch (size) {
- case sizeof (float):
- return (dt_printf(dtp, fp, format,
- (double)*((float *)addr) / n));
- case sizeof (double):
- return (dt_printf(dtp, fp, format,
- *((double *)addr) / n));
- case sizeof (long double):
- return (dt_printf(dtp, fp, format,
- *((long double *)addr) / ldn));
+ case sizeof(float):
+ return dt_printf(dtp, fp, format, (double)*((float *)addr) / n);
+ case sizeof(double):
+ return dt_printf(dtp, fp, format, *((double *)addr) / n);
+ case sizeof(long double):
+ return dt_printf(dtp, fp, format, *((long double *)addr) / ldn);
default:
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
}
}
@@ -303,14 +298,14 @@ pfprint_addr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
uint64_t val;
switch (size) {
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
val = *((uint32_t *)addr);
break;
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
val = *((uint64_t *)addr);
break;
default:
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
}
do {
@@ -318,7 +313,7 @@ pfprint_addr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
s = alloca(n);
} while ((len = dtrace_addr2str(dtp, val, s, n)) > n);
- return (dt_printf(dtp, fp, format, s));
+ return dt_printf(dtp, fp, format, s);
}
/*ARGSUSED*/
@@ -352,18 +347,18 @@ pfprint_uaddr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
switch (size) {
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
val = (u_longlong_t)*((uint32_t *)addr);
break;
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
val = (u_longlong_t)*((uint64_t *)addr);
break;
- case sizeof (uint64_t) * 3:
+ case sizeof(uint64_t) * 3:
tgid = ((uint64_t *)(uintptr_t)addr)[1];
val = ((uint64_t *)(uintptr_t)addr)[2];
break;
default:
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
}
if (tgid == 0 && dtp->dt_vector == NULL && idp != NULL)
@@ -374,7 +369,7 @@ pfprint_uaddr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
s = alloca(n);
} while ((len = dtrace_uaddr2str(dtp, tgid, val, s, n)) > n);
- return (dt_printf(dtp, fp, format, s));
+ return dt_printf(dtp, fp, format, s);
}
/*ARGSUSED*/
@@ -426,7 +421,7 @@ pfprint_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format,
dtp->dt_options[DTRACEOPT_STACKINDENT] = saved;
- return (err);
+ return err;
}
/*ARGSUSED*/
@@ -445,7 +440,7 @@ pfprint_time(dtrace_hdl_t *dtp, FILE *fp, const char *format,
* Below, we turn this into the canonical adb/mdb /[yY] format,
* "1973 Dec 3 17:20:00".
*/
- (void) ctime_r(&sec, src);
+ ctime_r(&sec, src);
/*
* Place the 4-digit year at the head of the string...
@@ -460,7 +455,7 @@ pfprint_time(dtrace_hdl_t *dtp, FILE *fp, const char *format,
*dst++ = src[i];
*dst = '\0';
- return (dt_printf(dtp, fp, format, buf));
+ return dt_printf(dtp, fp, format, buf);
}
/*
@@ -479,9 +474,9 @@ pfprint_time822(dtrace_hdl_t *dtp, FILE *fp, const char *format,
struct tm tm;
char buf[64];
- (void) localtime_r(&sec, &tm);
- (void) strftime(buf, sizeof (buf), "%a, %d %b %G %T %Z", &tm);
- return (dt_printf(dtp, fp, format, buf));
+ localtime_r(&sec, &tm);
+ strftime(buf, sizeof(buf), "%a, %d %b %G %T %Z", &tm);
+ return dt_printf(dtp, fp, format, buf);
}
/*ARGSUSED*/
@@ -494,7 +489,7 @@ pfprint_cstr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
memcpy(s, addr, size);
s[size] = '\0';
- return (dt_printf(dtp, fp, format, s));
+ return dt_printf(dtp, fp, format, s);
}
/*ARGSUSED*/
@@ -503,11 +498,11 @@ pfprint_wstr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size,
uint64_t normal, uint64_t sig)
{
- wchar_t *ws = alloca(size + sizeof (wchar_t));
+ wchar_t *ws = alloca(size + sizeof(wchar_t));
memcpy(ws, addr, size);
- ws[size / sizeof (wchar_t)] = L'\0';
- return (dt_printf(dtp, fp, format, ws));
+ ws[size / sizeof(wchar_t)] = L'\0';
+ return dt_printf(dtp, fp, format, ws);
}
/*ARGSUSED*/
@@ -520,11 +515,11 @@ pfprint_estr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
int n;
if ((s = strchr2esc(addr, size)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
n = dt_printf(dtp, fp, format, s);
free(s);
- return (n);
+ return n;
}
static int
@@ -535,13 +530,13 @@ pfprint_echr(dtrace_hdl_t *dtp, FILE *fp, const char *format,
char c;
switch (size) {
- case sizeof (int8_t):
+ case sizeof(int8_t):
c = *(int8_t *)addr;
break;
- case sizeof (int16_t):
+ case sizeof(int16_t):
c = *(int16_t *)addr;
break;
- case sizeof (int32_t):
+ case sizeof(int32_t):
c = *(int32_t *)addr;
break;
default:
@@ -557,7 +552,7 @@ pfprint_pct(dtrace_hdl_t *dtp, FILE *fp, const char *format,
const dt_pfargd_t *pfd, const void *addr, size_t size,
uint64_t normal, uint64_t sig)
{
- return (dt_printf(dtp, fp, "%%"));
+ return dt_printf(dtp, fp, "%%");
}
static const char pfproto_xint[] = "char, short, int, long, or long long";
@@ -636,14 +631,14 @@ dt_pfdict_create(dtrace_hdl_t *dtp)
const dt_pfconv_t *pfd;
dt_pfdict_t *pdi;
- if ((pdi = malloc(sizeof (dt_pfdict_t))) == NULL ||
- (pdi->pdi_buckets = malloc(sizeof (dt_pfconv_t *) * n)) == NULL) {
+ if ((pdi = malloc(sizeof(dt_pfdict_t))) == NULL ||
+ (pdi->pdi_buckets = malloc(sizeof(dt_pfconv_t *) * n)) == NULL) {
free(pdi);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
dtp->dt_pfdict = pdi;
- memset(pdi->pdi_buckets, 0, sizeof (dt_pfconv_t *) * n);
+ memset(pdi->pdi_buckets, 0, sizeof(dt_pfconv_t *) * n);
pdi->pdi_nbuckets = n;
for (pfd = _dtrace_conversions; pfd->pfc_name != NULL; pfd++) {
@@ -651,12 +646,12 @@ dt_pfdict_create(dtrace_hdl_t *dtp)
dt_pfconv_t *pfc;
uint_t h;
- if ((pfc = malloc(sizeof (dt_pfconv_t))) == NULL) {
+ if ((pfc = malloc(sizeof(dt_pfconv_t))) == NULL) {
dt_pfdict_destroy(dtp);
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
}
- memcpy(pfc, pfd, sizeof (dt_pfconv_t));
+ memcpy(pfc, pfd, sizeof(dt_pfconv_t));
h = dt_strtab_hash(pfc->pfc_name, NULL) % n;
pfc->pfc_next = pdi->pdi_buckets[h];
pdi->pdi_buckets[h] = pfc;
@@ -672,7 +667,7 @@ dt_pfdict_create(dtrace_hdl_t *dtp)
if (pfc->pfc_check == &pfcheck_type && dtrace_lookup_by_type(
dtp, DTRACE_OBJ_DDEFS, pfc->pfc_tstr, &dtt) != 0) {
dt_pfdict_destroy(dtp);
- return (dt_set_errno(dtp, EDT_NOCONV));
+ return dt_set_errno(dtp, EDT_NOCONV);
}
pfc->pfc_dctfp = dtt.dtt_ctfp;
@@ -695,13 +690,13 @@ dt_pfdict_create(dtrace_hdl_t *dtp)
if (pfc->pfc_check == NULL || pfc->pfc_print == NULL ||
pfc->pfc_ofmt == NULL || pfc->pfc_tstr == NULL) {
dt_pfdict_destroy(dtp);
- return (dt_set_errno(dtp, EDT_BADCONV));
+ return dt_set_errno(dtp, EDT_BADCONV);
}
dt_dprintf("loaded printf conversion %%%s\n", pfc->pfc_name);
}
- return (0);
+ return 0;
}
void
@@ -738,7 +733,7 @@ dt_pfdict_lookup(dtrace_hdl_t *dtp, const char *name)
break;
}
- return (pfc);
+ return pfc;
}
static dt_pfargv_t *
@@ -747,8 +742,8 @@ dt_printf_error(dtrace_hdl_t *dtp, int err)
if (yypcb != NULL)
longjmp(yypcb->pcb_jmpbuf, err);
- (void) dt_set_errno(dtp, err);
- return (NULL);
+ dt_set_errno(dtp, err);
+ return NULL;
}
dt_pfargv_t *
@@ -759,10 +754,10 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
const char *p, *q;
char *format;
- if ((pfv = malloc(sizeof (dt_pfargv_t))) == NULL ||
+ if ((pfv = malloc(sizeof(dt_pfargv_t))) == NULL ||
(format = strdup(s)) == NULL) {
free(pfv);
- return (dt_printf_error(dtp, EDT_NOMEM));
+ return dt_printf_error(dtp, EDT_NOMEM);
}
pfv->pfv_format = format;
@@ -780,9 +775,9 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
char c;
int n;
- if ((pfd = malloc(sizeof (dt_pfargd_t))) == NULL) {
+ if ((pfd = malloc(sizeof(dt_pfargd_t))) == NULL) {
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_NOMEM));
+ return dt_printf_error(dtp, EDT_NOMEM);
}
if (pfv->pfv_argv != NULL)
@@ -790,7 +785,7 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
else
pfv->pfv_argv = pfd;
- memset(pfd, 0, sizeof (dt_pfargd_t));
+ memset(pfd, 0, sizeof(dt_pfargd_t));
pfv->pfv_argc++;
nfd = pfd;
@@ -856,7 +851,7 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
"one '.' specified\n", pfv->pfv_argc);
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_COMPILER));
+ return dt_printf_error(dtp, EDT_COMPILER);
}
digits = 0;
goto fmt_switch;
@@ -885,7 +880,7 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
"positional format (%%n$)\n", pfv->pfv_argc);
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_COMPILER));
+ return dt_printf_error(dtp, EDT_COMPILER);
case '%':
if (p[-1] == '%')
@@ -895,20 +890,20 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
"with other format flags: %%%%\n", pfv->pfv_argc);
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_COMPILER));
+ return dt_printf_error(dtp, EDT_COMPILER);
case '\0':
yywarn("format conversion #%u name expected before "
"end of format string\n", pfv->pfv_argc);
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_COMPILER));
+ return dt_printf_error(dtp, EDT_COMPILER);
case 'h':
case 'l':
case 'L':
case 'w':
- if (namelen < sizeof (name) - 2)
+ if (namelen < sizeof(name) - 2)
name[namelen++] = c;
goto fmt_switch;
@@ -924,14 +919,14 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
yywarn("format conversion #%u is undefined: %%%s\n",
pfv->pfv_argc, name);
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_COMPILER));
+ return dt_printf_error(dtp, EDT_COMPILER);
}
}
if (*q != '\0' || *format == '\0') {
- if ((pfd = malloc(sizeof (dt_pfargd_t))) == NULL) {
+ if ((pfd = malloc(sizeof(dt_pfargd_t))) == NULL) {
dt_printf_destroy(pfv);
- return (dt_printf_error(dtp, EDT_NOMEM));
+ return dt_printf_error(dtp, EDT_NOMEM);
}
if (pfv->pfv_argv != NULL)
@@ -939,14 +934,14 @@ dt_printf_create(dtrace_hdl_t *dtp, const char *s)
else
pfv->pfv_argv = pfd;
- memset(pfd, 0, sizeof (dt_pfargd_t));
+ memset(pfd, 0, sizeof(dt_pfargd_t));
pfv->pfv_argc++;
pfd->pfd_prefix = q;
pfd->pfd_preflen = strlen(q);
}
- return (pfv);
+ return pfv;
}
void
@@ -996,7 +991,7 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
if (dt_type_lookup(aggtype, &dtt) != 0)
xyerror(D_TYPE_ERR, "failed to lookup agg type %s\n", aggtype);
- memset(&aggnode, 0, sizeof (aggnode));
+ memset(&aggnode, 0, sizeof(aggnode));
dt_node_type_assign(&aggnode, dtt.dtt_ctfp, dtt.dtt_type);
for (i = 0, j = 0; i < pfv->pfv_argc; i++, pfd = pfd->pfd_next) {
@@ -1011,7 +1006,7 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
continue; /* no checking if argd is just a prefix */
if (pfc->pfc_print == &pfprint_pct) {
- (void) strcat(pfd->pfd_fmt, pfc->pfc_ofmt);
+ strcat(pfd->pfd_fmt, pfc->pfc_ofmt);
continue;
}
@@ -1037,7 +1032,7 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
"\t prototype: int\n\t argument: %s\n",
func, j + foff + 1, i + 1,
dyns[dync - 1], pfc->pfc_name,
- dt_node_type_name(dnp, n, sizeof (n)));
+ dt_node_type_name(dnp, n, sizeof(n)));
}
dnp = dnp->dn_list;
@@ -1051,13 +1046,11 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
* the next parse node in the argument list, if there is one.
*/
if (pfd->pfd_flags & DT_PFCONV_AGG) {
- if (!(flags & DT_PRINTF_AGGREGATION)) {
+ if (!(flags & DT_PRINTF_AGGREGATION))
xyerror(D_PRINTF_AGG_CONV,
"%%@ conversion requires an aggregation"
" and is not for use with %s( )\n", func);
- }
- (void) strlcpy(vname, "aggregating action",
- sizeof (vname));
+ strlcpy(vname, "aggregating action", sizeof(vname));
vnp = &aggnode;
} else if (dnp == NULL) {
xyerror(D_PRINTF_ARG_PROTO,
@@ -1065,7 +1058,7 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
"%s) is missing a corresponding value argument\n",
func, i + 1, pfc->pfc_name);
} else {
- (void) snprintf(vname, sizeof (vname),
+ snprintf(vname, sizeof(vname),
"argument #%d", j + foff + 1);
vnp = dnp;
dnp = dnp->dn_list;
@@ -1081,14 +1074,14 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
if (pfc->pfc_print == &pfprint_sint ||
pfc->pfc_print == &pfprint_uint ||
pfc->pfc_print == &pfprint_dint) {
- if (dt_node_type_size(vnp) == sizeof (uint64_t))
- (void) strcpy(pfd->pfd_fmt, "ll");
+ if (dt_node_type_size(vnp) == sizeof(uint64_t))
+ strcpy(pfd->pfd_fmt, "ll");
} else if (pfc->pfc_print == &pfprint_fp) {
- if (dt_node_type_size(vnp) == sizeof (long double))
- (void) strcpy(pfd->pfd_fmt, "L");
+ if (dt_node_type_size(vnp) == sizeof(long double))
+ strcpy(pfd->pfd_fmt, "L");
}
- (void) strcat(pfd->pfd_fmt, pfc->pfc_ofmt);
+ strcat(pfd->pfd_fmt, pfc->pfc_ofmt);
/*
* Validate the format conversion against the value node type.
@@ -1096,21 +1089,19 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
* string by concatenating together any required printf(3C)
* size prefixes with the conversion's native format string.
*/
- if (pfc->pfc_check(pfv, pfd, vnp) == 0) {
+ if (pfc->pfc_check(pfv, pfd, vnp) == 0)
xyerror(D_PRINTF_ARG_TYPE,
"%s( ) %s is incompatible with "
"conversion #%d prototype:\n\tconversion: %%%s\n"
"\t prototype: %s\n\t argument: %s\n", func,
vname, i + 1, pfc->pfc_name, pfc->pfc_tstr,
- dt_node_type_name(vnp, n, sizeof (n)));
- }
+ dt_node_type_name(vnp, n, sizeof(n)));
}
- if ((flags & DT_PRINTF_EXACTLEN) && dnp != NULL) {
+ if ((flags & DT_PRINTF_EXACTLEN) && dnp != NULL)
xyerror(D_PRINTF_ARG_EXTRA,
"%s( ) prototype mismatch: only %d arguments "
"required by this format string\n", func, j);
- }
}
void
@@ -1165,8 +1156,8 @@ dt_printa_validate(dt_node_t *lhs, dt_node_t *rhs)
"incompatible with @%s:\n%9s key #%d: %s\n"
"%9s key #%d: %s\n",
rid->di_name, argn, lid->di_name, lid->di_name, argn,
- dt_node_type_name(lproto, n1, sizeof (n1)), rid->di_name,
- argn, dt_node_type_name(rproto, n2, sizeof (n2)));
+ dt_node_type_name(lproto, n1, sizeof(n1)), rid->di_name,
+ argn, dt_node_type_name(rproto, n2, sizeof(n2)));
}
}
@@ -1177,34 +1168,34 @@ dt_printf_getint(dtrace_hdl_t *dtp, const dtrace_recdesc_t *recp,
uintptr_t addr;
if (nrecs == 0)
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
addr = (uintptr_t)buf + recp->dtrd_offset;
if (addr + recp->dtrd_size > (uintptr_t)buf + len)
- return (dt_set_errno(dtp, EDT_DOFFSET));
+ return dt_set_errno(dtp, EDT_DOFFSET);
if (addr & (recp->dtrd_alignment - 1))
- return (dt_set_errno(dtp, EDT_DALIGN));
+ return dt_set_errno(dtp, EDT_DALIGN);
switch (recp->dtrd_size) {
- case sizeof (int8_t):
+ case sizeof(int8_t):
*ip = (int)*((int8_t *)addr);
break;
- case sizeof (int16_t):
+ case sizeof(int16_t):
*ip = (int)*((int16_t *)addr);
break;
- case sizeof (int32_t):
+ case sizeof(int32_t):
*ip = (int)*((int32_t *)addr);
break;
- case sizeof (int64_t):
+ case sizeof(int64_t):
*ip = (int)*((int64_t *)addr);
break;
default:
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
}
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -1215,7 +1206,7 @@ pfprint_average(dtrace_hdl_t *dtp, FILE *fp, const char *format,
{
const uint64_t *data = addr;
- if (size != sizeof (uint64_t) * 2)
+ if (size != sizeof(uint64_t) * 2)
return dt_set_errno(dtp, EDT_DMISMATCH);
return dt_printf(dtp, fp, format,
@@ -1230,7 +1221,7 @@ pfprint_stddev(dtrace_hdl_t *dtp, FILE *fp, const char *format,
{
const uint64_t *data = addr;
- if (size != sizeof (uint64_t) * 4)
+ if (size != sizeof(uint64_t) * 4)
return dt_set_errno(dtp, EDT_DMISMATCH);
return dt_printf(dtp, fp, format, dt_stddev((uint64_t *)data, normal));
@@ -1290,7 +1281,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
assert(naggvars > 0);
if (nrecs == 0)
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
curagg = naggvars > 1 ? 1 : 0;
aggdata = aggsdata[0];
@@ -1318,7 +1309,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
tmp[pfd->pfd_preflen] = '\0';
if ((rval = dt_printf(dtp, fp, tmp)) < 0)
- return (rval);
+ return rval;
if (pfv->pfv_flags & DT_PRINTF_AGGREGATION) {
/*
@@ -1333,13 +1324,13 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
if (dt_buffered_flush(dtp, NULL, NULL,
aggdata, flags) < 0)
- return (-1);
+ return -1;
}
}
if (pfc == NULL) {
if (pfv->pfv_argc == 1)
- return (nrecs != 0);
+ return nrecs != 0;
continue;
}
@@ -1373,7 +1364,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
* gracefully than blow up...
*/
if (aggsdata == NULL)
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
aggdata = aggsdata[curagg];
agg = aggdata->dtada_desc;
@@ -1397,7 +1388,7 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
flags = DTRACE_BUFDATA_AGGVAL;
} else {
if (nrecs == 0)
- return (dt_set_errno(dtp, EDT_DMISMATCH));
+ return dt_set_errno(dtp, EDT_DMISMATCH);
if (pfv->pfv_flags & DT_PRINTF_AGGREGATION) {
/*
@@ -1425,14 +1416,14 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
if (addr + size > limit) {
dt_dprintf("bad size: addr=%p size=0x%x lim=%p\n",
(void *)addr, rec->dtrd_size, (void *)lim);
- return (dt_set_errno(dtp, EDT_DOFFSET));
+ return dt_set_errno(dtp, EDT_DOFFSET);
}
if (rec->dtrd_alignment != 0 &&
((uintptr_t)addr & (rec->dtrd_alignment - 1)) != 0) {
dt_dprintf("bad align: addr=%p size=0x%x align=0x%x\n",
(void *)addr, rec->dtrd_size, rec->dtrd_alignment);
- return (dt_set_errno(dtp, EDT_DALIGN));
+ return dt_set_errno(dtp, EDT_DALIGN);
}
switch (rec->dtrd_action) {
@@ -1485,18 +1476,18 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
width = 0;
if (width != 0)
- f += snprintf(f, sizeof (format) - (f - format), "%d",
+ f += snprintf(f, sizeof(format) - (f - format), "%d",
ABS(width));
if (prec > 0)
- f += snprintf(f, sizeof (format) - (f - format), ".%d",
+ f += snprintf(f, sizeof(format) - (f - format), ".%d",
prec);
- (void) strcpy(f, pfd->pfd_fmt);
+ strcpy(f, pfd->pfd_fmt);
pfd->pfd_rec = rec;
if (func(dtp, fp, format, pfd, addr, size, normal, sig) < 0)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
if (pfv->pfv_flags & DT_PRINTF_AGGREGATION) {
/*
@@ -1509,11 +1500,11 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
if (dt_buffered_flush(dtp, NULL,
rec, aggdata, flags) < 0)
- return (-1);
+ return -1;
}
}
- return ((int)(recp - recs));
+ return (int)(recp - recs);
}
int
@@ -1531,7 +1522,7 @@ dtrace_sprintf(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
free(dtp->dt_sprintf_buf);
if ((dtp->dt_sprintf_buf = malloc(size)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
memset(dtp->dt_sprintf_buf, 0, size);
dtp->dt_sprintf_buflen = size;
@@ -1542,7 +1533,7 @@ dtrace_sprintf(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
if (rval == -1)
free(dtp->dt_sprintf_buf);
- return (rval);
+ return rval;
}
/*ARGSUSED*/
@@ -1554,19 +1545,19 @@ dtrace_system(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
int rval = dtrace_sprintf(dtp, fp, fmtdata, recp, nrecs, buf, len);
if (rval == -1)
- return (rval);
+ return rval;
/*
* Before we execute the specified command, flush fp to assure that
* any prior dt_printf()'s appear before the output of the command
* not after it.
*/
- (void) fflush(fp);
+ fflush(fp);
if (system(dtp->dt_sprintf_buf) == -1)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- return (rval);
+ return rval;
}
int
@@ -1583,7 +1574,7 @@ dtrace_freopen(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
rval = dtrace_sprintf(dtp, fp, fmtdata, recp, nrecs, buf, len);
if (rval == -1 || fp == NULL)
- return (rval);
+ return rval;
if (pfd->pfd_preflen != 0 &&
strcmp(pfd->pfd_prefix, DT_FREOPEN_RESTORE) == 0) {
@@ -1602,10 +1593,10 @@ dtrace_freopen(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
* never before been called should just be a no-op,
* so we just return in this case.
*/
- return (rval);
+ return rval;
}
- snprintf(tmpbuf, sizeof (tmpbuf),
+ snprintf(tmpbuf, sizeof(tmpbuf),
"/dev/fd/%d", dtp->dt_stdout_fd);
free(dtp->dt_freopen_filename);
dtp->dt_freopen_filename = strndup(tmpbuf, sizeof(tmpbuf));
@@ -1633,18 +1624,18 @@ dtrace_freopen(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
if ((nfp = fopen(dtp->dt_freopen_filename, "ace")) == NULL) {
char *faultstr;
- (void) asprintf(&faultstr, "couldn't freopen() \"%s\": %s",
+ asprintf(&faultstr, "couldn't freopen() \"%s\": %s",
dtp->dt_freopen_filename, strerror(errno));
if ((errval = dt_handle_liberr(dtp, data, faultstr)) == 0)
- return (rval);
+ return rval;
free(faultstr);
- return (errval);
+ return errval;
}
- snprintf(tmpbuf, sizeof (tmpbuf), "/dev/fd/%d", fileno(nfp));
+ snprintf(tmpbuf, sizeof(tmpbuf), "/dev/fd/%d", fileno(nfp));
if (dtp->dt_stdout_fd == -1) {
/*
@@ -1654,19 +1645,19 @@ dtrace_freopen(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
* return failure.
*/
if ((dtp->dt_stdout_fd = dup(fileno(fp))) == -1) {
- (void) fclose(nfp);
- return (dt_set_errno(dtp, errno));
+ fclose(nfp);
+ return dt_set_errno(dtp, errno);
}
}
if (freopen(tmpbuf, "aF", fp) == NULL) {
- (void) fclose(nfp);
- return (dt_set_errno(dtp, errno));
+ fclose(nfp);
+ return dt_set_errno(dtp, errno);
}
- (void) fclose(nfp);
+ fclose(nfp);
- return (rval);
+ return rval;
}
/*ARGSUSED*/
@@ -1675,8 +1666,8 @@ dtrace_fprintf(dtrace_hdl_t *dtp, FILE *fp, void *fmtdata,
const dtrace_probedata_t *data, const dtrace_recdesc_t *recp,
uint_t nrecs, const void *buf, size_t len)
{
- return (dt_printf_format(dtp, fp, fmtdata,
- recp, nrecs, buf, len, NULL, 0));
+ return dt_printf_format(dtp, fp, fmtdata,
+ recp, nrecs, buf, len, NULL, 0);
}
void *
@@ -1687,7 +1678,7 @@ dtrace_printf_create(dtrace_hdl_t *dtp, const char *s)
int i;
if (pfv == NULL)
- return (NULL); /* errno has been set for us */
+ return NULL; /* errno has been set for us */
pfd = pfv->pfv_argv;
@@ -1706,12 +1697,12 @@ dtrace_printf_create(dtrace_hdl_t *dtp, const char *s)
* must set pfd_fmt to be the output format conversion "s".
*/
if (strcmp(pfc->pfc_ofmt, "s") != 0)
- (void) strcat(pfd->pfd_fmt, pfc->pfc_name);
+ strcat(pfd->pfd_fmt, pfc->pfc_name);
else
- (void) strcat(pfd->pfd_fmt, pfc->pfc_ofmt);
+ strcat(pfd->pfd_fmt, pfc->pfc_ofmt);
}
- return (pfv);
+ return pfv;
}
void *
@@ -1720,11 +1711,11 @@ dtrace_printa_create(dtrace_hdl_t *dtp, const char *s)
dt_pfargv_t *pfv = dtrace_printf_create(dtp, s);
if (pfv == NULL)
- return (NULL); /* errno has been set for us */
+ return NULL; /* errno has been set for us */
pfv->pfv_flags |= DT_PRINTF_AGGREGATION;
- return (pfv);
+ return pfv;
}
/*ARGSUSED*/
@@ -1809,9 +1800,9 @@ dtrace_printf_format(dtrace_hdl_t *dtp, void *fmtdata, char *s, size_t len)
*f = '\0'; /* insert nul byte; do not count in return value */
assert(f < format + formatlen);
- (void) strncpy(s, format, len);
+ strncpy(s, format, len);
- return ((size_t)(f - format));
+ return (size_t)(f - format);
}
static int
diff --git a/libdtrace/dt_probe.c b/libdtrace/dt_probe.c
index 2f6ef028..23ee49ad 100644
--- a/libdtrace/dt_probe.c
+++ b/libdtrace/dt_probe.c
@@ -158,7 +158,7 @@ dt_probe_argmap(dt_node_t *xnp, dt_node_t *nnp)
nnp = nnp->dn_list;
}
- return (i);
+ return i;
}
static dt_node_t *
@@ -216,15 +216,15 @@ dt_probe_alloc_args(dt_probe_t *prp, int nargc, int xargc)
static size_t
dt_probe_keylen(const dtrace_probedesc_t *pdp)
{
- return (strlen(pdp->mod) + 1 + strlen(pdp->fun) + 1 +
- strlen(pdp->prb) + 1);
+ return strlen(pdp->mod) + 1 + strlen(pdp->fun) + 1 +
+ strlen(pdp->prb) + 1;
}
static char *
dt_probe_key(const dtrace_probedesc_t *pdp, char *s)
{
snprintf(s, INT_MAX, "%s:%s:%s", pdp->mod, pdp->fun, pdp->prb);
- return (s);
+ return s;
}
/*
@@ -246,7 +246,7 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
int i, nc, xc;
int adc = _dtrace_argmax;
- dt_argdesc_t *adv = alloca(sizeof (dt_argdesc_t) * adc);
+ dt_argdesc_t *adv = alloca(sizeof(dt_argdesc_t) * adc);
dt_argdesc_t *adp = adv;
assert(strcmp(pvp->desc.dtvd_name, pdp->prv) == 0);
@@ -256,13 +256,13 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
pvp->desc.dtvd_name, name, pdp->id);
for (nc = -1, i = 0; i < adc; i++, adp++) {
- memset(adp, 0, sizeof (dt_argdesc_t));
+ memset(adp, 0, sizeof(dt_argdesc_t));
adp->ndx = i;
adp->id = pdp->id;
if (dt_ioctl(dtp, DTRACEIOC_PROBEARG, adp) != 0) {
- (void) dt_set_errno(dtp, errno);
- return (NULL);
+ dt_set_errno(dtp, errno);
+ return NULL;
}
if (adp->ndx == DTRACE_ARGNONE)
@@ -283,21 +283,21 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
nargs = dt_probe_alloc_args(pvp, nc);
if ((xc != 0 && xargs == NULL) || (nc != 0 && nargs == NULL))
- return (NULL); /* dt_errno is set for us */
+ return NULL; /* dt_errno is set for us */
idp = dt_ident_create(name, DT_IDENT_PROBE, DT_IDFLG_ORPHAN, pdp->id,
_dtrace_defattr, 0, &dt_idops_probe, NULL,
dtp->dt_gen);
if (idp == NULL) {
- (void) dt_set_errno(dtp, EDT_NOMEM);
- return (NULL);
+ dt_set_errno(dtp, EDT_NOMEM);
+ return NULL;
}
prp = dt_probe_create(dtp, idp, 2, nargs, nc, xargs, xc);
if (prp == NULL) {
dt_ident_destroy(idp);
- return (NULL);
+ return NULL;
}
dt_probe_declare(pvp, prp);
@@ -346,7 +346,7 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
prp->argv[i] = dtt;
}
- return (prp);
+ return prp;
#else
return NULL;
#endif
@@ -367,7 +367,7 @@ dt_probe_lookup2(dt_provider_t *pvp, const char *s)
char *key;
if (dtrace_str2desc(dtp, DTRACE_PROBESPEC_NAME, s, &pd) != 0)
- return (NULL); /* dt_errno is set for us */
+ return NULL; /* dt_errno is set for us */
keylen = dt_probe_keylen(&pd);
key = dt_probe_key(&pd, alloca(keylen));
@@ -378,21 +378,21 @@ dt_probe_lookup2(dt_provider_t *pvp, const char *s)
* or it could have been cached from an earlier call to this function.
*/
if ((idp = dt_idhash_lookup(pvp->pv_probes, key)) != NULL)
- return (idp->di_data);
+ return idp->di_data;
/*
* If the probe isn't known, use the probe description computed above
* to ask dtrace(7D) to find the first matching probe.
*/
if (dt_ioctl(dtp, DTRACEIOC_PROBEMATCH, &pd) == 0)
- return (dt_probe_discover(pvp, &pd));
+ return dt_probe_discover(pvp, &pd);
if (errno == ESRCH || errno == EBADF)
- (void) dt_set_errno(dtp, EDT_NOPROBE);
+ dt_set_errno(dtp, EDT_NOPROBE);
else
- (void) dt_set_errno(dtp, errno);
+ dt_set_errno(dtp, errno);
- return (NULL);
+ return NULL;
}
dt_probe_t *
@@ -561,30 +561,30 @@ dt_probe_define(dt_provider_t *pvp, dt_probe_t *prp, const char *fname,
}
if (pip == NULL) {
- if ((pip = dt_zalloc(dtp, sizeof (*pip))) == NULL)
- return (-1);
+ if ((pip = dt_zalloc(dtp, sizeof(*pip))) == NULL)
+ return -1;
if ((pip->pi_offs = dt_zalloc(dtp,
- sizeof (uint32_t))) == NULL) {
+ sizeof(uint32_t))) == NULL) {
dt_free(dtp, pip);
- return (-1);
+ return -1;
}
if ((pip->pi_enoffs = dt_zalloc(dtp,
- sizeof (uint32_t))) == NULL) {
+ sizeof(uint32_t))) == NULL) {
dt_free(dtp, pip->pi_offs);
dt_free(dtp, pip);
- return (-1);
+ return -1;
}
- (void) strlcpy(pip->pi_fname, fname, sizeof (pip->pi_fname));
+ strlcpy(pip->pi_fname, fname, sizeof(pip->pi_fname));
if (rname != NULL) {
- if (strlen(rname) + 1 > sizeof (pip->pi_rname)) {
+ if (strlen(rname) + 1 > sizeof(pip->pi_rname)) {
dt_free(dtp, pip->pi_offs);
dt_free(dtp, pip);
- return (dt_set_errno(dtp, EDT_COMPILER));
+ return dt_set_errno(dtp, EDT_COMPILER);
}
- (void) strcpy(pip->pi_rname, rname);
+ strcpy(pip->pi_rname, rname);
}
pip->pi_noffs = 0;
@@ -612,9 +612,9 @@ dt_probe_define(dt_provider_t *pvp, dt_probe_t *prp, const char *fname,
uint32_t *new_offs = dt_calloc(dtp, new_max, sizeof(uint32_t));
if (new_offs == NULL)
- return (-1);
+ return -1;
- memcpy(new_offs, *offs, sizeof (uint32_t) * *maxoffs);
+ memcpy(new_offs, *offs, sizeof(uint32_t) * *maxoffs);
dt_free(dtp, *offs);
*maxoffs = new_max;
@@ -629,7 +629,7 @@ dt_probe_define(dt_provider_t *pvp, dt_probe_t *prp, const char *fname,
assert(*noffs < *maxoffs);
(*offs)[(*noffs)++] = offset;
- return (0);
+ return 0;
}
/*
@@ -650,7 +650,7 @@ dt_probe_tag(dt_probe_t *prp, uint_t argn, dt_node_t *dnp)
tag = alloca(len + 1);
- (void) snprintf(tag, len + 1, "__dtrace_%s___%s_arg%u",
+ snprintf(tag, len + 1, "__dtrace_%s___%s_arg%u",
prp->prov->desc.dtvd_name, prp->pr_name, argn);
if (dtrace_lookup_by_type(dtp, DTRACE_OBJ_DDEFS, tag, &dtt) != 0) {
@@ -666,13 +666,13 @@ dt_probe_tag(dt_probe_t *prp, uint_t argn, dt_node_t *dnp)
}
}
- memset(dnp, 0, sizeof (dt_node_t));
+ memset(dnp, 0, sizeof(dt_node_t));
dnp->dn_kind = DT_NODE_TYPE;
dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
dt_node_attr_assign(dnp, _dtrace_defattr);
- return (dnp);
+ return dnp;
}
dt_probe_t *
diff --git a/libdtrace/dt_proc.c b/libdtrace/dt_proc.c
index 14220c3c..c04b1cb0 100644
--- a/libdtrace/dt_proc.c
+++ b/libdtrace/dt_proc.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -112,7 +112,7 @@ static long dt_proc_continue(dtrace_hdl_t *dtp, dt_proc_t *dpr);
do { \
assert(MUTEX_HELD(&dpr->dpr_lock)); \
assert(pthread_equal(dpr->dpr_lock_holder, pthread_self())); \
- } while(0) \
+ } while (0)
/*
* Unwinder pad for libproc setjmp() chains.
@@ -129,7 +129,7 @@ static void
dt_proc_notify(dtrace_hdl_t *dtp, dt_proc_hash_t *dph, dt_proc_t *dpr,
pid_t pid, const char *msg, int lock, int broadcast)
{
- dt_proc_notify_t *dprn = dt_alloc(dtp, sizeof (dt_proc_notify_t));
+ dt_proc_notify_t *dprn = dt_alloc(dtp, sizeof(dt_proc_notify_t));
if (dprn == NULL) {
dt_dprintf("failed to allocate notification for %d %s\n",
@@ -139,20 +139,20 @@ dt_proc_notify(dtrace_hdl_t *dtp, dt_proc_hash_t *dph, dt_proc_t *dpr,
if (msg == NULL)
dprn->dprn_errmsg[0] = '\0';
else
- (void) strlcpy(dprn->dprn_errmsg, msg,
- sizeof (dprn->dprn_errmsg));
+ strlcpy(dprn->dprn_errmsg, msg,
+ sizeof(dprn->dprn_errmsg));
if (lock)
- (void) pthread_mutex_lock(&dph->dph_lock);
+ pthread_mutex_lock(&dph->dph_lock);
dprn->dprn_next = dph->dph_notify;
dprn->dprn_pid = pid;
dph->dph_notify = dprn;
if (broadcast)
- (void) pthread_cond_broadcast(&dph->dph_cv);
+ pthread_cond_broadcast(&dph->dph_cv);
if (lock)
- (void) pthread_mutex_unlock(&dph->dph_lock);
+ pthread_mutex_unlock(&dph->dph_lock);
}
}
@@ -266,7 +266,7 @@ dt_proc_stop(dt_proc_t *dpr, uint8_t why)
dpr->dpr_stop |= DT_PROC_STOP_RESUMING;
dt_dprintf("%d: dt_proc_stop(), control thread now waiting "
- "for resume.\n", (int) dpr->dpr_pid);
+ "for resume.\n", (int)dpr->dpr_pid);
}
}
@@ -496,7 +496,7 @@ dt_proc_attach_break(dt_proc_t *dpr, enum dt_attach_time_t attach_time)
uintptr_t addr = 0;
GElf_Sym sym;
dtrace_hdl_t *dtp = dpr->dpr_hdl;
- int (*handler) (uintptr_t addr, void *data) = dt_break_interesting;
+ int (*handler)(uintptr_t addr, void *data) = dt_break_interesting;
assert(MUTEX_HELD(&dpr->dpr_lock));
@@ -564,7 +564,7 @@ dt_proc_attach_break(dt_proc_t *dpr, enum dt_attach_time_t attach_time)
"__libc_start_main's first arg\n", (int)dpr->dpr_pid);
addr = Pread_first_arg(dpr->dpr_proc);
- if (addr == (uintptr_t) -1) {
+ if (addr == (uintptr_t)-1) {
dt_dprintf("Cannot look up __libc_start_main()'s "
"first arg: %s\n", strerror(errno));
return -1;
@@ -630,8 +630,8 @@ dt_proc_error(dtrace_hdl_t *dtp, dt_proc_t *dpr, const char *format, ...)
dt_debug_printf("dt_proc_error", format, tmp);
va_end(tmp);
- (void) dt_set_errno(dtp, EDT_COMPILER);
- return (NULL);
+ dt_set_errno(dtp, EDT_COMPILER);
+ return NULL;
}
/*
@@ -659,7 +659,7 @@ proxy_call(dt_proc_t *dpr, long (*proxy_rq)(), int exec_retry)
*/
if (dpr->dpr_done) {
errno = ESRCH;
- return(-1);
+ return -1;
}
errno = 0;
@@ -667,7 +667,7 @@ proxy_call(dt_proc_t *dpr, long (*proxy_rq)(), int exec_retry)
if (errno != 0 && errno != EINTR) {
dt_proc_error(dpr->dpr_hdl, dpr, "Cannot write to proxy pipe "
"for Pwait(), deadlock is certain: %s\n", strerror(errno));
- return (-1);
+ return -1;
}
while (dpr->dpr_proxy_rq != NULL)
@@ -909,7 +909,7 @@ dt_proc_control(void *arg)
if ((dpr->dpr_proc = Pgrab(dpr->dpr_pid, noninvasive, 0,
dpr, &err)) == NULL) {
dt_proc_error(dtp, dpr, "failed to grab pid %li: %s\n",
- (long) dpr->dpr_pid, strerror(err));
+ (long)dpr->dpr_pid, strerror(err));
pthread_exit(NULL);
}
@@ -940,7 +940,7 @@ dt_proc_control(void *arg)
*/
if ((dpr->dpr_fd = waitfd(P_PID, dpr->dpr_pid, WEXITED | WSTOPPED, 0)) < 0) {
dt_proc_error(dtp, dpr, "failed to get waitfd() for pid %li: %s\n",
- (long) dpr->dpr_pid, strerror(errno));
+ (long)dpr->dpr_pid, strerror(errno));
/*
* Demote this to a mandatorily noninvasive grab: if we
* Pcreate()d it, dpr_created is still set, so it will still get
@@ -955,7 +955,7 @@ dt_proc_control(void *arg)
if ((dpr->dpr_proc = Pgrab(dpr->dpr_pid, 2, 0,
dpr, &err)) == NULL) {
dt_proc_error(dtp, dpr, "failed to regrab pid %li: %s\n",
- (long) dpr->dpr_pid, strerror(err));
+ (long)dpr->dpr_pid, strerror(err));
}
dtp->dt_procs->dph_noninvasive_created++;
@@ -981,7 +981,7 @@ dt_proc_control(void *arg)
if (err != 0) {
dt_proc_error(dtp, dpr,
"failed to regrab pid %li after exec(): %s\n",
- (long) dpr->dpr_pid, strerror(err));
+ (long)dpr->dpr_pid, strerror(err));
pthread_exit(NULL);
}
} else {
@@ -1035,7 +1035,7 @@ dt_proc_control(void *arg)
dt_proc_resume(dpr);
pthread_cleanup_pop(1);
- return (NULL);
+ return NULL;
}
/*
@@ -1095,7 +1095,7 @@ dt_proc_loop(dt_proc_t *dpr, int awaiting_continue)
}
while (errno = EINTR,
- poll((struct pollfd *) pfd, 2, -1) <= 0 && errno == EINTR)
+ poll((struct pollfd *)pfd, 2, -1) <= 0 && errno == EINTR)
continue;
/*
@@ -1479,16 +1479,16 @@ dt_proc_reattach(dtrace_hdl_t *dtp, dt_proc_t *dpr)
if ((dpr->dpr_proc = Pgrab(dpr->dpr_pid, noninvasive, 1,
dpr, &err)) == NULL) {
dt_proc_error(dtp, dpr, "failed to regrab pid %li "
- "after exec(): %s\n", (long) dpr->dpr_pid,
+ "after exec(): %s\n", (long)dpr->dpr_pid,
strerror(err));
- return(err);
+ return err;
}
Ptrace_set_detached(dpr->dpr_proc, dpr->dpr_created);
Puntrace(dpr->dpr_proc, 0);
pthread_mutex_unlock(&dph->dph_lock);
- return(0);
+ return 0;
}
/*
@@ -1521,7 +1521,7 @@ dt_proc_lookup_remove(dtrace_hdl_t *dtp, pid_t pid, int remove)
*dpp = dpr->dpr_hash; /* remove from pid hash chain */
}
- return (dpr);
+ return dpr;
}
dt_proc_t *
@@ -1539,7 +1539,7 @@ dt_proc_lookup(dtrace_hdl_t *dtp, pid_t pid)
static void
dt_proc_retire(struct ps_prochandle *P)
{
- (void) Pclose(P);
+ Pclose(P);
}
/*
@@ -1548,7 +1548,7 @@ dt_proc_retire(struct ps_prochandle *P)
static int
dt_proc_retired(struct ps_prochandle *P)
{
- return (!Phasfds(P));
+ return !Phasfds(P);
}
/*
@@ -1662,17 +1662,17 @@ dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop,
pthread_attr_t a;
int err;
- (void) pthread_mutex_lock(&dpr->dpr_lock);
+ pthread_mutex_lock(&dpr->dpr_lock);
dpr->dpr_stop |= stop; /* set bit for initial rendezvous */
dpr->dpr_monitoring = B_TRUE;
if (flags & DTRACE_PROC_NOTIFIABLE)
dpr->dpr_notifiable = 1;
- (void) pthread_attr_init(&a);
- (void) pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED);
+ pthread_attr_init(&a);
+ pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED);
- (void) sigfillset(&nset);
- (void) sigdelset(&nset, SIGABRT); /* unblocked for assert() */
+ sigfillset(&nset);
+ sigdelset(&nset, SIGABRT); /* unblocked for assert() */
data.dpcd_hdl = dtp;
data.dpcd_proc = dpr;
@@ -1682,18 +1682,18 @@ dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop,
if (pipe(data.dpcd_proxy_fd) < 0) {
err = errno;
- (void) dt_proc_error(dpr->dpr_hdl, dpr,
+ dt_proc_error(dpr->dpr_hdl, dpr,
"failed to create communicating pipe for pid %d: %s\n",
(int)dpr->dpr_pid, strerror(err));
- (void) pthread_mutex_unlock(&dpr->dpr_lock);
- (void) pthread_attr_destroy(&a);
- return (err);
+ pthread_mutex_unlock(&dpr->dpr_lock);
+ pthread_attr_destroy(&a);
+ return err;
}
- (void) pthread_sigmask(SIG_SETMASK, &nset, &oset);
+ pthread_sigmask(SIG_SETMASK, &nset, &oset);
err = pthread_create(&dpr->dpr_tid, &a, dt_proc_control, &data);
- (void) pthread_sigmask(SIG_SETMASK, &oset, NULL);
+ pthread_sigmask(SIG_SETMASK, &oset, NULL);
/*
* If the control thread was created, then wait on dpr_cv for either
@@ -1706,7 +1706,7 @@ dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop,
*/
if (err == 0) {
while (!dpr->dpr_done && !(dpr->dpr_stop & DT_PROC_STOP_IDLE))
- (void) pthread_cond_wait(&dpr->dpr_cv, &dpr->dpr_lock);
+ pthread_cond_wait(&dpr->dpr_cv, &dpr->dpr_lock);
dpr->dpr_lock_holder = pthread_self();
@@ -1726,10 +1726,10 @@ dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop,
(int)dpr->dpr_pid, strerror(err));
}
- (void) pthread_mutex_unlock(&dpr->dpr_lock);
- (void) pthread_attr_destroy(&a);
+ pthread_mutex_unlock(&dpr->dpr_lock);
+ pthread_attr_destroy(&a);
- return (err);
+ return err;
}
static dt_proc_t *
@@ -1741,8 +1741,8 @@ dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv,
pthread_mutexattr_t attr;
pthread_mutexattr_t *attrp = NULL;
- if ((dpr = dt_zalloc(dtp, sizeof (dt_proc_t))) == NULL)
- return (NULL); /* errno is set for us */
+ if ((dpr = dt_zalloc(dtp, sizeof(dt_proc_t))) == NULL)
+ return NULL; /* errno is set for us */
if (_dtrace_debug_assert & DT_DEBUG_MUTEXES) {
attrp = &attr;
@@ -1750,9 +1750,9 @@ dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv,
pthread_mutexattr_settype(attrp, PTHREAD_MUTEX_ERRORCHECK);
}
- (void) pthread_mutex_init(&dpr->dpr_lock, attrp);
- (void) pthread_cond_init(&dpr->dpr_cv, NULL);
- (void) pthread_cond_init(&dpr->dpr_msg_cv, NULL);
+ pthread_mutex_init(&dpr->dpr_lock, attrp);
+ pthread_cond_init(&dpr->dpr_cv, NULL);
+ pthread_cond_init(&dpr->dpr_msg_cv, NULL);
if (_dtrace_debug_assert & DT_DEBUG_MUTEXES) {
pthread_mutexattr_destroy(attrp);
@@ -1776,7 +1776,7 @@ dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv,
pthread_mutex_destroy(&dpr->dpr_lock);
dt_free(dtp, dpr);
- return (NULL); /* dt_proc_error() has been called for us */
+ return NULL; /* dt_proc_error() has been called for us */
}
dph->dph_lrucnt++;
@@ -1841,7 +1841,7 @@ dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags)
if (dt_proc_retired(dpr->dpr_proc)) {
/* not retired any more */
- (void) Pmemfd(dpr->dpr_proc);
+ Pmemfd(dpr->dpr_proc);
dph->dph_lrucnt++;
}
return dpr;
@@ -1861,7 +1861,7 @@ dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags)
return NULL;
}
- if ((dpr = dt_zalloc(dtp, sizeof (dt_proc_t))) == NULL)
+ if ((dpr = dt_zalloc(dtp, sizeof(dt_proc_t))) == NULL)
return NULL; /* errno is set for us */
if (_dtrace_debug_assert & DT_DEBUG_MUTEXES) {
@@ -1870,9 +1870,9 @@ dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags)
pthread_mutexattr_settype(attrp, PTHREAD_MUTEX_ERRORCHECK);
}
- (void) pthread_mutex_init(&dpr->dpr_lock, attrp);
- (void) pthread_cond_init(&dpr->dpr_cv, NULL);
- (void) pthread_cond_init(&dpr->dpr_msg_cv, NULL);
+ pthread_mutex_init(&dpr->dpr_lock, attrp);
+ pthread_cond_init(&dpr->dpr_cv, NULL);
+ pthread_cond_init(&dpr->dpr_msg_cv, NULL);
if (_dtrace_debug_assert & DT_DEBUG_MUTEXES) {
pthread_mutexattr_destroy(attrp);
@@ -1972,7 +1972,7 @@ dt_proc_continue(dtrace_hdl_t *dtp, dt_proc_t *dpr)
(!Ptraceable(dpr->dpr_proc)))
return 0;
- (void) pthread_mutex_lock(&dpr->dpr_lock);
+ pthread_mutex_lock(&dpr->dpr_lock);
dt_dprintf("%i: doing a dt_proc_continue().\n", dpr->dpr_pid);
@@ -2011,7 +2011,7 @@ dt_proc_continue(dtrace_hdl_t *dtp, dt_proc_t *dpr)
dt_proc_error(dpr->dpr_hdl, dpr, "Cannot write to "
"proxy pipe for dt_proc_continue(), deadlock is "
"certain: %s\n", strerror(errno));
- return (-1);
+ return -1;
}
}
@@ -2020,7 +2020,7 @@ dt_proc_continue(dtrace_hdl_t *dtp, dt_proc_t *dpr)
dt_dprintf("%i: dt_proc_continue()d.\n", dpr->dpr_pid);
- (void) pthread_mutex_unlock(&dpr->dpr_lock);
+ pthread_mutex_unlock(&dpr->dpr_lock);
return 0;
}
@@ -2110,7 +2110,7 @@ dt_proc_ptrace_lock(struct ps_prochandle *P, void *arg, int ptracing)
if (setjmp(this_exec_jmp)) { \
unwinder_pad = &this_exec_jmp; \
if (!proxy_reattach(dpr)) \
- return (err_ret); \
+ return err_ret; \
} \
unwinder_pad = &this_exec_jmp; \
proxy_monitor(dpr, 0); \
@@ -2224,11 +2224,11 @@ dt_Pread(dtrace_hdl_t *dtp, pid_t pid, void *buf, size_t nbyte,
void
dt_proc_hash_create(dtrace_hdl_t *dtp)
{
- if ((dtp->dt_procs = dt_zalloc(dtp, sizeof (dt_proc_hash_t) +
- sizeof (dt_proc_t *) * _dtrace_pidbuckets - 1)) != NULL) {
+ if ((dtp->dt_procs = dt_zalloc(dtp, sizeof(dt_proc_hash_t) +
+ sizeof(dt_proc_t *) * _dtrace_pidbuckets - 1)) != NULL) {
- (void) pthread_mutex_init(&dtp->dt_procs->dph_lock, NULL);
- (void) pthread_cond_init(&dtp->dt_procs->dph_cv, NULL);
+ pthread_mutex_init(&dtp->dt_procs->dph_lock, NULL);
+ pthread_cond_init(&dtp->dt_procs->dph_cv, NULL);
dtp->dt_procs->dph_hashlen = _dtrace_pidbuckets;
dtp->dt_procs->dph_lrulim = _dtrace_pidlrulim;
@@ -2273,7 +2273,7 @@ dtrace_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv,
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
dt_proc_t *dpr;
- hdl = malloc(sizeof (struct dtrace_proc));
+ hdl = malloc(sizeof(struct dtrace_proc));
if (!hdl)
return NULL;
@@ -2297,7 +2297,7 @@ dtrace_proc_grab_pid(dtrace_hdl_t *dtp, pid_t pid, int flags)
dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target");
dt_proc_t *dpr;
- hdl = malloc(sizeof (struct dtrace_proc));
+ hdl = malloc(sizeof(struct dtrace_proc));
if (!hdl)
return NULL;
diff --git a/libdtrace/dt_program.c b/libdtrace/dt_program.c
index a5f21617..354077fb 100644
--- a/libdtrace/dt_program.c
+++ b/libdtrace/dt_program.c
@@ -23,7 +23,7 @@
dtrace_prog_t *
dt_program_create(dtrace_hdl_t *dtp)
{
- dtrace_prog_t *pgp = dt_zalloc(dtp, sizeof (dtrace_prog_t));
+ dtrace_prog_t *pgp = dt_zalloc(dtp, sizeof(dtrace_prog_t));
if (pgp == NULL) {
dt_set_errno(dtp, EDT_NOMEM);
@@ -39,7 +39,7 @@ dt_program_create(dtrace_hdl_t *dtp)
*/
pgp->dp_dofversion = DOF_VERSION_1;
- return (pgp);
+ return pgp;
}
void
@@ -73,7 +73,7 @@ dtrace_program_info(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
if (pip == NULL)
return;
- memset(pip, 0, sizeof (dtrace_proginfo_t));
+ memset(pip, 0, sizeof(dtrace_proginfo_t));
if (dt_list_next(&pgp->dp_stmts) != NULL) {
pip->dpi_descattr = _dtrace_maxattr;
@@ -209,14 +209,14 @@ dt_ecbdesc_create(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp)
{
dtrace_ecbdesc_t *edp;
- if ((edp = dt_zalloc(dtp, sizeof (dtrace_ecbdesc_t))) == NULL) {
- (void) dt_set_errno(dtp, EDT_NOMEM);
- return (NULL);
+ if ((edp = dt_zalloc(dtp, sizeof(dtrace_ecbdesc_t))) == NULL) {
+ dt_set_errno(dtp, EDT_NOMEM);
+ return NULL;
}
edp->dted_probe = *pdp;
dt_ecbdesc_hold(edp);
- return (edp);
+ return edp;
}
dtrace_stmtdesc_t *
@@ -239,15 +239,15 @@ dtrace_stmt_create(dtrace_hdl_t *dtp, dtrace_ecbdesc_t *edp)
int
dtrace_stmt_add(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, dtrace_stmtdesc_t *sdp)
{
- dt_stmt_t *stp = dt_alloc(dtp, sizeof (dt_stmt_t));
+ dt_stmt_t *stp = dt_alloc(dtp, sizeof(dt_stmt_t));
if (stp == NULL)
- return (-1); /* errno is set for us */
+ return -1; /* errno is set for us */
dt_list_append(&pgp->dp_stmts, stp);
stp->ds_desc = sdp;
- return (0);
+ return 0;
}
int
@@ -263,7 +263,7 @@ dtrace_stmt_iter(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,
break;
}
- return (status);
+ return status;
}
void
@@ -338,24 +338,24 @@ dt_header_decl(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
if (fprintf(infop->dthi_out, "extern void __dtrace_%s___%s(",
infop->dthi_pfname, fname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
for (dnp = prp->nargs, i = 0; dnp != NULL; dnp = dnp->dn_list, i++) {
if (fprintf(infop->dthi_out, "%s",
ctf_type_name(dnp->dn_ctfp, dnp->dn_type,
- buf, sizeof (buf))) < 0)
- return (dt_set_errno(dtp, errno));
+ buf, sizeof(buf))) < 0)
+ return dt_set_errno(dtp, errno);
if (i + 1 < prp->nargc &&
fprintf(infop->dthi_out, ", ") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
if (i == 0 && fprintf(infop->dthi_out, "void") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (fprintf(infop->dthi_out, ");\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (fprintf(infop->dthi_out,
"#if !defined(__aarch64__) && !defined(__sparc)\n"
@@ -364,9 +364,9 @@ dt_header_decl(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
"extern int __dtraceenabled_%s___%s(long);\n"
"#endif\n",
infop->dthi_pfname, fname, infop->dthi_pfname, fname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- return (0);
+ return 0;
}
/*ARGSUSED*/
@@ -392,37 +392,37 @@ dt_header_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
if (fprintf(infop->dthi_out, "#define\t%s_%s(",
infop->dthi_pmname, mname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
for (i = 0; i < prp->nargc; i++) {
if (fprintf(infop->dthi_out, "arg%d", i) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (i + 1 != prp->nargc &&
fprintf(infop->dthi_out, ", ") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
if (!infop->dthi_empty) {
if (fprintf(infop->dthi_out, ") \\\n\t") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (fprintf(infop->dthi_out, "__dtrace_%s___%s(",
infop->dthi_pfname, fname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
for (i = 0; i < prp->nargc; i++) {
if (fprintf(infop->dthi_out, "arg%d", i) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (i + 1 != prp->nargc &&
fprintf(infop->dthi_out, ", ") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
}
if (fprintf(infop->dthi_out, ")\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (!infop->dthi_empty) {
if (fprintf(infop->dthi_out,
@@ -437,15 +437,15 @@ dt_header_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
infop->dthi_pfname, fname,
infop->dthi_pmname, mname,
infop->dthi_pfname, fname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
} else {
if (fprintf(infop->dthi_out, "#define\t%s_%s_ENABLED() (0)\n",
infop->dthi_pmname, mname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
- return (0);
+ return 0;
}
static int
@@ -456,7 +456,7 @@ dt_header_provider(dtrace_hdl_t *dtp, dt_provider_t *pvp, FILE *out)
int i;
if (pvp->pv_flags & DT_PROVIDER_IMPL)
- return (0);
+ return 0;
/*
* Count the instances of the '-' character since we'll need to double
@@ -478,27 +478,27 @@ dt_header_provider(dtrace_hdl_t *dtp, dt_provider_t *pvp, FILE *out)
if (fprintf(out, "#define _DTRACE_VERSION 1\n\n"
"#if _DTRACE_VERSION\n\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (dt_idhash_iter(pvp->pv_probes, dt_header_probe, &info) != 0)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (fprintf(out, "\n\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (dt_idhash_iter(pvp->pv_probes, dt_header_decl, &info) != 0)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (fprintf(out, "\n#else\n\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
info.dthi_empty = 1;
if (dt_idhash_iter(pvp->pv_probes, dt_header_probe, &info) != 0)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
if (fprintf(out, "\n#endif\n\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- return (0);
+ return 0;
}
int
@@ -515,27 +515,27 @@ dtrace_program_header(dtrace_hdl_t *dtp, FILE *out, const char *fname)
dt_header_fmt_macro(mfname, fname);
if (fprintf(out, "#ifndef\t_%s\n#define\t_%s\n\n",
mfname, mfname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
if (fprintf(out, "#include <unistd.h>\n"
"#include <inttypes.h>\n\n") < 0)
- return (-1);
+ return -1;
if (fprintf(out, "#ifdef\t__cplusplus\nextern \"C\" {\n#endif\n\n") < 0)
- return (-1);
+ return -1;
for (pvp = dt_list_next(&dtp->dt_provlist);
pvp != NULL; pvp = dt_list_next(pvp)) {
if (dt_header_provider(dtp, pvp, out) != 0)
- return (-1); /* dt_errno is set for us */
+ return -1; /* dt_errno is set for us */
}
if (fprintf(out, "\n#ifdef\t__cplusplus\n}\n#endif\n") < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
if (fname != NULL && fprintf(out, "\n#endif\t/* _%s */\n", mfname) < 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- return (0);
+ return 0;
}
diff --git a/libdtrace/dt_provider.c b/libdtrace/dt_provider.c
index edb87474..6821ac6e 100644
--- a/libdtrace/dt_provider.c
+++ b/libdtrace/dt_provider.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -54,8 +54,8 @@ dt_provider_create(dtrace_hdl_t *dtp, const char *name,
{
dt_provider_t *pvp;
- if ((pvp = dt_zalloc(dtp, sizeof (dt_provider_t))) == NULL)
- return (NULL);
+ if ((pvp = dt_zalloc(dtp, sizeof(dt_provider_t))) == NULL)
+ return NULL;
strlcpy(pvp->desc.dtvd_name, name, DTRACE_PROVNAMELEN);
pvp->impl = impl;
@@ -65,14 +65,14 @@ dt_provider_create(dtrace_hdl_t *dtp, const char *name,
if (pvp->pv_probes == NULL) {
dt_free(dtp, pvp);
- (void) dt_set_errno(dtp, EDT_NOMEM);
- return (NULL);
+ dt_set_errno(dtp, EDT_NOMEM);
+ return NULL;
}
memcpy(&pvp->desc.dtvd_attr, pattr, sizeof(dtrace_pattr_t));
- return (dt_provider_insert(dtp, pvp,
- dt_strtab_hash(name, NULL) % dtp->dt_provbuckets));
+ return dt_provider_insert(dtp, pvp,
+ dt_strtab_hash(name, NULL) % dtp->dt_provbuckets);
}
void
@@ -115,7 +115,7 @@ dt_provider_xref(dtrace_hdl_t *dtp, dt_provider_t *pvp, id_t id)
ulong_t *xrefs = dt_zalloc(dtp, newsize);
if (xrefs == NULL)
- return (-1);
+ return -1;
memcpy(xrefs, pvp->pv_xrefs, oldsize);
dt_free(dtp, pvp->pv_xrefs);
@@ -125,5 +125,5 @@ dt_provider_xref(dtrace_hdl_t *dtp, dt_provider_t *pvp, id_t id)
}
BT_SET(pvp->pv_xrefs, id);
- return (0);
+ return 0;
}
diff --git a/libdtrace/dt_regset.c b/libdtrace/dt_regset.c
index 0c099daf..11f0fdc1 100644
--- a/libdtrace/dt_regset.c
+++ b/libdtrace/dt_regset.c
@@ -157,7 +157,7 @@ dt_regset_dump(dt_regset_t *drp, const char *pref)
fprintf(stderr, "%s: Regset: ", pref);
for (reg = 0; reg < drp->dr_size; reg++) {
- fprintf(stderr, "%c", BT_TEST(drp->dr_active, reg) ? 'x' :
+ fprintf(stderr, "%c", BT_TEST(drp->dr_active, reg) ? 'x' :
BT_TEST(drp->dr_spilled, reg) ? 's' :
'.');
}
diff --git a/libdtrace/dt_string.c b/libdtrace/dt_string.c
index b2df3d6e..fa5116a9 100644
--- a/libdtrace/dt_string.c
+++ b/libdtrace/dt_string.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -135,7 +135,7 @@ stresc2chr(char *s)
}
*q = '\0';
- return ((size_t)(q - s));
+ return (size_t)(q - s);
}
/*
@@ -173,7 +173,7 @@ strchr2esc(const char *s, size_t n)
}
if ((s2 = malloc(n + addl + 1)) == NULL)
- return (NULL);
+ return NULL;
for (p = s, q = s2; p < s + n; p++) {
switch (c = *p) {
@@ -235,7 +235,7 @@ strchr2esc(const char *s, size_t n)
}
*q = '\0';
- return (s2);
+ return s2;
}
/*
@@ -249,9 +249,9 @@ strbasename(const char *s)
const char *p = strrchr(s, '/');
if (p == NULL)
- return (s);
+ return s;
- return (++p);
+ return ++p;
}
/*
@@ -267,20 +267,19 @@ strbadidnum(const char *s)
int c;
if (*s == '\0')
- return (s);
+ return s;
errno = 0;
- (void) strtoull(s, &p, 0);
+ strtoull(s, &p, 0);
if (errno == 0 && *p == '\0')
- return (NULL); /* matches RGX_INT */
+ return NULL; /* matches RGX_INT */
- while ((c = *s++) != '\0') {
+ while ((c = *s++) != '\0')
if (isalnum(c) == 0 && c != '_' && c != '`')
- return (s - 1);
- }
+ return s - 1;
- return (NULL); /* matches RGX_IDENT */
+ return NULL; /* matches RGX_IDENT */
}
/*
@@ -294,10 +293,10 @@ strisglob(const char *s)
while ((c = *s++) != '\0') {
if (c == '[' || c == '?' || c == '*' || c == '\\')
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
/*
@@ -316,7 +315,7 @@ strhyphenate(char *s)
}
}
- return (s);
+ return s;
}
/*
diff --git a/libdtrace/dt_strtab.c b/libdtrace/dt_strtab.c
index d312f4f5..9f5ae23f 100644
--- a/libdtrace/dt_strtab.c
+++ b/libdtrace/dt_strtab.c
@@ -19,13 +19,13 @@ dt_strtab_grow(dt_strtab_t *sp)
char *ptr, **bufs;
if ((ptr = malloc(sp->str_bufsz)) == NULL)
- return (-1);
+ return -1;
- bufs = realloc(sp->str_bufs, (sp->str_nbufs + 1) * sizeof (char *));
+ bufs = realloc(sp->str_bufs, (sp->str_nbufs + 1) * sizeof(char *));
if (bufs == NULL) {
free(ptr);
- return (-1);
+ return -1;
}
sp->str_nbufs++;
@@ -33,27 +33,27 @@ dt_strtab_grow(dt_strtab_t *sp)
sp->str_ptr = ptr;
sp->str_bufs[sp->str_nbufs - 1] = sp->str_ptr;
- return (0);
+ return 0;
}
dt_strtab_t *
dt_strtab_create(size_t bufsz)
{
- dt_strtab_t *sp = malloc(sizeof (dt_strtab_t));
+ dt_strtab_t *sp = malloc(sizeof(dt_strtab_t));
uint_t nbuckets = _dtrace_strbuckets;
assert(bufsz != 0);
if (sp == NULL)
- return (NULL);
+ return NULL;
- memset(sp, 0, sizeof (dt_strtab_t));
- sp->str_hash = malloc(nbuckets * sizeof (dt_strhash_t *));
+ memset(sp, 0, sizeof(dt_strtab_t));
+ sp->str_hash = malloc(nbuckets * sizeof(dt_strhash_t *));
if (sp->str_hash == NULL)
goto err;
- memset(sp->str_hash, 0, nbuckets * sizeof (dt_strhash_t *));
+ memset(sp->str_hash, 0, nbuckets * sizeof(dt_strhash_t *));
sp->str_hashsz = nbuckets;
sp->str_bufs = NULL;
sp->str_ptr = NULL;
@@ -66,11 +66,11 @@ dt_strtab_create(size_t bufsz)
goto err;
*sp->str_ptr++ = '\0';
- return (sp);
+ return sp;
err:
dt_strtab_destroy(sp);
- return (NULL);
+ return NULL;
}
void
@@ -119,7 +119,7 @@ dt_strtab_hash(const char *key, size_t *len)
if (len != NULL)
*len = n;
- return (h);
+ return h;
}
static int
@@ -139,14 +139,14 @@ dt_strtab_compare(dt_strtab_t *sp, dt_strhash_t *hp,
n = MIN(resid, len);
if ((rv = strncmp(buf, str, n)) != 0)
- return (rv);
+ return rv;
buf += n;
str += n;
len -= n;
}
- return (0);
+ return 0;
}
static int
@@ -174,14 +174,14 @@ dt_strtab_copyin(dt_strtab_t *sp, const char *str, size_t len)
len -= n;
}
- return (0);
+ return 0;
err:
while (sp->str_nbufs != old_n)
free(sp->str_bufs[--sp->str_nbufs]);
sp->str_ptr = old_p;
- return (-1);
+ return -1;
}
ssize_t
@@ -192,16 +192,16 @@ dt_strtab_index(dt_strtab_t *sp, const char *str)
ulong_t h;
if (str == NULL || str[0] == '\0')
- return (0); /* we keep a \0 at offset 0 to simplify things */
+ return 0; /* we keep a \0 at offset 0 to simplify things */
h = dt_strtab_hash(str, &len) % sp->str_hashsz;
for (hp = sp->str_hash[h]; hp != NULL; hp = hp->str_next) {
if (dt_strtab_compare(sp, hp, str, len + 1) == 0)
- return (hp->str_off);
+ return hp->str_off;
}
- return (-1);
+ return -1;
}
ssize_t
@@ -213,7 +213,7 @@ dt_strtab_insert(dt_strtab_t *sp, const char *str)
ulong_t h;
if ((off = dt_strtab_index(sp, str)) != -1)
- return (off);
+ return off;
h = dt_strtab_hash(str, &len) % sp->str_hashsz;
@@ -221,8 +221,8 @@ dt_strtab_insert(dt_strtab_t *sp, const char *str)
* Create a new hash bucket, initialize it, and insert it at the front
* of the hash chain for the appropriate bucket.
*/
- if ((hp = malloc(sizeof (dt_strhash_t))) == NULL)
- return (-1L);
+ if ((hp = malloc(sizeof(dt_strhash_t))) == NULL)
+ return -1L;
hp->str_data = sp->str_ptr;
hp->str_buf = sp->str_nbufs - 1;
@@ -235,19 +235,19 @@ dt_strtab_insert(dt_strtab_t *sp, const char *str)
* the global counts of strings and bytes. Return str's byte offset.
*/
if (dt_strtab_copyin(sp, str, len + 1) == -1)
- return (-1L);
+ return -1L;
sp->str_nstrs++;
sp->str_size += len + 1;
sp->str_hash[h] = hp;
- return (hp->str_off);
+ return hp->str_off;
}
size_t
dt_strtab_size(const dt_strtab_t *sp)
{
- return (sp->str_size);
+ return sp->str_size;
}
/*
@@ -279,7 +279,7 @@ dt_strtab_write(const dt_strtab_t *sp, dt_strtab_write_f *func, void *private)
}
if (total == 0 && sp->str_size != 0)
- return (-1);
+ return -1;
- return (total);
+ return total;
}
diff --git a/libdtrace/dt_subr.c b/libdtrace/dt_subr.c
index a4bed523..51ba6439 100644
--- a/libdtrace/dt_subr.c
+++ b/libdtrace/dt_subr.c
@@ -37,9 +37,9 @@ dtrace_xstr2desc(dtrace_hdl_t *dtp, dtrace_probespec_t spec, const char *s,
char buf[32]; /* for id_t as %d (see below) */
if (spec < DTRACE_PROBESPEC_NONE || spec > DTRACE_PROBESPEC_NAME)
- return (dt_set_errno(dtp, EINVAL));
+ return dt_set_errno(dtp, EINVAL);
- memset(pdp, 0, sizeof (dtrace_probedesc_t));
+ memset(pdp, 0, sizeof(dtrace_probedesc_t));
p = s + strlen(s) - 1;
do {
@@ -82,7 +82,7 @@ dtrace_xstr2desc(dtrace_hdl_t *dtp, dtrace_probespec_t spec, const char *s,
wlen = vlen - (w - v);
if (i < 0 || i >= argc || errno != 0)
- return (dt_set_errno(dtp, EDT_BADSPCV));
+ return dt_set_errno(dtp, EDT_BADSPCV);
v = argv[i];
vlen = strlen(v);
@@ -94,26 +94,26 @@ dtrace_xstr2desc(dtrace_hdl_t *dtp, dtrace_probespec_t spec, const char *s,
char *vstr = alloca(vlen);
dt_ident_t *idp;
- (void) strncpy(vstr, v + 1, vlen - 1);
+ strncpy(vstr, v + 1, vlen - 1);
vstr[vlen - 1] = '\0';
idp = dt_idhash_lookup(dtp->dt_macros, vstr);
if (idp == NULL)
- return (dt_set_errno(dtp, EDT_BADSPCV));
+ return dt_set_errno(dtp, EDT_BADSPCV);
v = buf;
vlen = snprintf(buf, 32, "%d", idp->di_id);
} else
- return (dt_set_errno(dtp, EDT_BADSPCV));
+ return dt_set_errno(dtp, EDT_BADSPCV);
}
if (spec == DTRACE_PROBESPEC_NONE)
- return (dt_set_errno(dtp, EDT_BADSPEC));
+ return dt_set_errno(dtp, EDT_BADSPEC);
name = calloc(len + vlen + wlen + 1, 1);
if (!name)
- return (dt_set_errno(dtp, ENOMEM));
+ return dt_set_errno(dtp, ENOMEM);
memcpy(name, q, len);
memcpy(name + len, v, vlen);
@@ -153,14 +153,14 @@ dtrace_xstr2desc(dtrace_hdl_t *dtp, dtrace_probespec_t spec, const char *s,
pdp->fun = strdup("");
if (!pdp->prb)
pdp->prb = strdup("");
- return (0);
+ return 0;
}
int
dtrace_str2desc(dtrace_hdl_t *dtp, dtrace_probespec_t spec,
const char *s, dtrace_probedesc_t *pdp)
{
- return (dtrace_xstr2desc(dtp, spec, s, 0, NULL, pdp));
+ return dtrace_xstr2desc(dtp, spec, s, 0, NULL, pdp);
}
char *
@@ -172,7 +172,7 @@ dtrace_desc2str(const dtrace_probedesc_t *pdp, char *buf, size_t len)
else
snprintf(buf, len, "%u", pdp->id);
- return (buf);
+ return buf;
}
char *
@@ -183,10 +183,10 @@ dtrace_attr2str(dtrace_attribute_t attr, char *buf, size_t len)
const char *class = dtrace_class_name(attr.dtat_class);
if (name == NULL || data == NULL || class == NULL)
- return (NULL); /* one or more invalid attributes */
+ return NULL; /* one or more invalid attributes */
- (void) snprintf(buf, len, "%s/%s/%s", name, data, class);
- return (buf);
+ snprintf(buf, len, "%s/%s/%s", name, data, class);
+ return buf;
}
static char *
@@ -195,7 +195,7 @@ dt_getstrattr(char *p, char **qp)
char *q;
if (*p == '\0')
- return (NULL);
+ return NULL;
if ((q = strchr(p, '/')) == NULL)
q = p + strlen(p);
@@ -203,7 +203,7 @@ dt_getstrattr(char *p, char **qp)
*q++ = '\0';
*qp = q;
- return (p);
+ return p;
}
int
@@ -214,14 +214,14 @@ dtrace_str2attr(const char *str, dtrace_attribute_t *attr)
char *p, *q;
if (str == NULL || attr == NULL)
- return (-1); /* invalid function arguments */
+ return -1; /* invalid function arguments */
*attr = _dtrace_maxattr;
p = alloca(strlen(str) + 1);
- (void) strcpy(p, str);
+ strcpy(p, str);
if ((p = dt_getstrattr(p, &q)) == NULL)
- return (0);
+ return 0;
for (s = 0; s <= DTRACE_STABILITY_MAX; s++) {
if (strcasecmp(p, dtrace_stability_name(s)) == 0) {
@@ -231,10 +231,10 @@ dtrace_str2attr(const char *str, dtrace_attribute_t *attr)
}
if (s > DTRACE_STABILITY_MAX)
- return (-1);
+ return -1;
if ((p = dt_getstrattr(q, &q)) == NULL)
- return (0);
+ return 0;
for (s = 0; s <= DTRACE_STABILITY_MAX; s++) {
if (strcasecmp(p, dtrace_stability_name(s)) == 0) {
@@ -244,10 +244,10 @@ dtrace_str2attr(const char *str, dtrace_attribute_t *attr)
}
if (s > DTRACE_STABILITY_MAX)
- return (-1);
+ return -1;
if ((p = dt_getstrattr(q, &q)) == NULL)
- return (0);
+ return 0;
for (c = 0; c <= DTRACE_CLASS_MAX; c++) {
if (strcasecmp(p, dtrace_class_name(c)) == 0) {
@@ -257,24 +257,24 @@ dtrace_str2attr(const char *str, dtrace_attribute_t *attr)
}
if (c > DTRACE_CLASS_MAX || (p = dt_getstrattr(q, &q)) != NULL)
- return (-1);
+ return -1;
- return (0);
+ return 0;
}
const char *
dtrace_stability_name(dtrace_stability_t s)
{
switch (s) {
- case DTRACE_STABILITY_INTERNAL: return ("Internal");
- case DTRACE_STABILITY_PRIVATE: return ("Private");
- case DTRACE_STABILITY_OBSOLETE: return ("Obsolete");
- case DTRACE_STABILITY_EXTERNAL: return ("External");
- case DTRACE_STABILITY_UNSTABLE: return ("Unstable");
- case DTRACE_STABILITY_EVOLVING: return ("Evolving");
- case DTRACE_STABILITY_STABLE: return ("Stable");
- case DTRACE_STABILITY_STANDARD: return ("Standard");
- default: return (NULL);
+ case DTRACE_STABILITY_INTERNAL: return "Internal";
+ case DTRACE_STABILITY_PRIVATE: return "Private";
+ case DTRACE_STABILITY_OBSOLETE: return "Obsolete";
+ case DTRACE_STABILITY_EXTERNAL: return "External";
+ case DTRACE_STABILITY_UNSTABLE: return "Unstable";
+ case DTRACE_STABILITY_EVOLVING: return "Evolving";
+ case DTRACE_STABILITY_STABLE: return "Stable";
+ case DTRACE_STABILITY_STANDARD: return "Standard";
+ default: return NULL;
}
}
@@ -282,13 +282,13 @@ const char *
dtrace_class_name(dtrace_class_t c)
{
switch (c) {
- case DTRACE_CLASS_UNKNOWN: return ("Unknown");
- case DTRACE_CLASS_CPU: return ("CPU");
- case DTRACE_CLASS_PLATFORM: return ("Platform");
- case DTRACE_CLASS_GROUP: return ("Group");
- case DTRACE_CLASS_ISA: return ("ISA");
- case DTRACE_CLASS_COMMON: return ("Common");
- default: return (NULL);
+ case DTRACE_CLASS_UNKNOWN: return "Unknown";
+ case DTRACE_CLASS_CPU: return "CPU";
+ case DTRACE_CLASS_PLATFORM: return "Platform";
+ case DTRACE_CLASS_GROUP: return "Group";
+ case DTRACE_CLASS_ISA: return "ISA";
+ case DTRACE_CLASS_COMMON: return "Common";
+ default: return NULL;
}
}
@@ -301,7 +301,7 @@ dt_attr_min(dtrace_attribute_t a1, dtrace_attribute_t a2)
am.dtat_data = MIN(a1.dtat_data, a2.dtat_data);
am.dtat_class = MIN(a1.dtat_class, a2.dtat_class);
- return (am);
+ return am;
}
dtrace_attribute_t
@@ -313,7 +313,7 @@ dt_attr_max(dtrace_attribute_t a1, dtrace_attribute_t a2)
am.dtat_data = MAX(a1.dtat_data, a2.dtat_data);
am.dtat_class = MAX(a1.dtat_class, a2.dtat_class);
- return (am);
+ return am;
}
/*
@@ -332,9 +332,9 @@ dt_attr_max(dtrace_attribute_t a1, dtrace_attribute_t a2)
int
dt_attr_cmp(dtrace_attribute_t a1, dtrace_attribute_t a2)
{
- return (((int)a1.dtat_name - a2.dtat_name) |
+ return ((int)a1.dtat_name - a2.dtat_name) |
((int)a1.dtat_data - a2.dtat_data) |
- ((int)a1.dtat_class - a2.dtat_class));
+ ((int)a1.dtat_class - a2.dtat_class);
}
char *
@@ -343,16 +343,15 @@ dt_attr_str(dtrace_attribute_t a, char *buf, size_t len)
static const char stability[] = "ipoxuesS";
static const char class[] = "uCpgIc";
- if (a.dtat_name < sizeof (stability) &&
- a.dtat_data < sizeof (stability) && a.dtat_class < sizeof (class)) {
- (void) snprintf(buf, len, "[%c/%c/%c]", stability[a.dtat_name],
+ if (a.dtat_name < sizeof(stability) &&
+ a.dtat_data < sizeof(stability) && a.dtat_class < sizeof(class))
+ snprintf(buf, len, "[%c/%c/%c]", stability[a.dtat_name],
stability[a.dtat_data], class[a.dtat_class]);
- } else {
- (void) snprintf(buf, len, "[%u/%u/%u]",
+ else
+ snprintf(buf, len, "[%u/%u/%u]",
a.dtat_name, a.dtat_data, a.dtat_class);
- }
- return (buf);
+ return buf;
}
char *
@@ -363,11 +362,11 @@ dt_version_num2str(dt_version_t v, char *buf, size_t len)
uint_t u = DT_VERSION_MICRO(v);
if (u == 0)
- (void) snprintf(buf, len, "%u.%u", M, m);
+ snprintf(buf, len, "%u.%u", M, m);
else
- (void) snprintf(buf, len, "%u.%u.%u", M, m, u);
+ snprintf(buf, len, "%u.%u.%u", M, m, u);
- return (buf);
+ return buf;
}
int
@@ -379,19 +378,19 @@ dt_version_str2num(const char *s, dt_version_t *vp)
while ((c = *s++) != '\0') {
if (isdigit(c))
n[i] = n[i] * 10 + c - '0';
- else if (c != '.' || i++ >= sizeof (n) / sizeof (n[0]) - 1)
- return (-1);
+ else if (c != '.' || i++ >= sizeof(n) / sizeof(n[0]) - 1)
+ return -1;
}
if (n[0] > DT_VERSION_MAJMAX ||
n[1] > DT_VERSION_MINMAX ||
n[2] > DT_VERSION_MICMAX)
- return (-1);
+ return -1;
if (vp != NULL)
*vp = DT_VERSION_NUMBER(n[0], n[1], n[2]);
- return (0);
+ return 0;
}
int
@@ -401,10 +400,10 @@ dt_version_defined(dt_version_t v)
for (i = 0; _dtrace_versions[i] != 0; i++) {
if (_dtrace_versions[i] == v)
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
char *
@@ -415,22 +414,22 @@ dt_cpp_add_arg(dtrace_hdl_t *dtp, const char *str)
if (dtp->dt_cpp_argc == dtp->dt_cpp_args) {
int olds = dtp->dt_cpp_args;
int news = olds * 2;
- char **argv = realloc(dtp->dt_cpp_argv, sizeof (char *) * news);
+ char **argv = realloc(dtp->dt_cpp_argv, sizeof(char *) * news);
if (argv == NULL)
- return (NULL);
+ return NULL;
- memset(&argv[olds], 0, sizeof (char *) * olds);
+ memset(&argv[olds], 0, sizeof(char *) * olds);
dtp->dt_cpp_argv = argv;
dtp->dt_cpp_args = news;
}
if ((arg = strdup(str)) == NULL)
- return (NULL);
+ return NULL;
assert(dtp->dt_cpp_argc < dtp->dt_cpp_args);
dtp->dt_cpp_argv[dtp->dt_cpp_argc++] = arg;
- return (arg);
+ return arg;
}
char *
@@ -439,12 +438,12 @@ dt_cpp_pop_arg(dtrace_hdl_t *dtp)
char *arg;
if (dtp->dt_cpp_argc <= 1)
- return (NULL); /* dt_cpp_argv[0] cannot be popped */
+ return NULL; /* dt_cpp_argv[0] cannot be popped */
arg = dtp->dt_cpp_argv[--dtp->dt_cpp_argc];
dtp->dt_cpp_argv[dtp->dt_cpp_argc] = NULL;
- return (arg);
+ return arg;
}
/*
@@ -457,7 +456,7 @@ int
dt_ioctl(dtrace_hdl_t *dtp, unsigned long int val, void *arg)
{
errno = EBADF;
- return (-1);
+ return -1;
}
int
@@ -466,9 +465,9 @@ dt_cpu_status(dtrace_hdl_t *dtp, int cpu)
const dtrace_vector_t *v = dtp->dt_vector;
if (v == NULL)
- return (p_online(cpu));
+ return p_online(cpu);
- return (v->dtv_cpu_status(dtp->dt_varg, cpu));
+ return v->dtv_cpu_status(dtp->dt_varg, cpu);
}
long
@@ -477,9 +476,9 @@ dt_sysconf(dtrace_hdl_t *dtp, int name)
const dtrace_vector_t *v = dtp->dt_vector;
if (v == NULL)
- return (sysconf(name));
+ return sysconf(name);
- return (v->dtv_sysconf(dtp->dt_varg, name));
+ return v->dtv_sysconf(dtp->dt_varg, name);
}
/*
@@ -503,9 +502,9 @@ dt_write(dtrace_hdl_t *dtp, int fd, const void *buf, size_t n)
}
if (resid == n && n != 0)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
- return (n - resid);
+ return n - resid;
}
/*
@@ -551,7 +550,7 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
va_end(ap);
pthread_mutex_unlock(&dtp->dt_sprintf_lock);
- return (n);
+ return n;
}
if (fp == NULL) {
@@ -563,7 +562,7 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
* handler for buffered output.
*/
if (dtp->dt_bufhdlr == NULL)
- return (dt_set_errno(dtp, EDT_NOBUFFERED));
+ return dt_set_errno(dtp, EDT_NOBUFFERED);
pthread_mutex_lock(&dtp->dt_sprintf_lock);
@@ -626,7 +625,7 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
unlock_out:
pthread_mutex_unlock(&dtp->dt_sprintf_lock);
- return (rval);
+ return rval;
}
va_start(ap, format);
@@ -635,10 +634,10 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
if (n < 0) {
clearerr(fp);
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
}
- return (n);
+ return n;
}
int
@@ -648,7 +647,7 @@ dt_buffered_flush(dtrace_hdl_t *dtp, dtrace_probedata_t *pdata,
dtrace_bufdata_t data;
if (dtp->dt_buffered_offs == 0)
- return (0);
+ return 0;
data.dtbda_handle = dtp;
data.dtbda_buffered = dtp->dt_buffered_buf;
@@ -660,13 +659,13 @@ dt_buffered_flush(dtrace_hdl_t *dtp, dtrace_probedata_t *pdata,
pthread_mutex_lock(&dtp->dt_sprintf_lock);
if ((*dtp->dt_bufhdlr)(&data, dtp->dt_bufarg) == DTRACE_HANDLE_ABORT)
- return (dt_set_errno(dtp, EDT_DIRABORT));
+ return dt_set_errno(dtp, EDT_DIRABORT);
dtp->dt_buffered_offs = 0;
dtp->dt_buffered_buf[0] = '\0';
pthread_mutex_unlock(&dtp->dt_sprintf_lock);
- return (0);
+ return 0;
}
void
@@ -684,11 +683,11 @@ dt_zalloc(dtrace_hdl_t *dtp, size_t size)
void *data;
if ((data = malloc(size)) == NULL)
- (void) dt_set_errno(dtp, EDT_NOMEM);
+ dt_set_errno(dtp, EDT_NOMEM);
else
memset(data, 0, size);
- return (data);
+ return data;
}
void *
@@ -706,9 +705,9 @@ dt_alloc(dtrace_hdl_t *dtp, size_t size)
void *data;
if ((data = malloc(size)) == NULL)
- (void) dt_set_errno(dtp, EDT_NOMEM);
+ dt_set_errno(dtp, EDT_NOMEM);
- return (data);
+ return data;
}
void
@@ -755,7 +754,7 @@ dt_difo_free(dtrace_hdl_t *dtp, dtrace_difo_t *dp)
int
dt_gmatch(const char *s, const char *p)
{
- return (p == NULL || *p == '\0' || gmatch(s, p));
+ return p == NULL || *p == '\0' || gmatch(s, p);
}
char *
@@ -764,9 +763,9 @@ dt_basename(char *str)
char *last = strrchr(str, '/');
if (last == NULL)
- return (str);
+ return str;
- return (last + 1);
+ return last + 1;
}
/*
@@ -782,7 +781,7 @@ dt_popc(ulong_t x)
x = (x + (x >> 4)) & 0x0F0F0F0FUL;
x = x + (x >> 8);
x = x + (x >> 16);
- return (x & 0x3F);
+ return x & 0x3F;
#endif
#ifdef _LP64
x = x - ((x >> 1) & 0x5555555555555555ULL);
@@ -791,7 +790,7 @@ dt_popc(ulong_t x)
x = x + (x >> 8);
x = x + (x >> 16);
x = x + (x >> 32);
- return (x & 0x7F);
+ return x & 0x7F;
#endif
}
@@ -807,12 +806,12 @@ dt_popcb(const ulong_t *bp, ulong_t n)
ulong_t w, popc = 0;
if (n == 0)
- return (0);
+ return 0;
for (w = 0; w < maxw; w++)
popc += dt_popc(bp[w]);
- return (popc + dt_popc(bp[maxw] & ((1UL << maxb) - 1)));
+ return popc + dt_popc(bp[maxw] & ((1UL << maxb) - 1));
}
static int
@@ -825,21 +824,20 @@ dt_string2str(char *s, char *str, int nbytes)
* Like snprintf(3C), we don't check the value of str if the
* number of bytes is 0.
*/
- return (len);
+ return len;
}
if (nbytes <= len) {
- (void) strncpy(str, s, nbytes - 1);
+ strncpy(str, s, nbytes - 1);
/*
* Like snprintf(3C) (and unlike strncpy(3C)), we guarantee
* that the string is null-terminated.
*/
str[nbytes - 1] = '\0';
- } else {
- (void) strcpy(str, s);
- }
+ } else
+ strcpy(str, s);
- return (len);
+ return len;
}
int
@@ -875,7 +873,7 @@ dtrace_addr2str(dtrace_hdl_t *dtp, uint64_t addr, char *str, int nbytes)
snprintf(s, n, "0x%llx", (u_longlong_t)addr);
}
- return (dt_string2str(s, str, nbytes));
+ return dt_string2str(s, str, nbytes);
}
int
@@ -909,9 +907,9 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_t pid, uint64_t addr, char *str,
offset = addr - pmap->pr_vaddr;
snprintf(c, sizeof(c), "%s:0x%llx",
- dt_basename(objname), (u_longlong_t) offset);
+ dt_basename(objname), (u_longlong_t)offset);
} else
- snprintf(c, sizeof(c), "0x%llx", (u_longlong_t) addr);
+ snprintf(c, sizeof(c), "0x%llx", (u_longlong_t)addr);
} else if (dt_Plookup_by_addr(dtp, pid, addr, &name, &sym) == 0) {
dt_Pobjname(dtp, pid, addr, objname, sizeof(objname));
@@ -928,11 +926,10 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_t pid, uint64_t addr, char *str,
free((char *)name);
} else if (dt_Pobjname(dtp, pid, addr,
objname, sizeof(objname)) != NULL) {
- snprintf(c, sizeof (c), "%s`0x%llx",
- dt_basename(objname), (u_longlong_t) addr);
- } else {
- snprintf(c, sizeof (c), "0x%llx", (u_longlong_t) addr);
- }
+ snprintf(c, sizeof(c), "%s`0x%llx",
+ dt_basename(objname), (u_longlong_t)addr);
+ } else
+ snprintf(c, sizeof(c), "0x%llx", (u_longlong_t)addr);
dt_proc_release_unlock(dtp, pid);
@@ -943,23 +940,23 @@ int
dt_variable_read(caddr_t addr, size_t size, uint64_t *valp)
{
switch (size) {
- case sizeof (uint8_t):
+ case sizeof(uint8_t):
*valp = *((uint8_t *)(uintptr_t)addr);
break;
- case sizeof (uint16_t):
+ case sizeof(uint16_t):
*valp = *((uint16_t *)(uintptr_t)addr);
break;
- case sizeof (uint32_t):
+ case sizeof(uint32_t):
*valp = *((uint32_t *)(uintptr_t)addr);
break;
- case sizeof (uint64_t):
+ case sizeof(uint64_t):
*valp = *((uint64_t *)(uintptr_t)addr);
break;
default:
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
}
/*
diff --git a/libdtrace/dt_symbol_modops.h b/libdtrace/dt_symbol_modops.h
index b972d03f..48a0994a 100644
--- a/libdtrace/dt_symbol_modops.h
+++ b/libdtrace/dt_symbol_modops.h
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -43,7 +43,7 @@ BITIZE(dt_module_syminit)(dt_module_t *dmp)
dt_module_symhash_insert(dmp, name, i);
}
- return (asrsv);
+ return asrsv;
}
/*
@@ -71,16 +71,15 @@ BITIZE(dt_module_symcomp)(const void *lp, const void *rp, void *strtabp)
/* sort by type */
if ((ELFIZE(ST_TYPE)(lhs->st_info) == STT_NOTYPE) !=
(ELFIZE(ST_TYPE)(rhs->st_info) == STT_NOTYPE))
- return (ELFIZE(ST_TYPE)(lhs->st_info) == STT_NOTYPE ? 1 : -1);
+ return ELFIZE(ST_TYPE)(lhs->st_info) == STT_NOTYPE ? 1 : -1;
/* not weak */
if ((ELFIZE(ST_BIND)(lhs->st_info) == STB_WEAK) !=
(ELFIZE(ST_BIND)(rhs->st_info) == STB_WEAK))
- return (ELFIZE(ST_BIND)(lhs->st_info) == STB_WEAK ? 1 : -1);
+ return ELFIZE(ST_BIND)(lhs->st_info) == STB_WEAK ? 1 : -1;
/* lexical order */
- return (strcmp(strtab + lhs->st_name,
- strtab + rhs->st_name));
+ return strcmp(strtab + lhs->st_name, strtab + rhs->st_name);
}
static void
@@ -102,8 +101,8 @@ BITIZE(dt_module_symsort)(dt_module_t *dmp)
assert(dmp->dm_aslen <= dmp->dm_asrsv);
qsort_r(dmp->dm_asmap, dmp->dm_aslen,
- sizeof (ElfIZE(Sym) *), BITIZE(dt_module_symcomp),
- (void *) dmp->dm_strtab.cts_data);
+ sizeof(ElfIZE(Sym) *), BITIZE(dt_module_symcomp),
+ (void *)dmp->dm_strtab.cts_data);
}
static GElf_Sym *
@@ -118,7 +117,7 @@ BITIZE(dt_module_symname)(dt_module_t *dmp, const char *name,
uint_t i, h;
if (dmp->dm_nsymelems == 0)
- return (NULL);
+ return NULL;
h = dt_strtab_hash(name, NULL) % dmp->dm_nsymbuckets;
@@ -129,11 +128,11 @@ BITIZE(dt_module_symname)(dt_module_t *dmp, const char *name,
if (strcmp(name, strtab + sym->st_name) == 0) {
if (idp != NULL)
*idp = dmsp->dms_symid;
- return (BITIZE(dt_module_symgelf)(sym, symp));
+ return BITIZE(dt_module_symgelf)(sym, symp);
}
}
- return (NULL);
+ return NULL;
}
static GElf_Sym *
@@ -148,7 +147,7 @@ BITIZE(dt_module_symaddr)(dt_module_t *dmp, GElf_Addr addr,
ElfIZE(Addr) v;
if (dmp->dm_aslen == 0)
- return (NULL);
+ return NULL;
while (hi - lo > 1) {
mid = (lo + hi) / 2;
@@ -172,10 +171,10 @@ BITIZE(dt_module_symaddr)(dt_module_t *dmp, GElf_Addr addr,
if (addr - sym->st_value < MAX(sym->st_size, 1)) {
if (idp != NULL)
*idp = (uint_t)(sym - symtab);
- return (BITIZE(dt_module_symgelf)(sym, symp));
+ return BITIZE(dt_module_symgelf)(sym, symp);
}
- return (NULL);
+ return NULL;
}
static const dt_modops_t BITIZE(dt_modops_) = {
diff --git a/libdtrace/dt_symtab.c b/libdtrace/dt_symtab.c
index 4df0c410..aa511169 100644
--- a/libdtrace/dt_symtab.c
+++ b/libdtrace/dt_symtab.c
@@ -10,7 +10,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -73,7 +73,7 @@ dt_symtab_grow_ranges(dt_symtab_t *symtab)
{
uint_t num_alloc = (symtab->dtst_num_range_alloc + 1) * 2;
dt_symrange_t *new_ranges = realloc(symtab->dtst_ranges,
- sizeof (dt_symrange_t) * num_alloc);
+ sizeof(dt_symrange_t) * num_alloc);
if (new_ranges == NULL)
return NULL;
@@ -95,8 +95,8 @@ dt_symtab_grow_ranges(dt_symtab_t *symtab)
static int
dt_symrange_sort_cmp(const void *lp, const void *rp)
{
- dt_symbol_t *lhs = ((dt_symrange_t *) lp)->dtsr_sym;
- dt_symbol_t *rhs = ((dt_symrange_t *) rp)->dtsr_sym;
+ dt_symbol_t *lhs = ((dt_symrange_t *)lp)->dtsr_sym;
+ dt_symbol_t *rhs = ((dt_symrange_t *)rp)->dtsr_sym;
if (lhs->dts_addr < rhs->dts_addr)
return -1;
@@ -126,7 +126,7 @@ dt_symrange_sort_cmp(const void *lp, const void *rp)
if (strcmp(rhs->dts_name.str, "cleanup_module") &&
strcmp(lhs->dts_name.str, "cleanup_module") == 0)
return +1;
- return (strcmp(lhs->dts_name.str, rhs->dts_name.str));
+ return strcmp(lhs->dts_name.str, rhs->dts_name.str);
}
/*
@@ -134,8 +134,8 @@ dt_symrange_sort_cmp(const void *lp, const void *rp)
*/
static int dt_symbol_search_cmp(const void *lp, const void *rp)
{
- const GElf_Addr lhs = *((GElf_Addr *) lp);
- dt_symrange_t *rhs = (dt_symrange_t *) rp;
+ const GElf_Addr lhs = *((GElf_Addr *)lp);
+ dt_symrange_t *rhs = (dt_symrange_t *)rp;
if (lhs < rhs->dtsr_lo)
return -1;
@@ -147,16 +147,16 @@ static int dt_symbol_search_cmp(const void *lp, const void *rp)
dt_symtab_t *
dt_symtab_create(void)
{
- dt_symtab_t *symtab = malloc (sizeof (struct dt_symtab));
+ dt_symtab_t *symtab = malloc(sizeof(struct dt_symtab));
if (symtab == NULL)
return NULL;
- memset(symtab, 0, sizeof (struct dt_symtab));
+ memset(symtab, 0, sizeof(struct dt_symtab));
symtab->dtst_symbuckets = _dtrace_strbuckets;
symtab->dtst_syms_by_name = calloc(symtab->dtst_symbuckets,
- sizeof (struct dt_symbol *));
+ sizeof(struct dt_symbol *));
if (symtab->dtst_syms_by_name == NULL) {
free(symtab->dtst_syms_by_name);
@@ -205,7 +205,7 @@ dt_symbol_insert(dt_symtab_t *symtab, const char *name,
if (symtab->dtst_flags & DT_ST_PACKED)
return NULL;
- if ((dtsp = malloc(sizeof (dt_symbol_t))) == NULL)
+ if ((dtsp = malloc(sizeof(dt_symbol_t))) == NULL)
return NULL;
if (symtab->dtst_num_range >= symtab->dtst_num_range_alloc)
@@ -214,7 +214,7 @@ dt_symbol_insert(dt_symtab_t *symtab, const char *name,
return NULL;
}
- memset(dtsp, 0, sizeof (dt_symbol_t));
+ memset(dtsp, 0, sizeof(dt_symbol_t));
dtsp->dts_name.str = strdup(name);
dtsp->dts_addr = addr;
dtsp->dts_size = size;
@@ -266,11 +266,11 @@ dt_symbol_by_name(dt_symtab_t *symtab, const char *name)
if (packed) {
if (strcmp(&symtab->dtst_strtab[dtsp->dts_name.off],
name) == 0)
- return (dtsp);
+ return dtsp;
}
else
if (strcmp(dtsp->dts_name.str, name) == 0)
- return (dtsp);
+ return dtsp;
}
return NULL;
@@ -288,7 +288,7 @@ dt_symbol_by_addr(dt_symtab_t *symtab, GElf_Addr dts_addr)
return NULL;
sympp = bsearch(&dts_addr, symtab->dtst_ranges, symtab->dtst_num_range,
- sizeof (dt_symrange_t), dt_symbol_search_cmp);
+ sizeof(dt_symrange_t), dt_symbol_search_cmp);
if (sympp == NULL)
return NULL;
@@ -338,7 +338,7 @@ dt_symtab_form_ranges(dt_symtab_t *symtab)
if (symtab->dtst_num_range == 0)
return 0;
- new_ranges = malloc(sizeof (dt_symrange_t) * num_alloc);
+ new_ranges = malloc(sizeof(dt_symrange_t) * num_alloc);
if (new_ranges == NULL)
return -1;
@@ -419,7 +419,7 @@ dt_symtab_form_ranges(dt_symtab_t *symtab)
if (num_range >= num_alloc) {
uint_t n = num_alloc + 1024;
dt_symrange_t *r = realloc(new_ranges,
- sizeof (dt_symrange_t) * n);
+ sizeof(dt_symrange_t) * n);
if (r == NULL) {
free(new_ranges);
return -1;
@@ -455,7 +455,7 @@ dt_symtab_sort(dt_symtab_t *symtab, int flag)
return;
qsort(symtab->dtst_ranges, symtab->dtst_num_range,
- sizeof (dt_symrange_t), dt_symrange_sort_cmp);
+ sizeof(dt_symrange_t), dt_symrange_sort_cmp);
if (flag && symtab->dtst_num_range) {
int i;
@@ -617,7 +617,7 @@ void
dt_symbol_to_elfsym(dtrace_hdl_t *dtp, dt_symbol_t *symbol, GElf_Sym *elf_symp)
{
switch (dtp->dt_conf.dtc_ctfmodel) {
- case CTF_MODEL_LP64: dt_symbol_to_elfsym64(dtp, symbol, (Elf64_Sym *) elf_symp);
+ case CTF_MODEL_LP64: dt_symbol_to_elfsym64(dtp, symbol, (Elf64_Sym *)elf_symp);
break;
case CTF_MODEL_ILP32: dt_symbol_to_elfsym32(dtp, symbol, (Elf32_Sym *)elf_symp);
break;
diff --git a/libdtrace/dt_work.c b/libdtrace/dt_work.c
index 7f838e76..c9142114 100644
--- a/libdtrace/dt_work.c
+++ b/libdtrace/dt_work.c
@@ -68,7 +68,7 @@ dtrace_sleep(dtrace_hdl_t *dtp)
earliest = *((hrtime_t *)a) + interval;
}
- (void) pthread_mutex_lock(&dph->dph_lock);
+ pthread_mutex_lock(&dph->dph_lock);
tv.tv_sec = earliest / NANOSEC;
tv.tv_nsec = earliest % NANOSEC;
@@ -80,8 +80,8 @@ dtrace_sleep(dtrace_hdl_t *dtp)
* received. Regardless of why we awaken, iterate over any pending
* notifications and process them.
*/
- (void) pthread_cond_timedwait(&dph->dph_cv, &dph->dph_lock, &tv);
- (void) dt_proc_enqueue_exits(dtp);
+ pthread_cond_timedwait(&dph->dph_cv, &dph->dph_lock, &tv);
+ dt_proc_enqueue_exits(dtp);
while ((dprn = dph->dph_notify) != NULL) {
if (dtp->dt_prochdlr != NULL) {
@@ -118,7 +118,7 @@ dtrace_sleep(dtrace_hdl_t *dtp)
dt_free(dtp, dprn);
}
- (void) pthread_mutex_unlock(&dph->dph_lock);
+ pthread_mutex_unlock(&dph->dph_lock);
}
int
@@ -244,7 +244,7 @@ dtrace_stop(dtrace_hdl_t *dtp)
* Now that we're stopped, we're going to get status one final time.
*/
if (dt_ioctl(dtp, DTRACEIOC_STATUS, &dtp->dt_status[gen]) == -1)
- return (dt_set_errno(dtp, errno));
+ return dt_set_errno(dtp, errno);
#endif
if (dt_handle_status(dtp, &dtp->dt_status[gen ^ 1],
@@ -283,7 +283,7 @@ dtrace_work(dtrace_hdl_t *dtp, FILE *fp,
break;
default:
- return (DTRACE_WORKSTATUS_ERROR);
+ return DTRACE_WORKSTATUS_ERROR;
}
if ((status == DTRACE_STATUS_NONE || status == DTRACE_STATUS_OKAY) &&
@@ -295,18 +295,18 @@ dtrace_work(dtrace_hdl_t *dtp, FILE *fp,
* return.
*/
assert(rval == DTRACE_WORKSTATUS_OKAY);
- return (rval);
+ return rval;
}
#if 0
if (dtrace_aggregate_snap(dtp) == -1)
- return (DTRACE_WORKSTATUS_ERROR);
+ return DTRACE_WORKSTATUS_ERROR;
#endif
if (dtrace_consume(dtp, fp, pfunc, rfunc, arg) == -1)
- return (DTRACE_WORKSTATUS_ERROR);
+ return DTRACE_WORKSTATUS_ERROR;
- return (rval);
+ return rval;
}
#else
dtrace_workstatus_t
diff --git a/libdtrace/dt_xlator.c b/libdtrace/dt_xlator.c
index 9d8c5e34..f8d65ea3 100644
--- a/libdtrace/dt_xlator.c
+++ b/libdtrace/dt_xlator.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -29,13 +29,13 @@ dt_xlator_create_member(const char *name, ctf_id_t type, ulong_t off, void *arg)
dt_node_t *enp, *mnp;
if ((enp = dt_node_xalloc(dtp, DT_NODE_XLATOR)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
enp->dn_link = dxp->dx_nodes;
dxp->dx_nodes = enp;
if ((mnp = dt_node_xalloc(dtp, DT_NODE_MEMBER)) == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
mnp->dn_link = dxp->dx_nodes;
dxp->dx_nodes = mnp;
@@ -65,9 +65,9 @@ dt_xlator_create_member(const char *name, ctf_id_t type, ulong_t off, void *arg)
dt_node_type_assign(mnp, dxp->dx_dst_ctfp, type);
if (mnp->dn_membname == NULL)
- return (dt_set_errno(dtp, EDT_NOMEM));
+ return dt_set_errno(dtp, EDT_NOMEM);
- return (0);
+ return 0;
}
dt_xlator_t *
@@ -75,14 +75,14 @@ dt_xlator_create(dtrace_hdl_t *dtp,
const dtrace_typeinfo_t *src, const dtrace_typeinfo_t *dst,
const char *name, dt_node_t *members, dt_node_t *nodes)
{
- dt_xlator_t *dxp = dt_zalloc(dtp, sizeof (dt_xlator_t));
+ dt_xlator_t *dxp = dt_zalloc(dtp, sizeof(dt_xlator_t));
dtrace_typeinfo_t ptr = *dst;
dt_xlator_t **map;
dt_node_t *dnp;
uint_t kind;
if (dxp == NULL)
- return (NULL);
+ return NULL;
dxp->dx_hdl = dtp;
dxp->dx_id = dtp->dt_xlatorid++;
@@ -92,11 +92,11 @@ dt_xlator_create(dtrace_hdl_t *dtp,
map = dt_calloc(dtp, dxp->dx_id + 1, sizeof(void *));
if (map == NULL) {
dt_free(dtp, dxp);
- return (NULL);
+ return NULL;
}
dt_list_append(&dtp->dt_xlators, dxp);
- memcpy(map, dtp->dt_xlatormap, sizeof (void *) * dxp->dx_id);
+ memcpy(map, dtp->dt_xlatormap, sizeof(void *) * dxp->dx_id);
dt_free(dtp, dtp->dt_xlatormap);
dtp->dt_xlatormap = map;
dtp->dt_xlatormap[dxp->dx_id] = dxp;
@@ -204,11 +204,11 @@ dt_xlator_create(dtrace_hdl_t *dtp,
goto err;
}
- return (dxp);
+ return dxp;
err:
dt_xlator_destroy(dtp, dxp);
- return (NULL);
+ return NULL;
}
void
@@ -249,7 +249,7 @@ dt_xlator_lookup(dtrace_hdl_t *dtp, dt_node_t *src, dt_node_t *dst, int flags)
dt_xlator_t *dxp = NULL;
if (src_base == CTF_ERR || dst_base == CTF_ERR)
- return (NULL); /* fail if these are unresolvable types */
+ return NULL; /* fail if these are unresolvable types */
/*
* Translators are always defined using a struct or union type, so if
@@ -263,7 +263,7 @@ dt_xlator_lookup(dtrace_hdl_t *dtp, dt_node_t *src, dt_node_t *dst, int flags)
}
if (dst_kind != CTF_K_UNION && dst_kind != CTF_K_STRUCT)
- return (NULL); /* fail if the output isn't a struct or union */
+ return NULL; /* fail if the output isn't a struct or union */
/*
* In order to find a matching translator, we iterate over the set of
@@ -305,11 +305,11 @@ dt_xlator_lookup(dtrace_hdl_t *dtp, dt_node_t *src, dt_node_t *dst, int flags)
out:
if (ptr && dxp != NULL && dxp->dx_ptrid.di_type == CTF_ERR)
- return (NULL); /* no translation available to pointer type */
+ return NULL; /* no translation available to pointer type */
if (dxp != NULL || !(flags & DT_XLATE_EXTERN) ||
dtp->dt_xlatemode == DT_XL_STATIC)
- return (dxp); /* we succeeded or not allowed to extern */
+ return dxp; /* we succeeded or not allowed to extern */
/*
* If we get here, then we didn't find an existing translator, but the
@@ -323,23 +323,23 @@ out:
dst_dtt.dtt_ctfp = dst_ctfp;
dst_dtt.dtt_type = dst_type;
- return (dt_xlator_create(dtp, &src_dtt, &dst_dtt, NULL, NULL, NULL));
+ return dt_xlator_create(dtp, &src_dtt, &dst_dtt, NULL, NULL, NULL);
}
dt_xlator_t *
dt_xlator_lookup_id(dtrace_hdl_t *dtp, id_t id)
{
assert(id >= 0 && id < dtp->dt_xlatorid);
- return (dtp->dt_xlatormap[id]);
+ return dtp->dt_xlatormap[id];
}
dt_ident_t *
dt_xlator_ident(dt_xlator_t *dxp, ctf_file_t *ctfp, ctf_id_t type)
{
if (ctf_type_kind(ctfp, ctf_type_resolve(ctfp, type)) == CTF_K_POINTER)
- return (&dxp->dx_ptrid);
+ return &dxp->dx_ptrid;
else
- return (&dxp->dx_souid);
+ return &dxp->dx_souid;
}
dt_node_t *
@@ -349,14 +349,14 @@ dt_xlator_member(dt_xlator_t *dxp, const char *name)
for (dnp = dxp->dx_members; dnp != NULL; dnp = dnp->dn_list) {
if (strcmp(dnp->dn_membname, name) == 0)
- return (dnp);
+ return dnp;
}
- return (NULL);
+ return NULL;
}
int
dt_xlator_dynamic(const dt_xlator_t *dxp)
{
- return (dxp->dx_locals == NULL);
+ return dxp->dx_locals == NULL;
}
diff --git a/libdtrace/ip.d b/libdtrace/ip.d
index 39867baf..f66316c3 100644
--- a/libdtrace/ip.d
+++ b/libdtrace/ip.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -214,7 +214,7 @@ translator ipinfo_t < __dtrace_tcp_void_ip_t *I > {
* to determine payload length.
*/
ip_plength = I != NULL && *(uint8_t *)I >> 4 == 4 ?
- ntohs(((struct iphdr *)I)->tot_len) - ((*(uint8_t *)I & 0xf ) << 2) :
+ ntohs(((struct iphdr *)I)->tot_len) - ((*(uint8_t *)I & 0xf) << 2) :
I != NULL && *(uint8_t *)I >> 4 == 6 ?
ntohs(((struct ipv6hdr *)I)->payload_len) :
arg0 != NULL ?
@@ -266,7 +266,7 @@ translator ipinfo_t < __dtrace_tcp_void_ip_t *I > {
#pragma D binding "1.5" translator
translator ifinfo_t < struct net_device *N > {
if_name = N != NULL ? stringof(N->name) : "<unknown>";
- if_ipstack = (N != NULL && sizeof (N->nd_net) > 0) ?
+ if_ipstack = (N != NULL && sizeof(N->nd_net) > 0) ?
((uint64_t)N->nd_net.net) : 0;
if_local = (N == NULL); /* is delivered locally */
if_addr = (uintptr_t)N; /* pointer to raw struct net_device ptr */
diff --git a/libdtrace/mkerrtags.sh b/libdtrace/mkerrtags.sh
index febc7e79..94a44ca8 100755
--- a/libdtrace/mkerrtags.sh
+++ b/libdtrace/mkerrtags.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
# Oracle Linux DTrace.
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
echo "\
/*\n\
* Oracle Linux DTrace.\n\
- * Copyright (c) 2003,, Oracle and/or its affiliates. All rights reserved.\n\
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.\n\
* Use is subject to license terms.\n\
*/\n\
\n\
@@ -23,12 +23,12 @@ sed -n "s/$pattern/$replace/p" || exit 1
echo "\
};\n\
\n\
-static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);\n\
+static const int _dt_ntag = sizeof(_dt_errtags) / sizeof(_dt_errtags[0]);\n\
\n\
const char *
dt_errtag(dt_errtag_t tag)
{
- return (_dt_errtags[(tag > 0 && tag < _dt_ntag) ? tag : 0]);
+ return _dt_errtags[(tag > 0 && tag < _dt_ntag) ? tag : 0];
}"
exit 0
diff --git a/libdtrace/mknames.sh b/libdtrace/mknames.sh
index bbb61917..17d0cc2a 100755
--- a/libdtrace/mknames.sh
+++ b/libdtrace/mknames.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
# Oracle Linux DTrace.
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
echo "\
/*\n\
* Oracle Linux DTrace.\n\
- * Copyright (c) 2005,, Oracle and/or its affiliates. All rights reserved.\n\
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.\n\
* Use is subject to license terms.\n\
*/\n\
\n\
@@ -21,10 +21,10 @@ dtrace_subrstr(dtrace_hdl_t *dtp, int subr)\n\
awk '
/^#define[ ]*DIF_SUBR_/ && $2 != "DIF_SUBR_MAX" {
- printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10)));
+ printf("\tcase %s: return \"%s\";\n", $2, tolower(substr($2, 10)));
}'
echo "\
- default: return (\"unknown\");\n\
+ default: return \"unknown\";\n\
}\n\
}"
diff --git a/libport/gmatch.c b/libport/gmatch.c
index a045f238..49bcbefa 100644
--- a/libport/gmatch.c
+++ b/libport/gmatch.c
@@ -7,5 +7,5 @@
int
gmatch(const char *s, const char *p)
{
- return (fnmatch (p, s, 0) == 0);
+ return fnmatch (p, s, 0) == 0;
}
diff --git a/libport/p_online.c b/libport/p_online.c
index b42f4ce1..ad2e9dd0 100644
--- a/libport/p_online.c
+++ b/libport/p_online.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,7 +14,7 @@ p_online (int cpun)
char online;
FILE *of;
- snprintf(online_file, sizeof (online_file),
+ snprintf(online_file, sizeof(online_file),
"/sys/devices/system/cpu/cpu%i/online", cpun);
if ((of = fopen(online_file, "r")) == NULL)
return 0; /* Necessarily online */
diff --git a/libport/strlcat.c b/libport/strlcat.c
index f21b42cf..a848563b 100644
--- a/libport/strlcat.c
+++ b/libport/strlcat.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -28,10 +28,10 @@ strlcat(char *dst, const char *src, size_t dstsize)
df++;
l1 = df - dst;
if (dstsize == l1)
- return (l1 + l2);
+ return l1 + l2;
copied = l1 + l2 >= dstsize ? dstsize - l1 - 1 : l2;
- (void) memcpy(dst + l1, src, copied);
+ memcpy(dst + l1, src, copied);
dst[l1+copied] = '\0';
- return (l1 + l2);
+ return l1 + l2;
}
diff --git a/libport/strlcpy.c b/libport/strlcpy.c
index e763db7f..771ad700 100644
--- a/libport/strlcpy.c
+++ b/libport/strlcpy.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -21,13 +21,13 @@ strlcpy(char *dst, const char *src, size_t len)
size_t copied;
if (len == 0)
- return (slen);
+ return slen;
if (slen >= len)
copied = len - 1;
else
copied = slen;
- (void) memcpy(dst, src, copied);
+ memcpy(dst, src, copied);
dst[copied] = '\0';
- return (slen);
+ return slen;
}
diff --git a/libproc/Pcontrol.c b/libproc/Pcontrol.c
index dfb0d6b9..8c129a7f 100644
--- a/libproc/Pcontrol.c
+++ b/libproc/Pcontrol.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -62,8 +62,8 @@ static bkpt_t *bkpt_by_addr(struct ps_prochandle *P, uintptr_t addr,
int delete);
static int add_bkpt(struct ps_prochandle *P, uintptr_t addr,
int after_singlestep, int notifier,
- int (*bkpt_handler) (uintptr_t addr, void *data),
- void (*bkpt_cleanup) (void *data),
+ int (*bkpt_handler)(uintptr_t addr, void *data),
+ void (*bkpt_cleanup)(void *data),
void *data);
static void delete_bkpt_handler(struct bkpt *bkpt);
static jmp_buf **single_thread_unwinder_pad(struct ps_prochandle *unused);
@@ -120,18 +120,18 @@ Pcreate(
int status;
int forkblock[2];
- if ((P = malloc(sizeof (struct ps_prochandle))) == NULL) {
+ if ((P = malloc(sizeof(struct ps_prochandle))) == NULL) {
*perr = ENOMEM;
- return (NULL);
+ return NULL;
}
- memset(P, 0, sizeof (*P));
- P->bkpts = calloc(BKPT_HASH_BUCKETS, sizeof (struct bkpt_t *));
+ memset(P, 0, sizeof(*P));
+ P->bkpts = calloc(BKPT_HASH_BUCKETS, sizeof(struct bkpt_t *));
if (!P->bkpts) {
_dprintf("Out of memory initializing breakpoint hash\n");
*perr = ENOMEM;
free(P);
- return (NULL);
+ return NULL;
}
P->wrap_arg = wrap_arg;
@@ -141,7 +141,7 @@ Pcreate(
*perr = errno;
_dprintf("Pcreate: out of fds forking %s\n", file);
free(P);
- return (NULL);
+ return NULL;
}
if ((pid = fork()) == -1) {
@@ -149,7 +149,7 @@ Pcreate(
close(forkblock[0]);
close(forkblock[1]);
*perr = EAGAIN;
- return (NULL);
+ return NULL;
}
if (pid == 0) { /* child process */
@@ -161,14 +161,14 @@ Pcreate(
* then wait for our parent to ptrace us.
*/
if ((id = getgid()) != getegid())
- (void) setgid(id);
+ setgid(id);
if ((id = getuid()) != geteuid())
- (void) setuid(id);
+ setuid(id);
close(forkblock[1]);
read(forkblock[0], &dummy, 1);
close(forkblock[0]);
- (void) execvp(file, argv); /* execute the program */
+ execvp(file, argv); /* execute the program */
_exit(127);
}
close(forkblock[0]);
@@ -235,7 +235,7 @@ Pcreate(
* The process is now stopped, waiting in execve() until resumed.
*/
- snprintf(procname, sizeof (procname), "%s/%d/exe",
+ snprintf(procname, sizeof(procname), "%s/%d/exe",
procfs_path, P->pid);
if ((Pread_isa_info(P, procname)) < 0) {
@@ -252,12 +252,12 @@ Pcreate(
bad_untrace:
Puntrace(P, 0);
bad:
- (void) kill(pid, SIGKILL);
+ kill(pid, SIGKILL);
*perr = rc;
if (ptrace_lock_hook)
ptrace_lock_hook(P, P->wrap_arg, 0);
Pfree_internal(P);
- return (NULL);
+ return NULL;
}
/*
@@ -287,21 +287,21 @@ Pgrab(pid_t pid, int noninvasiveness, int already_ptraced, void *wrap_arg,
*perr = 0;
if (kill(pid, 0) == ESRCH) {
*perr = errno;
- return (NULL);
+ return NULL;
}
- if ((P = malloc(sizeof (struct ps_prochandle))) == NULL) {
+ if ((P = malloc(sizeof(struct ps_prochandle))) == NULL) {
*perr = ENOMEM;
- return (NULL);
+ return NULL;
}
- memset(P, 0, sizeof (*P));
+ memset(P, 0, sizeof(*P));
P->state = already_ptraced ? PS_TRACESTOP : PS_RUN;
P->pid = pid;
P->detach = 1;
if (Psym_init(P) < 0)
goto bad;
- P->bkpts = calloc(BKPT_HASH_BUCKETS, sizeof (struct bkpt_t *));
+ P->bkpts = calloc(BKPT_HASH_BUCKETS, sizeof(struct bkpt_t *));
if (!P->bkpts)
goto bad;
P->wrap_arg = wrap_arg;
@@ -356,7 +356,7 @@ Pgrab(pid_t pid, int noninvasiveness, int already_ptraced, void *wrap_arg,
P->noninvasive = TRUE;
}
- snprintf(procname, sizeof (procname), "%s/%d/exe",
+ snprintf(procname, sizeof(procname), "%s/%d/exe",
procfs_path, P->pid);
if ((Pread_isa_info(P, procname)) < 0)
@@ -436,7 +436,7 @@ Pclose(struct ps_prochandle *P)
int
Phasfds(struct ps_prochandle *P)
{
- return (P->memfd > -1);
+ return P->memfd > -1;
}
/*
@@ -452,7 +452,7 @@ Pstate(struct ps_prochandle *P)
if (P == NULL)
return PS_DEAD;
- return (P->state);
+ return P->state;
}
/*
@@ -473,9 +473,9 @@ Pmemfd(struct ps_prochandle *P)
char *fname;
if ((P->memfd != -1) || P->noninvasive)
- return (P->memfd);
+ return P->memfd;
- snprintf(procname, sizeof (procname), "%s/%d/",
+ snprintf(procname, sizeof(procname), "%s/%d/",
procfs_path, (int)P->pid);
fname = procname + strlen(procname);
@@ -483,10 +483,10 @@ Pmemfd(struct ps_prochandle *P)
if ((P->memfd = open(procname, O_RDONLY | O_EXCL | O_CLOEXEC)) < 0) {
_dprintf("Pmemfd: failed to open %s: %s\n",
procname, strerror(errno));
- return (-1);
+ return -1;
}
- return (P->memfd);
+ return P->memfd;
}
/*
@@ -505,12 +505,12 @@ Pmapfilefd(struct ps_prochandle *P)
static int no_map_files;
if (no_map_files)
- return (-1);
+ return -1;
if (P->mapfilefd != -1)
- return (P->mapfilefd);
+ return P->mapfilefd;
- snprintf(procname, sizeof (procname), "%s/%d/",
+ snprintf(procname, sizeof(procname), "%s/%d/",
procfs_path, (int)P->pid);
fname = procname + strlen(procname);
@@ -525,7 +525,7 @@ Pmapfilefd(struct ps_prochandle *P)
if ((P->mapfilefd < 0) && (errno == ENOENT))
no_map_files = 1;
- return (P->mapfilefd);
+ return P->mapfilefd;
}
/*
@@ -670,7 +670,7 @@ Pwait_internal(struct ps_prochandle *P, boolean_t block)
* process.
*/
if (P->state == PS_DEAD)
- return (0);
+ return 0;
do
{
@@ -679,23 +679,23 @@ Pwait_internal(struct ps_prochandle *P, boolean_t block)
switch (err) {
case 0:
- return(0);
+ return 0;
case -1:
if (errno == ECHILD) {
P->state = PS_DEAD;
- return (0);
+ return 0;
}
if (errno != EINTR) {
_dprintf("Pwait: error waiting: %s\n",
strerror(errno));
- return (-1);
+ return -1;
}
}
} while (errno == EINTR);
if (Pwait_handle_waitpid(P, status) < 0)
- return (-1);
+ return -1;
/*
* Now repeatedly loop, processing more waits until none remain.
@@ -705,7 +705,7 @@ Pwait_internal(struct ps_prochandle *P, boolean_t block)
num_waits += one_wait;
} while (one_wait > 0);
- return (num_waits + 1);
+ return num_waits + 1;
}
/*
@@ -721,7 +721,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
if (WIFCONTINUED(status)) {
_dprintf("%i: process got SIGCONT.\n", P->pid);
P->state = PS_RUN;
- return (0);
+ return 0;
}
/*
@@ -738,7 +738,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
_dprintf("%i: process status change: exit coming.\n", P->pid);
wrapped_ptrace(P, PTRACE_CONT, P->pid, NULL, 0);
- return (0);
+ return 0;
}
/*
@@ -749,7 +749,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
"exitcode %i\n", P->pid, WEXITSTATUS(status));
P->state = PS_DEAD;
- return (0);
+ return 0;
}
/*
@@ -830,7 +830,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
_dprintf("%i: random PTRACE_EVENT_STOP.\n", P->pid);
}
- return (0);
+ return 0;
}
/*
@@ -846,7 +846,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
WSTOPSIG(status));
wrapped_ptrace(P, PTRACE_CONT, P->pid, NULL,
WSTOPSIG(status));
- return(0);
+ return 0;
}
/*
@@ -880,7 +880,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
WSTOPSIG(status));
P->state = PS_RUN;
}
- return(0);
+ return 0;
}
/*
@@ -892,7 +892,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
"terminating signal %i.\n", P->pid, WTERMSIG(status));
wrapped_ptrace(P, PTRACE_CONT, P->pid, NULL, WTERMSIG(status));
- return(0);
+ return 0;
}
/*
@@ -922,7 +922,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
P->state = PS_TRACESTOP;
Pclose(P);
- snprintf(procname, sizeof (procname), "%s/%d/exe",
+ snprintf(procname, sizeof(procname), "%s/%d/exe",
procfs_path, P->pid);
/*
@@ -967,7 +967,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
Puntrace(P, 0);
- return(0);
+ return 0;
}
/*
@@ -1001,7 +1001,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
else
_dprintf("%i: continued parent.\n", P->pid);
P->state = PS_RUN;
- return(0);
+ return 0;
}
/*
@@ -1040,7 +1040,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
ignored_child_wait(P, pid, NULL);
wrapped_ptrace(P, PTRACE_CONT, P->pid, 0, 0);
P->state = PS_RUN;
- return(0);
+ return 0;
}
/*
@@ -1074,7 +1074,7 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
ip = Pget_bkpt_ip(P, 0);
bkpt = bkpt_by_addr(P, ip, FALSE);
- if (((unsigned long) ip == -1) || !bkpt) {
+ if (((unsigned long)ip == -1) || !bkpt) {
int sig = 0;
/*
* This is not a known breakpoint nor a temporary
@@ -1093,13 +1093,13 @@ Pwait_handle_waitpid(struct ps_prochandle *P, int status)
sig = SIGTRAP;
wrapped_ptrace(P, PTRACE_CONT, P->pid, NULL, sig);
- return(0);
+ return 0;
}
}
if (!P->bkpt_consume)
P->state = bkpt_handle(P, ip);
- return(0);
+ return 0;
}
/*
@@ -1221,7 +1221,7 @@ Ppush_state(struct ps_prochandle *P, int state)
{
prev_states_t *s;
- s = malloc(sizeof (struct prev_states));
+ s = malloc(sizeof(struct prev_states));
if (s == NULL)
return NULL;
@@ -1310,7 +1310,7 @@ Ptrace(struct ps_prochandle *P, int stopped)
Pwait(P, 0);
state->state = P->state;
if ((!stopped) || (P->state == PS_TRACESTOP))
- return(0);
+ return 0;
if (P->state == PS_DEAD)
return PS_DEAD;
@@ -1507,7 +1507,7 @@ static bkpt_t
P->bkpts[h] = bkpt->bkpt_next;
bkpt->bkpt_next = NULL;
}
- return (bkpt);
+ return bkpt;
}
last_bkpt = bkpt;
}
@@ -1524,11 +1524,11 @@ mask_bkpt(unsigned long word)
{
union {
unsigned long insn;
- char bkpt[sizeof (unsigned long)];
+ char bkpt[sizeof(unsigned long)];
} bkpt;
bkpt.insn = word;
- memcpy(bkpt.bkpt, (char *) plat_bkpt, sizeof (plat_bkpt));
+ memcpy(bkpt.bkpt, (char *)plat_bkpt, sizeof(plat_bkpt));
return bkpt.insn;
}
@@ -1558,8 +1558,8 @@ mask_bkpt(unsigned long word)
*/
int
Pbkpt(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
- int (*bkpt_handler) (uintptr_t addr, void *data),
- void (*bkpt_cleanup) (void *data),
+ int (*bkpt_handler)(uintptr_t addr, void *data),
+ void (*bkpt_cleanup)(void *data),
void *data)
{
if (P->noninvasive)
@@ -1578,22 +1578,22 @@ Pbkpt(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
*/
int
Pbkpt_notifier(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
- void (*bkpt_handler) (uintptr_t addr, void *data),
- void (*bkpt_cleanup) (void *data),
+ void (*bkpt_handler)(uintptr_t addr, void *data),
+ void (*bkpt_cleanup)(void *data),
void *data)
{
if (P->noninvasive)
return -ESRCH;
return add_bkpt(P, addr, after_singlestep, TRUE,
- (int (*) (uintptr_t addr, void *data)) bkpt_handler,
+ (int (*)(uintptr_t addr, void *data))bkpt_handler,
bkpt_cleanup, data);
}
static int
add_bkpt(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
- int is_notifier, int (*bkpt_handler) (uintptr_t addr, void *data),
- void (*bkpt_cleanup) (void *data),
+ int is_notifier, int (*bkpt_handler)(uintptr_t addr, void *data),
+ void (*bkpt_cleanup)(void *data),
void *data)
{
bkpt_t *bkpt = bkpt_by_addr(P, addr, FALSE);
@@ -1619,10 +1619,10 @@ add_bkpt(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
* leads to its being called multiple times.
*/
if (is_notifier) {
- notifier = malloc(sizeof (struct bkpt_handler));
+ notifier = malloc(sizeof(struct bkpt_handler));
if (!notifier)
return -ENOMEM;
- memset(notifier, 0, sizeof (struct bkpt_handler));
+ memset(notifier, 0, sizeof(struct bkpt_handler));
notifier->bkpt_handler = bkpt_handler;
notifier->bkpt_cleanup = bkpt_cleanup;
@@ -1643,11 +1643,11 @@ add_bkpt(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
* handler, if this is a notifier addition.
*/
- bkpt = malloc(sizeof (struct bkpt));
+ bkpt = malloc(sizeof(struct bkpt));
if (!bkpt)
goto err;
- memset(bkpt, 0, sizeof (struct bkpt));
+ memset(bkpt, 0, sizeof(struct bkpt));
if (!is_notifier) {
bkpt->bkpt_handler.bkpt_handler = bkpt_handler;
bkpt->bkpt_handler.bkpt_cleanup = bkpt_cleanup;
@@ -2077,8 +2077,8 @@ bkpt_handle_start(struct ps_prochandle *P, bkpt_t *bkpt)
bkpt->in_handler++;
P->bkpt_halted = 1;
for (; notifier; notifier = dt_list_next(notifier)) {
- void (*notify) (uintptr_t, void *) =
- (void (*) (uintptr_t, void *)) notifier->bkpt_handler;
+ void (*notify)(uintptr_t, void *) =
+ (void (*)(uintptr_t, void *))notifier->bkpt_handler;
notify(bkpt->bkpt_addr, notifier->bkpt_data);
}
@@ -2289,8 +2289,8 @@ bkpt_handle_post_singlestep(struct ps_prochandle *P, bkpt_t *bkpt)
bkpt->in_handler++;
for (; notifier; notifier = dt_list_next(notifier)) {
- void (*notify) (uintptr_t, void *) =
- (void (*) (uintptr_t, void *)) notifier->bkpt_handler;
+ void (*notify)(uintptr_t, void *) =
+ (void (*)(uintptr_t, void *))notifier->bkpt_handler;
notify(bkpt->bkpt_addr, notifier->bkpt_data);
}
@@ -2410,7 +2410,7 @@ Pread(struct ps_prochandle *P,
uintptr_t address) /* address in process */
{
if (address < LONG_MAX)
- return (pread(Pmemfd(P), buf, nbyte, (loff_t)address));
+ return pread(Pmemfd(P), buf, nbyte, (loff_t)address);
else {
/*
* High-address copying.
@@ -2421,13 +2421,13 @@ Pread(struct ps_prochandle *P,
*/
int state;
- uintptr_t saddr = (address & ~((uintptr_t) sizeof (long) - 1));
+ uintptr_t saddr = (address & ~((uintptr_t)sizeof(long) - 1));
size_t i, sz;
long *rbuf;
size_t len = nbyte + (address - saddr);
- if (len % sizeof (long) != 0)
- len += sizeof (long) - (len % sizeof (long));
+ if (len % sizeof(long) != 0)
+ len += sizeof(long) - (len % sizeof(long));
rbuf = malloc(len);
if (!rbuf)
@@ -2446,7 +2446,7 @@ Pread(struct ps_prochandle *P,
}
errno = 0;
- for (i = 0, sz = 0; sz < len; i++, sz += sizeof (long)) {
+ for (i = 0, sz = 0; sz < len; i++, sz += sizeof(long)) {
long data = wrapped_ptrace(P, PTRACE_PEEKDATA, P->pid,
saddr + sz, NULL);
if (errno != 0)
@@ -2477,7 +2477,7 @@ Pread_string(struct ps_prochandle *P,
if (size < 2) {
errno = EINVAL;
- return (-1);
+ return -1;
}
size--; /* ensure trailing null fits in buffer */
@@ -2488,17 +2488,17 @@ Pread_string(struct ps_prochandle *P,
for (nbyte = STRSZ; nbyte == STRSZ && leng < size; addr += STRSZ) {
if ((nbyte = Pread(P, string, STRSZ, addr)) <= 0) {
buf[leng] = '\0';
- return (leng ? leng : -1);
+ return leng ? leng : -1;
}
if ((nbyte = strlen(string)) > 0) {
if (leng + nbyte > size)
nbyte = size - leng;
- (void) strncpy(buf + leng, string, nbyte);
+ strncpy(buf + leng, string, nbyte);
leng += nbyte;
}
}
buf[leng] = '\0';
- return (leng);
+ return leng;
}
/*
@@ -2525,18 +2525,18 @@ Pread_scalar_quietly(struct ps_prochandle *P,
conv.b8 = 0;
- if (nbyte > sizeof (conv.b8)) {
+ if (nbyte > sizeof(conv.b8)) {
_dprintf("Pread_scalar(): Attempt to read scalar of size %lu "
"greater than max supported size %lu from PID %i\n",
- nbyte, sizeof (conv.b8), P->pid);
- return (-1);
+ nbyte, sizeof(conv.b8), P->pid);
+ return -1;
}
- if (nscalar > sizeof (conv.b8)) {
+ if (nscalar > sizeof(conv.b8)) {
_dprintf("Pread_scalar(): Attempt to read into scalar of size %lu "
"greater than max supported size %lu from PID %i\n",
- nscalar, sizeof (conv.b8), P->pid);
- return (-1);
+ nscalar, sizeof(conv.b8), P->pid);
+ return -1;
}
/*
@@ -2547,7 +2547,7 @@ Pread_scalar_quietly(struct ps_prochandle *P,
_dprintf("Pread_scalar(): Attempt to read scalar of size %lu into "
"scalar of size %lu PID %i: narrowing conversions are not "
"supported\n", nbyte, nscalar, P->pid);
- return (-1);
+ return -1;
}
if (Pread(P, (void *)&conv.b1, nbyte, address) != nbyte) {
@@ -2555,12 +2555,12 @@ Pread_scalar_quietly(struct ps_prochandle *P,
_dprintf("Pread_scalar(): attempt to read %lu bytes from PID %i at "
"address %lx read fewer bytes than expected.\n", nbyte,
P->pid, address);
- return(-1);
+ return -1;
}
memset(buf, 0, nscalar);
#if __BYTE_ORDER == __BIG_ENDIAN
- buf = (char *) buf + nscalar - nbyte;
+ buf = (char *)buf + nscalar - nbyte;
copybytes = nbyte;
#else
copybytes = nscalar;
@@ -2572,7 +2572,7 @@ Pread_scalar_quietly(struct ps_prochandle *P,
case sizeof(conv.b8): memcpy(buf, &conv.b8, copybytes); break;
default: _dprintf("Pread_scalar(): Attempt to read into a scalar of "
"%lu bytes is not supported.\n", nscalar);
- return(-1);
+ return -1;
}
return nbyte;
@@ -2597,7 +2597,7 @@ Pgetpid(struct ps_prochandle *P)
{
if (P == NULL)
return -1;
- return (P->pid);
+ return P->pid;
}
/*
@@ -2660,7 +2660,7 @@ Pexists(pid_t pid)
{
char procname[PATH_MAX + MAXLEN_PID + 1];
- snprintf(procname, sizeof (procname), "%s/%d",
+ snprintf(procname, sizeof(procname), "%s/%d",
procfs_path, pid);
return access(procname, F_OK) == 0;
}
@@ -2681,7 +2681,7 @@ Phastty(pid_t pid)
FILE *fp;
int tty;
- snprintf(procname, sizeof (procname), "%s/%d/stat",
+ snprintf(procname, sizeof(procname), "%s/%d/stat",
procfs_path, pid);
if ((fp = fopen(procname, "r")) == NULL) {
@@ -2713,7 +2713,7 @@ Phastty(pid_t pid)
_dprintf("%i: tty: %i\n", pid, tty);
free(buf);
- return (tty != 0);
+ return tty != 0;
}
/*
@@ -2741,7 +2741,7 @@ Pget_proc_status(pid_t pid, const char *field)
memmove(line, line + strlen(field) + 2,
strlen(line + strlen(field) + 2) + 1);
- _dprintf("%li: %s: %s", (long) pid, status, line);
+ _dprintf("%li: %s: %s", (long)pid, status, line);
fclose(fp);
return line;
}
@@ -2808,7 +2808,7 @@ Psystem_daemon(pid_t pid, uid_t useruid, const char *sysslice)
* the systemd cgroup line from /proc/$pid/cgroup.
*/
if (systemd_system != 0) {
- snprintf(procname, sizeof (procname), "%s/%d/cgroup",
+ snprintf(procname, sizeof(procname), "%s/%d/cgroup",
procfs_path, pid);
if ((fp = fopen(procname, "r")) == NULL) {
@@ -2867,7 +2867,7 @@ Psystem_daemon(pid_t pid, uid_t useruid, const char *sysslice)
struct stat s;
char buf[6];
- snprintf(procname, sizeof (procname), "%s/%d/fd/%d",
+ snprintf(procname, sizeof(procname), "%s/%d/fd/%d",
procfs_path, pid, fd);
/*
diff --git a/libproc/Pcontrol.h b/libproc/Pcontrol.h
index ac6371cd..f47f786d 100644
--- a/libproc/Pcontrol.h
+++ b/libproc/Pcontrol.h
@@ -136,11 +136,11 @@ typedef struct bkpt_handler {
* Return nonzero if the process should remain stopped at this
* breakpoint, or zero to continue.
*/
- int (*bkpt_handler) (uintptr_t addr, void *data);
+ int (*bkpt_handler)(uintptr_t addr, void *data);
/*
* Clean up any breakpoint state on Prelease() or breakpoint delete.
*/
- void (*bkpt_cleanup) (void *data);
+ void (*bkpt_cleanup)(void *data);
void *bkpt_data;
} bkpt_handler_t;
diff --git a/libproc/Psymtab.c b/libproc/Psymtab.c
index 79d87752..aca3382b 100644
--- a/libproc/Psymtab.c
+++ b/libproc/Psymtab.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -67,7 +67,7 @@ string_hash(const char *key)
}
}
- return (h);
+ return h;
}
/*
@@ -78,8 +78,8 @@ file_info_new(struct ps_prochandle *P, map_info_t *mptr)
{
file_info_t *fptr;
- if ((fptr = calloc(1, sizeof (file_info_t))) == NULL)
- return (NULL);
+ if ((fptr = calloc(1, sizeof(file_info_t))) == NULL)
+ return NULL;
dt_list_append(&P->file_list, fptr);
fptr->file_pname = strdup(mptr->map_pmap->pr_file->prf_mapname);
@@ -90,7 +90,7 @@ file_info_new(struct ps_prochandle *P, map_info_t *mptr)
fptr->file_ref = 1;
P->num_files++;
- return (fptr);
+ return fptr;
}
/*
@@ -181,7 +181,7 @@ mapping_purge(struct ps_prochandle *P)
free(old_prf);
}
- memset(P->map_files, 0, sizeof (struct prmap_file *) * MAP_HASH_BUCKETS);
+ memset(P->map_files, 0, sizeof(struct prmap_file *) * MAP_HASH_BUCKETS);
for (i = 0, fptr = dt_list_next(&P->file_list);
i < P->num_files; i++, fptr = dt_list_next(fptr)) {
@@ -203,7 +203,7 @@ mapping_purge(struct ps_prochandle *P)
int
Psym_init(struct ps_prochandle *P)
{
- P->map_files = calloc(MAP_HASH_BUCKETS, sizeof (struct prmap_file_t *));
+ P->map_files = calloc(MAP_HASH_BUCKETS, sizeof(struct prmap_file_t *));
if (!P->map_files) {
_dprintf("Out of memory initializing map_files hash\n");
return -ENOMEM;
@@ -233,7 +233,7 @@ static prmap_file_t *Pprmap_file_by_name(struct ps_prochandle *P,
for (prf = P->map_files[h]; prf != NULL; prf = prf->prf_next)
if (strcmp(prf->prf_mapname, name) == 0)
- return (prf);
+ return prf;
return NULL;
}
@@ -262,26 +262,26 @@ map_iter(const rd_loadobj_t *lop, size_t num, void *prochandle)
else {
_dprintf("map_iter: executable mapping, but not found "
"in /proc/%i/maps\n", P->pid);
- return (1);
+ return 1;
}
}
else if ((num == 1) && (lop->rl_nscopes == 1)) {
_dprintf("map_iter: skipping vdso\n");
- return (1);
+ return 1;
} else if (lop->rl_dyn == 0)
/*
* No dynamic section: this cannot be anything we are interested
* in.
*/
- return (1);
+ return 1;
else if ((mptr = Paddr2mptr(P, lop->rl_dyn)) == NULL) {
_dprintf("map_iter: base address of %lu doesn't match any mapping\n", lop->rl_dyn);
- return (1);
+ return 1;
}
if (mptr->map_file == NULL) {
_dprintf("map_iter: no file_info_t for this mapping\n");
- return (1);
+ return 1;
}
fptr = mptr->map_file;
@@ -292,9 +292,9 @@ map_iter(const rd_loadobj_t *lop, size_t num, void *prochandle)
*/
if (fptr->file_lo != NULL) {
free(fptr->file_lo->rl_scope);
- } else if ((fptr->file_lo = malloc(sizeof (rd_loadobj_t))) == NULL) {
+ } else if ((fptr->file_lo = malloc(sizeof(rd_loadobj_t))) == NULL) {
_dprintf("map_iter: failed to allocate rd_loadobj_t\n");
- return (1);
+ return 1;
}
*fptr->file_lo = *lop;
@@ -310,7 +310,7 @@ map_iter(const rd_loadobj_t *lop, size_t num, void *prochandle)
strdup(fptr->file_pname)) != NULL)
fptr->file_lbase = basename(fptr->file_lname);
}
- } else if (Pread_string(P, buf, sizeof (buf), lop->rl_nameaddr) >= 0) {
+ } else if (Pread_string(P, buf, sizeof(buf), lop->rl_nameaddr) >= 0) {
if ((fptr->file_lname == NULL) ||
(strcmp(fptr->file_lname, buf) != 0) ||
(buf[0] != '\0')) {
@@ -335,13 +335,13 @@ map_iter(const rd_loadobj_t *lop, size_t num, void *prochandle)
if (!fptr->file_lo->rl_scope) {
_dprintf("map_iter: failed to allocate raw symbol search "
"path\n");
- return (1);
+ return 1;
}
memcpy(fptr->file_lo->rl_scope, lop->rl_scope, scopes_size);
_dprintf("loaded rd object %s lmid %lx\n",
fptr->file_lname ? fptr->file_lname : "<NULL>", lop->rl_lmident);
- return (1);
+ return 1;
}
/*
@@ -364,7 +364,7 @@ Pupdate_symsearch(struct ps_prochandle *P, struct file_info *fptr)
return;
fptr->file_symsearch = calloc(fptr->file_lo->rl_nscopes,
- sizeof (struct file_info *));
+ sizeof(struct file_info *));
/*
* Failure to allocate here is not as serious as it seems: symbol
@@ -374,7 +374,7 @@ Pupdate_symsearch(struct ps_prochandle *P, struct file_info *fptr)
if (!fptr->file_symsearch) {
_dprintf("Cannot allocate %li bytes for symbol search "
"path for library with soname %s\n",
- fptr->file_lo->rl_nscopes * sizeof (struct file_info *),
+ fptr->file_lo->rl_nscopes * sizeof(struct file_info *),
fptr->file_lbase);
return;
}
@@ -404,7 +404,7 @@ Pupdate_symsearch(struct ps_prochandle *P, struct file_info *fptr)
for (i = 0; i < fptr->file_lo->rl_nscopes; i++) {
map_info_t *mptr;
- if (rd_get_scope(P->rap, (rd_loadobj_t *) &scope_lo, fptr->file_lo,
+ if (rd_get_scope(P->rap, (rd_loadobj_t *)&scope_lo, fptr->file_lo,
i) == NULL) {
_dprintf("Cannot read scope %lu in symbol search path "
"for library with soname %s\n", i,
@@ -482,16 +482,16 @@ Pupdate_maps(struct ps_prochandle *P)
*/
mapping_purge(P);
- (void) snprintf(mapfile, sizeof (mapfile), "%s/%d/maps",
+ snprintf(mapfile, sizeof(mapfile), "%s/%d/maps",
procfs_path, (int)P->pid);
if ((fp = fopen(mapfile, "r")) == NULL) {
Preset_maps(P);
return;
}
- snprintf(exefilesym, sizeof (exefilesym), "%s/%d/exe", procfs_path,
+ snprintf(exefilesym, sizeof(exefilesym), "%s/%d/exe", procfs_path,
(int)P->pid);
- if ((len = readlink(exefilesym, exefile, sizeof (exefile))) > 0)
+ if ((len = readlink(exefilesym, exefile, sizeof(exefile))) > 0)
exefile[len] = '\0';
while (getline(&line, &len, fp) >= 0) {
@@ -538,25 +538,25 @@ Pupdate_maps(struct ps_prochandle *P)
if (P->num_mappings >= old_num_mappings) {
map_info_t *mappings = realloc(P->mappings,
- sizeof (struct map_info) * (P->num_mappings + 1));
+ sizeof(struct map_info) * (P->num_mappings + 1));
if (!mappings)
goto err;
P->mappings = mappings;
}
mptr = &P->mappings[P->num_mappings];
- memset(mptr, 0, sizeof (struct map_info));
+ memset(mptr, 0, sizeof(struct map_info));
- mptr->map_pmap = malloc(sizeof (struct prmap));
+ mptr->map_pmap = malloc(sizeof(struct prmap));
if (!mptr->map_pmap)
goto err;
pmptr = mptr->map_pmap;
- memset(pmptr, 0, sizeof (struct prmap));
+ memset(pmptr, 0, sizeof(struct prmap));
if ((prf = Pprmap_file_by_name(P, fn)) == NULL) {
uint_t h = string_hash(fn) % MAP_HASH_BUCKETS;
- if ((prf = malloc(sizeof (struct prmap_file))) == NULL) {
+ if ((prf = malloc(sizeof(struct prmap_file))) == NULL) {
free(mptr->map_pmap);
goto err;
}
@@ -572,7 +572,7 @@ Pupdate_maps(struct ps_prochandle *P)
}
new_prf_mappings = realloc(prf->prf_mappings,
- (prf->prf_num_mappings + 1) * sizeof (struct prmap_t *));
+ (prf->prf_num_mappings + 1) * sizeof(struct prmap_t *));
if (new_prf_mappings == NULL) {
free(mptr->map_pmap);
@@ -796,13 +796,13 @@ rd_agent_t *
Prd_agent(struct ps_prochandle *P)
{
if (P->state == PS_DEAD)
- return (P->rap);
+ return P->rap;
if (P->rap == NULL && !P->noninvasive) {
Pupdate_maps(P);
Pupdate_lmids(P);
}
- return (P->rap);
+ return P->rap;
}
/*
@@ -815,7 +815,7 @@ Paddr_to_map(struct ps_prochandle *P, uintptr_t addr)
map_info_t *mptr;
if (P->state == PS_DEAD)
- return (NULL);
+ return NULL;
if (!P->info_valid) {
Pupdate_maps(P);
@@ -823,9 +823,9 @@ Paddr_to_map(struct ps_prochandle *P, uintptr_t addr)
}
if ((mptr = Paddr2mptr(P, addr)) != NULL)
- return (mptr->map_pmap);
+ return mptr->map_pmap;
- return (NULL);
+ return NULL;
}
/*
@@ -838,21 +838,21 @@ Plmid_to_map(struct ps_prochandle *P, Lmid_t lmid, const char *name)
map_info_t *mptr;
if (P->state == PS_DEAD)
- return (NULL);
+ return NULL;
if (name == PR_OBJ_EVERY)
- return (NULL); /* A reasonable mistake */
+ return NULL; /* A reasonable mistake */
if ((mptr = object_name_to_map(P, lmid, name)) != NULL)
- return (mptr->map_pmap);
+ return mptr->map_pmap;
- return (NULL);
+ return NULL;
}
const prmap_t *
Pname_to_map(struct ps_prochandle *P, const char *name)
{
- return (Plmid_to_map(P, PR_LMID_EVERY, name));
+ return Plmid_to_map(P, PR_LMID_EVERY, name);
}
/*
@@ -866,18 +866,18 @@ static int
byaddr_cmp_common(GElf_Sym *a, char *aname, GElf_Sym *b, char *bname)
{
if (a->st_value < b->st_value)
- return (-1);
+ return -1;
if (a->st_value > b->st_value)
- return (1);
+ return 1;
/*
* Prefer the function to the non-function.
*/
if (GELF_ST_TYPE(a->st_info) != GELF_ST_TYPE(b->st_info)) {
if (GELF_ST_TYPE(a->st_info) == STT_FUNC)
- return (-1);
+ return -1;
if (GELF_ST_TYPE(b->st_info) == STT_FUNC)
- return (1);
+ return 1;
}
/*
@@ -885,9 +885,9 @@ byaddr_cmp_common(GElf_Sym *a, char *aname, GElf_Sym *b, char *bname)
*/
if (GELF_ST_BIND(a->st_info) != GELF_ST_BIND(b->st_info)) {
if (GELF_ST_BIND(b->st_info) == STB_LOCAL)
- return (-1);
+ return -1;
if (GELF_ST_BIND(a->st_info) == STB_LOCAL)
- return (1);
+ return 1;
}
/*
@@ -895,9 +895,9 @@ byaddr_cmp_common(GElf_Sym *a, char *aname, GElf_Sym *b, char *bname)
* other symbol generators often use it as a prefix.
*/
if (*bname == '$')
- return (-1);
+ return -1;
if (*aname == '$')
- return (1);
+ return 1;
/*
* Prefer the name with fewer leading underscores.
@@ -908,22 +908,22 @@ byaddr_cmp_common(GElf_Sym *a, char *aname, GElf_Sym *b, char *bname)
}
if (*bname == '_')
- return (-1);
+ return -1;
if (*aname == '_')
- return (1);
+ return 1;
/*
* Prefer the symbol with the smaller size.
*/
if (a->st_size < b->st_size)
- return (-1);
+ return -1;
if (a->st_size > b->st_size)
- return (1);
+ return 1;
/*
* All other factors being equal, fall back to lexicographic order.
*/
- return (strcmp(aname, bname));
+ return strcmp(aname, bname);
}
static int
@@ -934,7 +934,7 @@ byaddr_cmp(const void *aa, const void *bb)
char *aname = sort_strs + a->st_name;
char *bname = sort_strs + b->st_name;
- return (byaddr_cmp_common(a, aname, b, bname));
+ return byaddr_cmp_common(a, aname, b, bname);
}
static int
@@ -945,7 +945,7 @@ byname_cmp(const void *aa, const void *bb)
char *aname = sort_strs + a->st_name;
char *bname = sort_strs + b->st_name;
- return (strcmp(aname, bname));
+ return strcmp(aname, bname);
}
/*
@@ -961,11 +961,11 @@ symtab_getsym(sym_tbl_t *symtab, int ndx, GElf_Sym *dst)
{
/* If index is in range of primary symtab, look it up there */
if (ndx >= symtab->sym_symn_aux)
- return (gelf_getsym(symtab->sym_data_pri,
- ndx - symtab->sym_symn_aux, dst));
+ return gelf_getsym(symtab->sym_data_pri,
+ ndx - symtab->sym_symn_aux, dst);
/* Not in primary: Look it up in the auxiliary symtab */
- return (gelf_getsym(symtab->sym_data_aux, ndx, dst));
+ return gelf_getsym(symtab->sym_data_aux, ndx, dst);
}
void __attribute__((__used__))
@@ -1011,7 +1011,7 @@ optimize_symtab(sym_tbl_t *symtab)
symn = symtab->sym_symn;
strsz = symtab->sym_strsz;
- symp = syms = malloc(sizeof (GElf_Sym) * symn);
+ symp = syms = malloc(sizeof(GElf_Sym) * symn);
if (symp == NULL) {
_dprintf("optimize_symtab: failed to malloc symbol array");
return;
@@ -1036,8 +1036,8 @@ optimize_symtab(sym_tbl_t *symtab)
* with the same symbols we just counted.
*/
symtab->sym_count = count;
- indexa = symtab->sym_byaddr = calloc(sizeof (uint_t), count);
- indexb = symtab->sym_byname = calloc(sizeof (uint_t), count);
+ indexa = symtab->sym_byaddr = calloc(sizeof(uint_t), count);
+ indexb = symtab->sym_byname = calloc(sizeof(uint_t), count);
if (indexa == NULL || indexb == NULL) {
_dprintf(
"optimize_symtab: failed to malloc symbol index arrays");
@@ -1057,16 +1057,16 @@ optimize_symtab(sym_tbl_t *symtab)
/*
* Sort the two tables according to the appropriate criteria.
*/
- (void) mutex_lock(&sort_mtx);
+ mutex_lock(&sort_mtx);
sort_strs = symtab->sym_strs;
sort_syms = syms;
- qsort(symtab->sym_byaddr, count, sizeof (uint_t), byaddr_cmp);
- qsort(symtab->sym_byname, count, sizeof (uint_t), byname_cmp);
+ qsort(symtab->sym_byaddr, count, sizeof(uint_t), byaddr_cmp);
+ qsort(symtab->sym_byname, count, sizeof(uint_t), byname_cmp);
sort_strs = NULL;
sort_syms = NULL;
- (void) mutex_unlock(&sort_mtx);
+ mutex_unlock(&sort_mtx);
free(syms);
}
@@ -1124,7 +1124,7 @@ Pbuild_file_symtab(struct ps_prochandle *P, file_info_t *fptr)
if (fd > -1)
close(fd);
if (velf)
- elf_end((Elf *) velf);
+ elf_end((Elf *)velf);
fptr->file_dyn_base = 0;
free(cache);
fptr->file_elf = NULL;
@@ -1250,7 +1250,7 @@ Pbuild_file_symtab(struct ps_prochandle *P, file_info_t *fptr)
}
velf = elf;
close(fd);
- if ((cache = malloc(nshdrs * sizeof (*cache))) == NULL) {
+ if ((cache = malloc(nshdrs * sizeof(*cache))) == NULL) {
_dprintf("failed to malloc section cache for mapping of %s\n",
fptr->file_pname);
goto bad;
@@ -1466,7 +1466,7 @@ Paddr2idx(struct ps_prochandle *P, uintptr_t addr)
/* check that addr is in [vaddr, vaddr + size) */
if ((addr - mp->map_pmap->pr_vaddr) < mp->map_pmap->pr_size)
- return (mid);
+ return mid;
if (addr < mp->map_pmap->pr_vaddr)
hi = mid - 1;
@@ -1489,7 +1489,7 @@ Paddr2mptr(struct ps_prochandle *P, uintptr_t addr)
ssize_t mpidx = Paddr2idx(P, addr);
if (mpidx == -1)
- return (NULL);
+ return NULL;
return &P->mappings[mpidx];
}
@@ -1548,7 +1548,7 @@ object_to_map(struct ps_prochandle *P, Lmid_t lmid, const char *objname)
if ((fp->file_pname && strcmp(fp->file_pname, objname) == 0) ||
(fp->file_lbase && strcmp(fp->file_lbase, objname) == 0) ||
(fp->file_lname && strcmp(fp->file_lname, objname) == 0))
- return (fp->file_map != -1 ? &P->mappings[fp->file_map] : mp);
+ return fp->file_map != -1 ? &P->mappings[fp->file_map] : mp;
}
objlen = strlen(objname);
@@ -1573,7 +1573,7 @@ object_to_map(struct ps_prochandle *P, Lmid_t lmid, const char *objname)
if (fp->file_lbase &&
(strncmp(fp->file_lbase, objname, objlen) == 0) &&
(fp->file_lbase[objlen] == '.'))
- return (fp->file_map != -1 ? &P->mappings[fp->file_map] : mp);
+ return fp->file_map != -1 ? &P->mappings[fp->file_map] : mp;
}
@@ -1583,9 +1583,9 @@ object_to_map(struct ps_prochandle *P, Lmid_t lmid, const char *objname)
*/
if ((lmid == PR_LMID_EVERY || lmid == LM_ID_BASE) &&
(strcmp(objname, "a.out") == 0) && (P->map_exec != -1))
- return (&P->mappings[P->map_exec]);
+ return &P->mappings[P->map_exec];
- return (NULL);
+ return NULL;
}
static map_info_t *
@@ -1616,7 +1616,7 @@ object_name_to_map(struct ps_prochandle *P, Lmid_t lmid, const char *name)
} else
mptr = object_to_map(P, lmid, name);
- return (mptr);
+ return mptr;
}
/*
@@ -1629,14 +1629,14 @@ sym_prefer(GElf_Sym *sym1, char *name1, GElf_Sym *sym2, char *name2)
* Prefer the non-NULL symbol.
*/
if (sym1 == NULL)
- return (sym2);
+ return sym2;
if (sym2 == NULL)
- return (sym1);
+ return sym1;
/*
* Defer to the sort ordering...
*/
- return (byaddr_cmp_common(sym1, name1, sym2, name2) <= 0 ? sym1 : sym2);
+ return byaddr_cmp_common(sym1, name1, sym2, name2) <= 0 ? sym1 : sym2;
}
/*
@@ -1654,7 +1654,7 @@ sym_by_addr(sym_tbl_t *symtab, GElf_Addr addr, GElf_Sym *symp, uint_t *idp)
int min, max, mid, omid = 0, found = 0;
if (symtab->sym_data_pri == NULL || symtab->sym_count == 0)
- return (NULL);
+ return NULL;
min = 0;
max = symtab->sym_count - 1;
@@ -1685,7 +1685,7 @@ sym_by_addr(sym_tbl_t *symtab, GElf_Addr addr, GElf_Sym *symp, uint_t *idp)
}
if (!found)
- return (NULL);
+ return NULL;
/*
* There may be many symbols with identical values so we walk
@@ -1707,7 +1707,7 @@ sym_by_addr(sym_tbl_t *symtab, GElf_Addr addr, GElf_Sym *symp, uint_t *idp)
*symp = sym;
if (idp != NULL)
*idp = i;
- return (symp);
+ return symp;
}
/*
@@ -1723,7 +1723,7 @@ sym_by_name(sym_tbl_t *symtab, const char *name, GElf_Sym *symp, uint_t *idp)
if (symtab->sym_data_pri == NULL || strs == NULL ||
symtab->sym_count == 0)
- return (NULL);
+ return NULL;
min = 0;
max = symtab->sym_count - 1;
@@ -1740,7 +1740,7 @@ sym_by_name(sym_tbl_t *symtab, const char *name, GElf_Sym *symp, uint_t *idp)
if ((cmp = strcmp(name, strs + symp->st_name)) == 0) {
if (idp != NULL)
*idp = i;
- return (symp);
+ return symp;
}
if (cmp < 0)
@@ -1749,7 +1749,7 @@ sym_by_name(sym_tbl_t *symtab, const char *name, GElf_Sym *symp, uint_t *idp)
min = mid + 1;
}
- return (NULL);
+ return NULL;
}
/*
@@ -1811,7 +1811,7 @@ sym_search_next(struct ps_prochandle *P, file_info_t *fptr,
}
case SSI_START_LINEAR:
state->path_index = 0;
- state->fptr = (file_info_t *) &P->file_list;
+ state->fptr = (file_info_t *)&P->file_list;
state->ssi_state = SSI_LINEAR;
/* Fall through */
@@ -1859,20 +1859,20 @@ Plookup_by_addr(struct ps_prochandle *P, uintptr_t addr, const char **sym_name,
file_info_t *fptr;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
Pupdate_maps(P);
Pupdate_lmids(P);
if ((mptr = Paddr2mptr(P, addr)) == NULL) /* no such address */
- return (-1);
+ return -1;
fptr = mptr->map_file;
Pbuild_file_symtab(P, fptr);
if (fptr->file_elf == NULL) /* not an ELF file */
- return (-1);
+ return -1;
/*
* Adjust the address by the load object base address in case the
@@ -1891,7 +1891,7 @@ Plookup_by_addr(struct ps_prochandle *P, uintptr_t addr, const char **sym_name,
name2 = fptr->file_dynsym.sym_strs + sym2.st_name;
if ((symp = sym_prefer(sym1p, name1, sym2p, name2)) == NULL)
- return (-1);
+ return -1;
if (sym_name)
*sym_name = strdup((symp == sym1p) ? name1 : name2);
@@ -1900,7 +1900,7 @@ Plookup_by_addr(struct ps_prochandle *P, uintptr_t addr, const char **sym_name,
if (GELF_ST_TYPE(symbolp->st_info) != STT_TLS)
symbolp->st_value += fptr->file_dyn_base;
- return (0);
+ return 0;
}
/*
* Search a specific symbol table looking for a symbol whose name matches the
@@ -1930,10 +1930,10 @@ Pxlookup_by_name_internal(
uint_t id;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
- memset(&sym, 0, sizeof (GElf_Sym));
- memset(&si, 0, sizeof (prsyminfo_t));
+ memset(&sym, 0, sizeof(GElf_Sym));
+ memset(&si, 0, sizeof(prsyminfo_t));
if (oname == PR_OBJ_EVERY) {
/* create all the file_info_t's for all the mappings */
@@ -1941,7 +1941,7 @@ Pxlookup_by_name_internal(
Pupdate_lmids(P);
if (!P->info_valid)
- return (-1);
+ return -1;
/*
* Start from the executable mapping, if known.
@@ -1958,7 +1958,7 @@ Pxlookup_by_name_internal(
just_one = 1;
if ((mptr = object_name_to_map(P, lmid, oname)) == NULL)
- return (-1);
+ return -1;
fptr = mptr->map_file;
@@ -2009,7 +2009,7 @@ Pxlookup_by_name_internal(
symp->st_value += fptr->file_dyn_base;
if (sym.st_shndx != SHN_UNDEF)
- return (0);
+ return 0;
if (rv != 0 ||
sym.st_shndx == SHN_UNDEF) {
@@ -2026,7 +2026,7 @@ Pxlookup_by_name_internal(
*symp = sym;
}
- return (rv);
+ return rv;
}
/*
@@ -2061,13 +2061,13 @@ Pobject_iter(struct ps_prochandle *P, proc_map_f *func, void *cd)
int rc = 0;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
Pupdate_maps(P);
Pupdate_lmids(P);
if (!P->info_valid)
- return (-1);
+ return -1;
for (cnt = P->num_files, fptr = dt_list_next(&P->file_list);
cnt; cnt--, fptr = dt_list_next(fptr)) {
@@ -2083,14 +2083,14 @@ Pobject_iter(struct ps_prochandle *P, proc_map_f *func, void *cd)
mptr = &P->mappings[fptr->file_map];
if ((rc = func(cd, mptr->map_pmap, lname)) != 0)
- return (rc);
+ return rc;
if (!P->info_valid) {
Pupdate_maps(P);
Pupdate_lmids(P);
}
}
- return (0);
+ return 0;
}
/*
@@ -2108,25 +2108,25 @@ Pobjname(struct ps_prochandle *P, uintptr_t addr,
file_info_t *fptr;
if (P->state == PS_DEAD)
- return (NULL);
+ return NULL;
Pupdate_maps(P);
Pupdate_lmids(P);
if ((mptr = Paddr2mptr(P, addr)) == NULL)
- return (NULL);
+ return NULL;
if ((fptr = mptr->map_file) == NULL)
- return (NULL);
+ return NULL;
if (fptr->file_lname != NULL)
- (void) strlcpy(buffer, fptr->file_lname, bufsize);
+ strlcpy(buffer, fptr->file_lname, bufsize);
else if (fptr->file_pname != NULL)
- (void) strlcpy(buffer, fptr->file_pname, bufsize);
+ strlcpy(buffer, fptr->file_pname, bufsize);
else
- return (NULL);
+ return NULL;
- return (buffer);
+ return buffer;
}
/*
@@ -2140,7 +2140,7 @@ Plmid(struct ps_prochandle *P, uintptr_t addr, Lmid_t *lmidp)
file_info_t *fptr;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
/* create all the file_info_t's for all the mappings */
Pupdate_maps(P);
@@ -2149,10 +2149,10 @@ Plmid(struct ps_prochandle *P, uintptr_t addr, Lmid_t *lmidp)
if ((mptr = Paddr2mptr(P, addr)) != NULL &&
(fptr = mptr->map_file) != NULL && fptr->file_lo != NULL) {
*lmidp = fptr->file_lo->rl_lmident;
- return (0);
+ return 0;
}
- return (-1);
+ return -1;
}
/*
@@ -2180,16 +2180,16 @@ Psymbol_iter_by_addr(struct ps_prochandle *P,
uint_t *map, i, ndx;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
if ((mptr = object_name_to_map(P, PR_LMID_EVERY, object_name)) == NULL)
- return (-1);
+ return -1;
fptr = mptr->map_file;
Pbuild_file_symtab(P, fptr);
if (fptr->file_elf == NULL) /* not an ELF file */
- return (-1);
+ return -1;
/*
* Search the specified symbol table.
@@ -2202,7 +2202,7 @@ Psymbol_iter_by_addr(struct ps_prochandle *P,
symtab = &fptr->file_dynsym;
break;
default:
- return (-1);
+ return -1;
}
strs = symtab->sym_strs;
@@ -2211,7 +2211,7 @@ Psymbol_iter_by_addr(struct ps_prochandle *P,
count = symtab->sym_count;
if (symtab->sym_data_pri == NULL || strs == NULL || count == 0)
- return (-1);
+ return -1;
rv = 0;
@@ -2264,7 +2264,7 @@ Psymbol_iter_by_addr(struct ps_prochandle *P,
}
}
- return (rv);
+ return rv;
}
/*
@@ -2274,11 +2274,11 @@ int
Pvalid_mapping(struct ps_prochandle *P, uintptr_t addr)
{
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
Pupdate_maps(P);
Pupdate_lmids(P);
- return (Paddr2mptr(P, addr) != NULL);
+ return Paddr2mptr(P, addr) != NULL;
}
/*
@@ -2290,12 +2290,12 @@ Pfile_mapping(struct ps_prochandle *P, uintptr_t addr)
map_info_t *mptr;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
Pupdate_maps(P);
Pupdate_lmids(P);
if ((mptr = Paddr2mptr(P, addr)) != NULL)
- return (mptr->map_file != NULL);
+ return mptr->map_file != NULL;
return 0;
}
/*
@@ -2307,13 +2307,13 @@ Pwritable_mapping(struct ps_prochandle *P, uintptr_t addr)
map_info_t *mptr;
if (P->state == PS_DEAD)
- return (-1);
+ return -1;
Pupdate_maps(P);
Pupdate_lmids(P);
if ((mptr = Paddr2mptr(P, addr)) == NULL)
return 0;
- return ((mptr->map_pmap->pr_mflags & MA_WRITE) != 0);
+ return (mptr->map_pmap->pr_mflags & MA_WRITE) != 0;
}
/*
diff --git a/libproc/arm64/isadep.c b/libproc/arm64/isadep.c
index cb6d6e7f..abdc6407 100644
--- a/libproc/arm64/isadep.c
+++ b/libproc/arm64/isadep.c
@@ -4,7 +4,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -59,12 +59,12 @@ Pread_first_arg_arm64(struct ps_prochandle *P)
*/
if (getregs_arm64(P, ®s) < 0)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
addr = regs.regs[0];
if ((errno == ESRCH) || (addr < 0))
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
return addr;
}
@@ -82,16 +82,16 @@ Pget_bkpt_ip_arm64(struct ps_prochandle *P, int expect_esrch)
struct user_pt_regs regs;
if (getregs_arm64(P, ®s) < 0)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
ip = regs.pc;
if ((errno == ESRCH) && (expect_esrch))
- return(0);
+ return 0;
if (errno != 0) {
_dprintf("Unexpected ptrace (PTRACE_GETREGSET) error: %s\n",
strerror(errno));
- return(-1);
+ return -1;
}
return ip;
diff --git a/libproc/arm64/isadep.h b/libproc/arm64/isadep.h
index 7cf724fa..fb607175 100644
--- a/libproc/arm64/isadep.h
+++ b/libproc/arm64/isadep.h
@@ -20,7 +20,7 @@
extern uintptr_t Pread_first_arg_arm64(struct ps_prochandle *P);
isa_dispatch_t dispatch[] = {
- {B_TRUE, EM_AARCH64, (dispatch_fun_t *) Pread_first_arg_arm64},
+ {B_TRUE, EM_AARCH64, (dispatch_fun_t *)Pread_first_arg_arm64},
{0, 0, NULL}};
#endif
@@ -30,7 +30,7 @@ isa_dispatch_t dispatch[] = {
extern uintptr_t Pget_bkpt_ip_arm64(struct ps_prochandle *P, int expect_esrch);
isa_dispatch_t dispatch[] = {
- {B_TRUE, EM_AARCH64, (dispatch_fun_t *) Pget_bkpt_ip_arm64},
+ {B_TRUE, EM_AARCH64, (dispatch_fun_t *)Pget_bkpt_ip_arm64},
{0, 0, NULL}};
#endif
@@ -40,7 +40,7 @@ isa_dispatch_t dispatch[] = {
extern long Preset_bkpt_ip_arm64(struct ps_prochandle *P, uintptr_t addr);
isa_dispatch_t dispatch[] = {
- {B_TRUE, EM_AARCH64, (dispatch_fun_t *) Preset_bkpt_ip_arm64},
+ {B_TRUE, EM_AARCH64, (dispatch_fun_t *)Preset_bkpt_ip_arm64},
{0, 0, NULL}};
#endif
diff --git a/libproc/elfish.c b/libproc/elfish.c
index 9032bf47..f4e54e83 100644
--- a/libproc/elfish.c
+++ b/libproc/elfish.c
@@ -4,7 +4,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -43,7 +43,7 @@ Pread_isa_info(struct ps_prochandle *P, const char *procname)
return -1;
}
- if (read(fd, &hdr, sizeof (hdr)) < 0) {
+ if (read(fd, &hdr, sizeof(hdr)) < 0) {
_dprintf("%s is not an ELF file\n", procname);
close(fd);
return -1;
@@ -78,7 +78,7 @@ Preadauxvec(struct ps_prochandle *P)
char auxfile[PATH_MAX + MAXLEN_PID + strlen("/auxv") + 1];
ssize_t i;
int fd;
- char buf[sizeof (Elf64_auxv_t)];
+ char buf[sizeof(Elf64_auxv_t)];
if (P->state == PS_DEAD)
return;
@@ -87,7 +87,7 @@ Preadauxvec(struct ps_prochandle *P)
P->auxv = NULL;
P->nauxv = 0;
- snprintf(auxfile, sizeof (auxfile), "%s/%d/auxv", procfs_path,
+ snprintf(auxfile, sizeof(auxfile), "%s/%d/auxv", procfs_path,
(int)P->pid);
if ((fd = open(auxfile, O_RDONLY)) < 0) {
_dprintf("Cannot open auxiliary vector file %s: %s\n",
@@ -111,7 +111,7 @@ Preadauxvec(struct ps_prochandle *P)
}
_dprintf("%i: %u auxv entries.\n", P->pid, P->nauxv);
- if ((P->auxv = malloc(P->nauxv * sizeof (auxv_t))) == NULL) {
+ if ((P->auxv = malloc(P->nauxv * sizeof(auxv_t))) == NULL) {
_dprintf("Out of memory allocating aux vector\n");
close(fd);
return;
@@ -145,27 +145,27 @@ Pgetauxval(struct ps_prochandle *P, int type)
auxv_t *auxv;
if (Pstate(P) == PS_DEAD)
- return (-1);
+ return -1;
if (P->auxv == NULL)
Preadauxvec(P);
if (P->auxv == NULL)
- return (-1);
+ return -1;
for (auxv = P->auxv; auxv->a_type != AT_NULL; auxv++) {
if (auxv->a_type == type)
- return (auxv->a_un.a_val);
+ return auxv->a_un.a_val;
}
- return (-1);
+ return -1;
}
uintptr_t
r_debug(struct ps_prochandle *P)
{
if (Pstate(P) == PS_DEAD)
- return (0);
+ return 0;
if (P->r_debug_addr)
return P->r_debug_addr;
diff --git a/libproc/elfish_64.c b/libproc/elfish_64.c
index 45832c62..3e40e2f2 100644
--- a/libproc/elfish_64.c
+++ b/libproc/elfish_64.c
@@ -4,7 +4,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -69,13 +69,13 @@ BITIZE(r_debug)(struct ps_prochandle *P)
return -1;
}
- if (phent != sizeof (phdr)) {
+ if (phent != sizeof(phdr)) {
static int warned = 0;
if (!warned) {
fprintf(stderr, "%i: AT_PHENT is the wrong "
"size: %li bytes versus an expected %li.\n"
"This should never happen.\n", P->pid, phent,
- sizeof (phdr));
+ sizeof(phdr));
warned = 1;
}
return -1;
@@ -84,14 +84,14 @@ BITIZE(r_debug)(struct ps_prochandle *P)
/*
* Find the PT_DYNAMIC and PT_PHDR sections.
*/
- for (i = 0; i < phnum && num_found < 2; i++, phaddr += sizeof (phdr)) {
+ for (i = 0; i < phnum && num_found < 2; i++, phaddr += sizeof(phdr)) {
ssize_t foo;
- if ((foo = Pread(P, &phdr, sizeof (phdr),
- (uintptr_t) phaddr)) != sizeof (phdr)) {
+ if ((foo = Pread(P, &phdr, sizeof(phdr),
+ (uintptr_t)phaddr)) != sizeof(phdr)) {
- _dprintf("short read: phdr end: read %li, sizeof (phdr) %li\n",
- foo, sizeof (phdr));
+ _dprintf("short read: phdr end: read %li, sizeof(phdr) %li\n",
+ foo, sizeof(phdr));
/*
* Short read -> assume end of phdr.
*/
@@ -135,9 +135,9 @@ BITIZE(r_debug)(struct ps_prochandle *P)
* Find the DT_DEBUG dynamic tag.
*/
- for (i = 0; i < dynsize; i += sizeof (dyn), dynaddr += sizeof (dyn)) {
- if (Pread(P, &dyn, sizeof (dyn),
- (uintptr_t) (dynaddr + reloc)) != sizeof (dyn)) {
+ for (i = 0; i < dynsize; i += sizeof(dyn), dynaddr += sizeof(dyn)) {
+ if (Pread(P, &dyn, sizeof(dyn),
+ (uintptr_t)(dynaddr + reloc)) != sizeof(dyn)) {
/*
* Short read -> assume end of dynamic section.
*/
diff --git a/libproc/i386/isadep.c b/libproc/i386/isadep.c
index 8f6a3e07..e064f28f 100644
--- a/libproc/i386/isadep.c
+++ b/libproc/i386/isadep.c
@@ -4,7 +4,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -33,17 +33,17 @@ Pread_first_arg_x86_64(struct ps_prochandle *P)
if (Pstate(P) == PS_RUN ||
Pstate(P) == PS_DEAD)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
/*
* For x86-64, the first integral argument to a function will always be
* in %rdi.
*/
- addr = wrapped_ptrace(P, PTRACE_PEEKUSER, P->pid, RDI * sizeof (long));
+ addr = wrapped_ptrace(P, PTRACE_PEEKUSER, P->pid, RDI * sizeof(long));
if ((errno == ESRCH) || (addr < 0))
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
return addr;
}
@@ -56,21 +56,21 @@ Pread_first_arg_x86(struct ps_prochandle *P)
if (Pstate(P) == PS_RUN ||
Pstate(P) == PS_DEAD)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
/*
* For 32-bit x86, we have to look on the stack.
*/
stackaddr = wrapped_ptrace(P, PTRACE_PEEKUSER, P->pid,
- RSP * sizeof (long));
+ RSP * sizeof(long));
if ((errno == ESRCH) || (stackaddr < 0))
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
- stackaddr += 4; /* 32-bit Linux x86's sizeof (long), stack grows down */
+ stackaddr += 4; /* 32-bit Linux x86's sizeof(long), stack grows down */
if (Pread_scalar(P, &addr, 4, sizeof(addr), stackaddr) < 0)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
return addr;
}
@@ -85,14 +85,14 @@ Pget_bkpt_ip_x86(struct ps_prochandle *P, int expect_esrch)
{
long ip;
errno = 0;
- ip = wrapped_ptrace(P, PTRACE_PEEKUSER, P->pid, RIP * sizeof (long));
+ ip = wrapped_ptrace(P, PTRACE_PEEKUSER, P->pid, RIP * sizeof(long));
if ((errno == ESRCH) && (expect_esrch))
- return(0);
+ return 0;
if (errno != 0) {
_dprintf("Unexpected ptrace (PTRACE_PEEKUSER) error: %s\n",
strerror(errno));
- return(-1);
+ return -1;
}
/*
* The x86 increments its instruction pointer before triggering the
@@ -111,6 +111,6 @@ Pget_bkpt_ip_x86(struct ps_prochandle *P, int expect_esrch)
long
Preset_bkpt_ip_x86(struct ps_prochandle *P, uintptr_t addr)
{
- return wrapped_ptrace(P, PTRACE_POKEUSER, P->pid, RIP * sizeof (long),
+ return wrapped_ptrace(P, PTRACE_POKEUSER, P->pid, RIP * sizeof(long),
addr);
}
diff --git a/libproc/i386/isadep.h b/libproc/i386/isadep.h
index 1220182f..c0439ca3 100644
--- a/libproc/i386/isadep.h
+++ b/libproc/i386/isadep.h
@@ -21,8 +21,8 @@ extern uintptr_t Pread_first_arg_x86_64(struct ps_prochandle *P);
extern uintptr_t Pread_first_arg_x86(struct ps_prochandle *P);
isa_dispatch_t dispatch[] = {
- {B_TRUE, EM_X86_64, (dispatch_fun_t *) Pread_first_arg_x86_64},
- {B_FALSE, EM_386, (dispatch_fun_t *) Pread_first_arg_x86},
+ {B_TRUE, EM_X86_64, (dispatch_fun_t *)Pread_first_arg_x86_64},
+ {B_FALSE, EM_386, (dispatch_fun_t *)Pread_first_arg_x86},
{0, 0, NULL}};
#endif
@@ -32,8 +32,8 @@ isa_dispatch_t dispatch[] = {
extern uintptr_t Pget_bkpt_ip_x86(struct ps_prochandle *P, int expect_esrch);
isa_dispatch_t dispatch[] = {
- {B_TRUE, EM_X86_64, (dispatch_fun_t *) Pget_bkpt_ip_x86},
- {B_FALSE, EM_386, (dispatch_fun_t *) Pget_bkpt_ip_x86},
+ {B_TRUE, EM_X86_64, (dispatch_fun_t *)Pget_bkpt_ip_x86},
+ {B_FALSE, EM_386, (dispatch_fun_t *)Pget_bkpt_ip_x86},
{0, 0, NULL}};
#endif
@@ -43,8 +43,8 @@ isa_dispatch_t dispatch[] = {
extern long Preset_bkpt_ip_x86(struct ps_prochandle *P, uintptr_t addr);
isa_dispatch_t dispatch[] = {
- {B_TRUE, EM_X86_64, (dispatch_fun_t *) Preset_bkpt_ip_x86},
- {B_FALSE, EM_386, (dispatch_fun_t *) Preset_bkpt_ip_x86},
+ {B_TRUE, EM_X86_64, (dispatch_fun_t *)Preset_bkpt_ip_x86},
+ {B_FALSE, EM_386, (dispatch_fun_t *)Preset_bkpt_ip_x86},
{0, 0, NULL}};
#endif
diff --git a/libproc/isadep_dispatch.c b/libproc/isadep_dispatch.c
index bc2360f5..fa24f526 100644
--- a/libproc/isadep_dispatch.c
+++ b/libproc/isadep_dispatch.c
@@ -30,17 +30,17 @@
#define ISADEP_BODY(ret, ...) do { \
dispatch_fun_t *dispatch_fun; \
\
- dispatch_fun = (dispatch_fun_t *) search_dispatch(P, dispatch); \
+ dispatch_fun = (dispatch_fun_t *)search_dispatch(P, dispatch); \
\
if (dispatch_fun == NULL) { \
_dprintf("%s: no ISA match for %s-bit process for ELF machine " \
"%i\n", __func__, P->elf64?"64":"32", P->elf_machine); \
errno = ENOEXEC; \
- return (ret) -1; \
+ return (ret)-1; \
} \
\
return dispatch_fun(__VA_ARGS__); \
- } while(0);
+ } while (0)
/*
* General function dispatch table for ISA-specific functions. A separate
diff --git a/libproc/libproc.h b/libproc/libproc.h
index 46728562..764b46a0 100644
--- a/libproc/libproc.h
+++ b/libproc/libproc.h
@@ -184,12 +184,12 @@ extern void Pset_libproc_unwinder_pad(libproc_unwinder_pad_fun *unwinder_pad);
* signal return.
*/
extern int Pbkpt(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
- int (*bkpt_handler) (uintptr_t addr, void *data),
- void (*bkpt_cleanup) (void *data),
+ int (*bkpt_handler)(uintptr_t addr, void *data),
+ void (*bkpt_cleanup)(void *data),
void *data);
extern int Pbkpt_notifier(struct ps_prochandle *P, uintptr_t addr, int after_singlestep,
- void (*bkpt_handler) (uintptr_t addr, void *data),
- void (*bkpt_cleanup) (void *data),
+ void (*bkpt_handler)(uintptr_t addr, void *data),
+ void (*bkpt_cleanup)(void *data),
void *data);
extern void Punbkpt(struct ps_prochandle *P, uintptr_t address);
extern int Pbkpt_continue(struct ps_prochandle *P);
diff --git a/libproc/mkoffsets.sh b/libproc/mkoffsets.sh
index 91f85d4e..96c1ed18 100755
--- a/libproc/mkoffsets.sh
+++ b/libproc/mkoffsets.sh
@@ -7,7 +7,7 @@
#
#
# Oracle Linux DTrace.
-# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
@@ -203,18 +203,18 @@ EOF
$build_offsets r_debug_offsets R
cat >> $INIT <<'EOF'
- memcpy((void *) r_debug_offsets, r_debug_offsets_build,
- sizeof (r_debug_offsets_build));
+ memcpy((void *)r_debug_offsets, r_debug_offsets_build,
+ sizeof(r_debug_offsets_build));
- memset((void *) link_map_offsets_build, 0, sizeof(struct rtld_offsets) *
+ memset((void *)link_map_offsets_build, 0, sizeof(struct rtld_offsets) *
(L_LAST_OFFSET+1));
EOF
$build_offsets link_map_offsets L
cat >> $INIT <<'EOF'
- memcpy((void *) link_map_offsets, link_map_offsets_build,
- sizeof (link_map_offsets_build));
+ memcpy((void *)link_map_offsets, link_map_offsets_build,
+ sizeof(link_map_offsets_build));
initialized = 1;
}
EOF
diff --git a/libproc/rtld_db.c b/libproc/rtld_db.c
index 21cb7d36..1b0d1f73 100644
--- a/libproc/rtld_db.c
+++ b/libproc/rtld_db.c
@@ -4,7 +4,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -112,7 +112,7 @@ dl_nns(rd_agent_t *rd)
* true anyway).
*/
if (Pread_scalar(rd->P, &buf, rd->P->elf64 ? G_DL_NNS_64_SIZE :
- G_DL_NNS_32_SIZE, sizeof (size_t), rtld_global(rd) +
+ G_DL_NNS_32_SIZE, sizeof(size_t), rtld_global(rd) +
(rd->P->elf64 ? G_DL_NNS_64_OFFSET : G_DL_NNS_32_OFFSET)) < 0) {
_dprintf("%i: Cannot read namespace count\n", rd->P->pid);
return 1;
@@ -252,7 +252,7 @@ first_link_map(rd_agent_t *rd, Lmid_t lmid)
lmid);
if (Pread_scalar(rd->P, &link_map_addr, rd->P->elf64 ? G_NS_LOADED_64_SIZE :
- G_NS_LOADED_32_SIZE, sizeof (struct link_map *), link_map_ptr_addr) < 0) {
+ G_NS_LOADED_32_SIZE, sizeof(struct link_map *), link_map_ptr_addr) < 0) {
_dprintf("%i: Cannot read link map pointer\n", rd->P->pid);
return 0;
}
@@ -312,7 +312,7 @@ find_l_searchlist(rd_agent_t *rd)
return -1;
for (loadobj = first_loadobj; loadobj != 0;
- loadobj = (uintptr_t) map.l_next) {
+ loadobj = (uintptr_t)map.l_next) {
nmaps++;
if (rd_get_link_map(rd, &map, loadobj) == NULL)
break;
@@ -331,7 +331,7 @@ find_l_searchlist(rd_agent_t *rd)
uintptr_t *map_addrs;
uintptr_t *mapp;
- map_addrs = calloc(nmaps, sizeof (uintptr_t));
+ map_addrs = calloc(nmaps, sizeof(uintptr_t));
if (!map_addrs) {
_dprintf("Out of memory locating glibc searchlist "
"when allocating room for %li link maps\n", nmaps);
@@ -341,7 +341,7 @@ find_l_searchlist(rd_agent_t *rd)
for (mapp = map_addrs,
loadobj = first_link_map(rd, 0);
loadobj != 0;
- loadobj = (uintptr_t) map.l_next, mapp++) {
+ loadobj = (uintptr_t)map.l_next, mapp++) {
_dprintf("%i: Noted map at %lx\n", rd->P->pid, loadobj);
@@ -350,7 +350,7 @@ find_l_searchlist(rd_agent_t *rd)
break;
}
- qsort(map_addrs, nmaps, sizeof (uintptr_t), ascending_uintptrs);
+ qsort(map_addrs, nmaps, sizeof(uintptr_t), ascending_uintptrs);
/*
* We now have the primary link maps' addresses in a rapidly searchable
@@ -407,13 +407,13 @@ find_l_searchlist(rd_agent_t *rd)
if (Pread_scalar_quietly(rd->P, &poss_l_searchlist_r_list,
rd->P->elf64 ? L_NEXT_64_SIZE : L_NEXT_32_SIZE,
- sizeof (uintptr_t), scan, 1) < 0) {
+ sizeof(uintptr_t), scan, 1) < 0) {
break;
}
if (Pread_scalar_quietly(rd->P, &poss_l_searchlist_r_nlist,
rd->P->elf64 ? UINT_64_SIZE : UINT_32_SIZE,
- sizeof (unsigned int), scan_next, 1) < 0) {
+ sizeof(unsigned int), scan_next, 1) < 0) {
break;
}
@@ -443,13 +443,13 @@ find_l_searchlist(rd_agent_t *rd)
if (Pread_scalar_quietly(rd->P, &poss_map,
rd->P->elf64 ? L_NEXT_64_SIZE : L_NEXT_32_SIZE,
- sizeof (uintptr_t), scope_array_scan, 1) < 0) {
+ sizeof(uintptr_t), scope_array_scan, 1) < 0) {
unmatched = 1;
break;
}
if (bsearch(&poss_map, map_addrs, nmaps,
- sizeof (uintptr_t),
+ sizeof(uintptr_t),
ascending_uintptrs) == NULL) {
unmatched = 1;
break;
@@ -534,8 +534,8 @@ rd_get_loadobj_link_map(rd_agent_t *rd, rd_loadobj_t *buf,
goto fail;
buf->rl_diff_addr = map->l_addr;
- buf->rl_nameaddr = (uintptr_t) map->l_name;
- buf->rl_dyn = (uintptr_t) map->l_ld;
+ buf->rl_nameaddr = (uintptr_t)map->l_name;
+ buf->rl_dyn = (uintptr_t)map->l_ld;
/*
* Now put together the scopes array. Avoid calling the allocator too
@@ -549,12 +549,12 @@ rd_get_loadobj_link_map(rd_agent_t *rd, rd_loadobj_t *buf,
if (Pread_scalar(rd->P, &searchlist, rd->P->elf64 ?
L_NEXT_64_SIZE : L_NEXT_32_SIZE,
- sizeof (uintptr_t), addr + rd->l_searchlist_offset) < 0)
+ sizeof(uintptr_t), addr + rd->l_searchlist_offset) < 0)
goto fail;
if (Pread_scalar(rd->P, &buf->rl_nscopes, rd->P->elf64 ?
UINT_64_SIZE : UINT_32_SIZE,
- sizeof (unsigned int), addr + rd->l_searchlist_offset +
+ sizeof(unsigned int), addr + rd->l_searchlist_offset +
(rd->P->elf64 ? L_NEXT_64_SIZE : L_NEXT_32_SIZE)) < 0)
goto fail;
@@ -578,7 +578,7 @@ rd_get_loadobj_link_map(rd_agent_t *rd, rd_loadobj_t *buf,
L_NEXT_32_SIZE;
if (Pread_scalar(rd->P, &buf->rl_scope[i], link_map_ptr_size,
- sizeof (uintptr_t), searchlist +
+ sizeof(uintptr_t), searchlist +
(i * link_map_ptr_size)) < 0)
goto fail;
}
@@ -622,7 +622,7 @@ ns_nloaded(rd_agent_t *rd, Lmid_t lmid)
* If the read fails, assume 1 (almost always true anyway).
*/
if (Pread_scalar(rd->P, &buf, rd->P->elf64 ? G_NLOADED_64_SIZE :
- G_NLOADED_32_SIZE, sizeof (unsigned int), addr) < 0) {
+ G_NLOADED_32_SIZE, sizeof(unsigned int), addr) < 0) {
_dprintf("%i: Cannot read loaded object count\n", rd->P->pid);
return 1;
}
@@ -648,7 +648,7 @@ load_lock(rd_agent_t *rd)
if (Pread_scalar(rd->P, &lock_count, rd->P->elf64 ?
G_DL_LOAD_LOCK_64_SIZE : G_DL_LOAD_LOCK_32_SIZE,
- sizeof (unsigned int), rtld_global(rd) +
+ sizeof(unsigned int), rtld_global(rd) +
(rd->P->elf64 ? G_DL_LOAD_LOCK_64_OFFSET :
G_DL_LOAD_LOCK_32_OFFSET)) < 0)
return -1;
@@ -1306,7 +1306,7 @@ rd_new(struct ps_prochandle *P)
if (P->state == PS_DEAD) {
_dprintf("%i: Cannot initialize rd_agent: "
"process is dead.\n", P->pid);
- return (NULL);
+ return NULL;
}
/*
@@ -1317,20 +1317,20 @@ rd_new(struct ps_prochandle *P)
if (r_debug_addr == -1) {
_dprintf("%i: Cannot initialize rd_agent: no "
"r_debug.\n", P->pid);
- return (NULL);
+ return NULL;
}
Pwait(P, 0);
- rd = calloc(sizeof (struct rd_agent), 1);
+ rd = calloc(sizeof(struct rd_agent), 1);
if (rd == NULL)
- return (NULL);
+ return NULL;
/*
* Protect against multiple calls.
*/
if (P->rap) {
free(rd);
- return (P->rap);
+ return P->rap;
}
rd->P = P;
@@ -1392,12 +1392,12 @@ rd_new(struct ps_prochandle *P)
Puntrace(P, 0);
_dprintf("%i: Activated rtld_db agent.\n", rd->P->pid);
- return (rd);
+ return rd;
err:
Puntrace(P, 0);
free(P->rap);
P->rap = NULL;
- return (NULL);
+ return NULL;
}
/*
@@ -1695,7 +1695,7 @@ rd_loadobj_iter(rd_agent_t *rd, rl_iter_f *fun, void *state)
num++;
n++;
- loadobj = (uintptr_t) map.l_next;
+ loadobj = (uintptr_t)map.l_next;
}
/*
diff --git a/libproc/sparc/isadep.c b/libproc/sparc/isadep.c
index 348143d6..aa4f53f5 100644
--- a/libproc/sparc/isadep.c
+++ b/libproc/sparc/isadep.c
@@ -4,7 +4,7 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -67,7 +67,7 @@ Pread_first_arg_sparc64(struct ps_prochandle *P)
struct pt_regs regs;
if (getregs_sparc64(P, ®s) == NULL)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
return regs.u_regs[UREG_I0 - 1];
}
@@ -78,7 +78,7 @@ Pread_first_arg_sparc32(struct ps_prochandle *P)
struct pt_regs32 regs;
if (getregs_sparc32(P, ®s) == NULL)
- return (uintptr_t) -1;
+ return (uintptr_t)-1;
return regs.u_regs[UREG_I0 - 1];
}
@@ -94,11 +94,11 @@ Pget_bkpt_ip_sparc64(struct ps_prochandle *P, int expect_esrch)
if (getregs_sparc64(P, ®s) == NULL) {
if ((errno == ESRCH) && (expect_esrch))
- return(0);
+ return 0;
else {
_dprintf("Unexpected ptrace (PTRACE_GETREGSET) "
"error: %s\n", strerror(errno));
- return(-1);
+ return -1;
}
}
@@ -126,7 +126,7 @@ extern long Pget_next_ip_sparc64(struct ps_prochandle *P, uintptr_t addr)
if (getregs_sparc64(P, ®s) == NULL) {
_dprintf("Unexpected ptrace (PTRACE_GETREGSET) "
"error: %s\n", strerror(errno));
- return(-1);
+ return -1;
}
return regs.tnpc;
diff --git a/test/demo/struct/kstat.d b/test/demo/struct/kstat.d
index 058c0c04..1ccc3bb4 100644
--- a/test/demo/struct/kstat.d
+++ b/test/demo/struct/kstat.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -17,7 +17,7 @@ pid$1:libkstat:kstat_data_lookup:entry
pid$1:libkstat:kstat_data_lookup:return
/self->ksname != NULL && arg1 != NULL/
{
- this->ksp = (kstat_named_t *) copyin(arg1, sizeof (kstat_named_t));
+ this->ksp = (kstat_named_t *)copyin(arg1, sizeof(kstat_named_t));
printf("%s has ui64 value %u\n",
copyinstr(self->ksname), this->ksp->value.ui64);
}
diff --git a/test/stress/misc/tst.roch.d b/test/stress/misc/tst.roch.d
index 336e4292..46bd3768 100644
--- a/test/stress/misc/tst.roch.d
+++ b/test/stress/misc/tst.roch.d
@@ -21,7 +21,7 @@
#pragma D option bufpolicy=ring
fbt:::entry
-/(self->done == 0) && (curthread->t_cpu->cpu_intr_actv == 0) /
+/(self->done == 0) && (curthread->t_cpu->cpu_intr_actv == 0)/
{
self->done = 1;
printf(" %u 0x%llX %d %d comm:%s csathr:%lld", timestamp,
@@ -31,12 +31,12 @@ fbt:::entry
}
fbt:::return
-/(self->done == 0) && (curthread->t_cpu->cpu_intr_actv == 0) /
+/(self->done == 0) && (curthread->t_cpu->cpu_intr_actv == 0)/
{
self->done = 1;
printf(" %u 0x%llX %d %d comm:%s csathr:%lld", timestamp,
- (long long) curthread, pid, tid,
- execname, (long long) stackdepth);
+ (long long)curthread, pid, tid,
+ execname, (long long)stackdepth);
stack(20);
}
@@ -61,7 +61,7 @@ mutex_enter:adaptive-acquire
mutex_exit:adaptive-release
{
printf(" %u 0x%llX %d %d lock:0x%llX", timestamp,
- (long long) curthread, pid, tid, arg0);
+ (long long)curthread, pid, tid, arg0);
}
tick-1sec
diff --git a/test/triggers/bogus-ioctl.c b/test/triggers/bogus-ioctl.c
index 778a1ee6..25933229 100644
--- a/test/triggers/bogus-ioctl.c
+++ b/test/triggers/bogus-ioctl.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -34,8 +34,8 @@ main(void)
act.sa_handler = interrupt;
act.sa_flags = 0;
- (void) sigemptyset(&act.sa_mask);
- (void) sigaction(SIGUSR1, &act, NULL);
+ sigemptyset(&act.sa_mask);
+ sigaction(SIGUSR1, &act, NULL);
getrlimit(RLIMIT_NOFILE, &rl);
for (i = 0; i < rl.rlim_max; i++)
@@ -46,12 +46,11 @@ main(void)
* With all of our file descriptors closed, wait here spinning in bogus
* ioctl() calls until DTrace hits us with a SIGUSR1 to start the test.
*/
- if (sigsetjmp(env, 1) == 0) {
+ if (sigsetjmp(env, 1) == 0)
for (;;) {
- (void) ioctl(-1, -1, NULL);
+ ioctl(-1, -1, NULL);
usleep(100);
}
- }
/*
* To test the fds[] array, we open /dev/null (a file with reliable
@@ -66,7 +65,7 @@ main(void)
O_SYNC | O_TRUNC, 0);
fds[n++] = open(file, O_RDWR);
- (void) lseek(fds[n - 1], 123, SEEK_SET);
+ lseek(fds[n - 1], 123, SEEK_SET);
/*
* Once we have all the file descriptors in the state we want to test,
@@ -74,8 +73,8 @@ main(void)
* our DTrace script into recording the content of the fds[] array.
*/
for (i = 0; i < n; i++)
- (void) ioctl(fds[i], -1, NULL);
+ ioctl(fds[i], -1, NULL);
- assert(n <= sizeof (fds) / sizeof (fds[0]));
+ assert(n <= sizeof(fds) / sizeof(fds[0]));
exit(0);
}
diff --git a/test/triggers/libproc-consistency.c b/test/triggers/libproc-consistency.c
index 03cf022b..8027f140 100644
--- a/test/triggers/libproc-consistency.c
+++ b/test/triggers/libproc-consistency.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -43,10 +43,10 @@ print_ldd(const rd_loadobj_t *loadobj, size_t num, void *p)
* that the link map is in fact uncorrupted.)
*/
- if (Pread_string(P, buf, sizeof (buf), loadobj->rl_nameaddr) < 0) {
+ if (Pread_string(P, buf, sizeof(buf), loadobj->rl_nameaddr) < 0) {
fprintf(stderr, "Failed to read string at %lx\n",
loadobj->rl_nameaddr);
- return (0);
+ return 0;
}
if ((many_lmids && highest > loadobj->rl_lmident) ||
@@ -63,7 +63,7 @@ print_ldd(const rd_loadobj_t *loadobj, size_t num, void *p)
if (!lmids_fell)
printf("%s: dyn 0x%lx, bias 0x%lx, LMID %li\n", buf, loadobj->rl_dyn,
loadobj->rl_diff_addr, loadobj->rl_lmident);
- return (1);
+ return 1;
}
static int adds_seen;
@@ -116,12 +116,12 @@ int main(int argc, char *argv[])
rd = rd_new(P);
if (!rd) {
fprintf(stderr, "Initialization failed.\n");
- return (1);
+ return 1;
}
rd_event_enable(rd, rtld_load_unload, NULL);
Ptrace_set_detached(P, 1);
Puntrace(P, 0);
- jmp_pad = (jmp_buf ** volatile) libproc_unwinder_pad(P);
+ jmp_pad = (jmp_buf ** volatile)libproc_unwinder_pad(P);
if (setjmp(exec_jmp)) {
pid_t pid;
@@ -130,8 +130,8 @@ int main(int argc, char *argv[])
* now, in case the rd_new() or other operation within the
* exec-spotted path is interrupted by another exec().
*/
- *jmp_pad = (jmp_buf * volatile) &exec_jmp;
- P = (struct ps_prochandle *) P_preserved;
+ *jmp_pad = (jmp_buf * volatile)&exec_jmp;
+ P = (struct ps_prochandle *)P_preserved;
pid = Pgetpid(P);
fprintf(stderr, "Spotted exec()\n");
@@ -144,18 +144,18 @@ int main(int argc, char *argv[])
P = Pgrab(pid, 0, 1, NULL, &err);
if (!P) {
perror("Cannot regrab after exec()");
- return(1);
+ return 1;
}
rd = rd_new(P);
if (!rd) {
fprintf(stderr, "Initialization failed.\n");
- return (1);
+ return 1;
}
rd_event_enable(rd, rtld_load_unload, NULL);
Ptrace_set_detached(P, 1);
Puntrace(P, 0);
}
- *jmp_pad = (jmp_buf * volatile) &exec_jmp;
+ *jmp_pad = (jmp_buf * volatile)&exec_jmp;
P_preserved = P;
/*
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
gettimeofday(&b, NULL);
if (b.tv_sec - 2 > a.tv_sec) {
fprintf(stderr, "rd_loadobj_iter took implausibly "
- "long: %li seconds.\n", (long) (b.tv_sec - a.tv_sec));
+ "long: %li seconds.\n", (long)(b.tv_sec - a.tv_sec));
err = 1;
}
Pwait(P, 0);
diff --git a/test/triggers/libproc-execing-bkpts-victim.c b/test/triggers/libproc-execing-bkpts-victim.c
index 4947514e..1e58e06a 100644
--- a/test/triggers/libproc-execing-bkpts-victim.c
+++ b/test/triggers/libproc-execing-bkpts-victim.c
@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
asprintf(&snarg, "%i", ++snum);
asprintf(&exe, "/proc/%i/exe", getpid());
- execl(exe, argv[0], argv[1], snarg, (char *) NULL);
+ execl(exe, argv[0], argv[1], snarg, (char *)NULL);
perror("Cannot self-exec: should never happen\n");
return 1;
}
diff --git a/test/triggers/libproc-execing-bkpts.c b/test/triggers/libproc-execing-bkpts.c
index 762520a2..5af748b2 100644
--- a/test/triggers/libproc-execing-bkpts.c
+++ b/test/triggers/libproc-execing-bkpts.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
*/
unwinder_pad = &exec_jmp;
- P = (struct ps_prochandle *) P_preserved;
+ P = (struct ps_prochandle *)P_preserved;
execs++;
pid = Pgetpid(P);
Prelease(P, PS_RELEASE_NO_DETACH);
@@ -132,5 +132,5 @@ end:
Prelease(P, PS_RELEASE_KILL);
Pfree(P);
- return (ret);
+ return ret;
}
diff --git a/test/triggers/libproc-lookup-by-name.c b/test/triggers/libproc-lookup-by-name.c
index def035b3..31ff665f 100644
--- a/test/triggers/libproc-lookup-by-name.c
+++ b/test/triggers/libproc-lookup-by-name.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -88,5 +88,5 @@ main(int argc, char *argv[])
Prelease(P, PS_RELEASE_KILL);
Pfree(P);
- return (0);
+ return 0;
}
diff --git a/test/triggers/libproc-lookup-victim.c b/test/triggers/libproc-lookup-victim.c
index 5ce215ca..2fedbe40 100644
--- a/test/triggers/libproc-lookup-victim.c
+++ b/test/triggers/libproc-lookup-victim.c
@@ -33,7 +33,7 @@ interposed_func(void) {
int
main(int argc, char *argv[])
{
- void (*func) (void);
+ void (*func)(void);
void *dlmopen_handle;
enum { MAIN, LIB, INTERPOSED, LMID } state;
diff --git a/test/triggers/libproc-pldd.c b/test/triggers/libproc-pldd.c
index 443873d5..9eae97fe 100644
--- a/test/triggers/libproc-pldd.c
+++ b/test/triggers/libproc-pldd.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -29,23 +29,23 @@ print_ldd(const rd_loadobj_t *loadobj, size_t num, void *state)
char buf[PATH_MAX];
rd_loadobj_t scope = {0};
- if (Pread_string(rp->P, buf, sizeof (buf), loadobj->rl_nameaddr) < 0) {
+ if (Pread_string(rp->P, buf, sizeof(buf), loadobj->rl_nameaddr) < 0) {
fprintf(stderr, "Failed to read string at %lx\n",
loadobj->rl_nameaddr);
- return (0);
+ return 0;
}
/*
* No name, no search path: vDSO, we don't care about it.
*/
if (buf[0] == '\0' && loadobj->rl_nscopes == 1)
- return (1);
+ return 1;
/*
* Second item, no search path: vDSO (later glibc version).
*/
if ((num == 1) && (loadobj->rl_nscopes == 1))
- return (1);
+ return 1;
printf("%s: dyn 0x%lx, bias 0x%lx, LMID %li: %s (", buf, loadobj->rl_dyn,
loadobj->rl_diff_addr, loadobj->rl_lmident, loadobj->rl_default_scope ?
@@ -55,10 +55,10 @@ print_ldd(const rd_loadobj_t *loadobj, size_t num, void *state)
if (rd_get_scope(rp->rd, &scope, loadobj, i) == NULL)
fprintf(stderr, "Scope %li -> NULL\n", i);
else {
- if (Pread_string(rp->P, buf, sizeof (buf), scope.rl_nameaddr) < 0) {
+ if (Pread_string(rp->P, buf, sizeof(buf), scope.rl_nameaddr) < 0) {
fprintf(stderr, "Failed to read string at %lx\n",
scope.rl_nameaddr);
- return (0);
+ return 0;
}
printf("%s%s", i > 0 ? ", ": "", buf);
}
@@ -66,7 +66,7 @@ print_ldd(const rd_loadobj_t *loadobj, size_t num, void *state)
free(scope.rl_scope);
printf(")\n");
libs_seen++;
- return (1);
+ return 1;
}
static int
@@ -75,32 +75,32 @@ note_ldd(const rd_loadobj_t *loadobj, size_t num, void *state)
struct rd_and_p *rp = state;
char buf[PATH_MAX];
- if (Pread_string(rp->P, buf, sizeof (buf), loadobj->rl_nameaddr) < 0) {
+ if (Pread_string(rp->P, buf, sizeof(buf), loadobj->rl_nameaddr) < 0) {
fprintf(stderr, "Failed to read string at %lx\n",
loadobj->rl_nameaddr);
- return (0);
+ return 0;
}
/*
* No name, no search path: vDSO, we don't care about it.
*/
if (buf[0] == '\0' && loadobj->rl_nscopes == 1)
- return (1);
+ return 1;
/*
* Second item, no search path: vDSO (later glibc version).
*/
if ((num == 1) && (loadobj->rl_nscopes == 1))
- return (1);
+ return 1;
libs_seen++;
- return (1);
+ return 1;
}
static int
do_nothing(const rd_loadobj_t *loadobj, size_t num, void *state)
{
- return (1);
+ return 1;
}
int
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
rd = rd_new(P);
if (!rd) {
fprintf(stderr, "Initialization failed.\n");
- return (1);
+ return 1;
}
rp.P = P;
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
rd = rd_new(P);
if (!rd) {
fprintf(stderr, "rd reinitialization failed.\n");
- return (1);
+ return 1;
}
while (rd_loadobj_iter(rd, note_ldd, &rp) == RD_NOMAPS)
@@ -190,5 +190,5 @@ main(int argc, char *argv[])
Prelease(P, (pid == 0) ? PS_RELEASE_KILL : PS_RELEASE_NORMAL);
Pfree(P);
- return (0);
+ return 0;
}
diff --git a/test/triggers/pid-tst-args1.c b/test/triggers/pid-tst-args1.c
index ca190a3c..f0afc86a 100644
--- a/test/triggers/pid-tst-args1.c
+++ b/test/triggers/pid-tst-args1.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -17,7 +17,7 @@ int
go(l_int arg0, l_int arg1, l_int arg2, l_int arg3, l_int arg4,
l_int arg5, l_int arg6, l_int arg7, l_int arg8, l_int arg9)
{
- return (arg1);
+ return arg1;
}
static void
@@ -33,7 +33,7 @@ main(int argc, char **argv)
int i;
struct rlimit rl;
- (void) signal(SIGUSR1, handle);
+ signal(SIGUSR1, handle);
getrlimit(RLIMIT_NOFILE, &rl);
for (i = 0; i < rl.rlim_max; i++)
diff --git a/test/triggers/pid-tst-float.c b/test/triggers/pid-tst-float.c
index 79b0cc7a..222b3e2f 100644
--- a/test/triggers/pid-tst-float.c
+++ b/test/triggers/pid-tst-float.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -18,8 +18,8 @@ main(int argc, char **argv)
for (;;) {
c *= a;
c += b;
- (void) usleep(1000);
+ usleep(1000);
}
- return (0);
+ return 0;
}
diff --git a/test/triggers/pid-tst-fork.c b/test/triggers/pid-tst-fork.c
index 4dbb83f3..78a3149d 100644
--- a/test/triggers/pid-tst-fork.c
+++ b/test/triggers/pid-tst-fork.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -28,7 +28,7 @@ int go(int a)
}
}
- return (total);
+ return total;
}
int main(int argc, char **argv)
@@ -55,8 +55,8 @@ int main(int argc, char **argv)
}
}
- (void) fork();
- (void) go(i);
+ fork();
+ go(i);
- return (0);
+ return 0;
}
diff --git a/test/triggers/pid-tst-gcc.c b/test/triggers/pid-tst-gcc.c
index 6903edc8..65220267 100644
--- a/test/triggers/pid-tst-gcc.c
+++ b/test/triggers/pid-tst-gcc.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -29,9 +29,9 @@ go(void)
dup2(null, 2);
close(null);
- (void) posix_spawn(&pid, "/bin/ls", NULL, NULL, argv, NULL);
+ posix_spawn(&pid, "/bin/ls", NULL, NULL, argv, NULL);
- (void) waitpid(pid, NULL, 0);
+ waitpid(pid, NULL, 0);
}
void
@@ -48,11 +48,10 @@ main(int argc, char **argv)
sigfillset(&sa.sa_mask);
sa.sa_flags = 0;
- (void) sigaction(SIGUSR1, &sa, NULL);
+ sigaction(SIGUSR1, &sa, NULL);
- for (;;) {
+ for (;;)
go();
- }
- return (0);
+ return 0;
}
diff --git a/test/triggers/pid-tst-ret1.c b/test/triggers/pid-tst-ret1.c
index ef351d43..1fb8f663 100644
--- a/test/triggers/pid-tst-ret1.c
+++ b/test/triggers/pid-tst-ret1.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -21,13 +21,13 @@ int a = 100;
int
help(void)
{
- return (a);
+ return a;
}
int
go(void)
{
- return (help() + 1);
+ return help() + 1;
}
static void
@@ -43,7 +43,7 @@ main(int argc, char **argv)
int i;
struct rlimit rl;
- (void) signal(SIGUSR1, handle);
+ signal(SIGUSR1, handle);
getrlimit(RLIMIT_NOFILE, &rl);
for (i = 0; i < rl.rlim_max; i++)
diff --git a/test/triggers/pid-tst-ret2.c b/test/triggers/pid-tst-ret2.c
index 4dece8ef..7b8a05ef 100644
--- a/test/triggers/pid-tst-ret2.c
+++ b/test/triggers/pid-tst-ret2.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -21,7 +21,7 @@ int a = 100;
int
go(void)
{
- return (a);
+ return a;
}
static void
@@ -37,7 +37,7 @@ main(int argc, char **argv)
int i;
struct rlimit rl;
- (void) signal(SIGUSR1, handle);
+ signal(SIGUSR1, handle);
getrlimit(RLIMIT_NOFILE, &rl);
for (i = 0; i < rl.rlim_max; i++)
diff --git a/test/triggers/pid-tst-vfork.c b/test/triggers/pid-tst-vfork.c
index 038a17f3..70111a41 100644
--- a/test/triggers/pid-tst-vfork.c
+++ b/test/triggers/pid-tst-vfork.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -28,7 +28,7 @@ int go(int a)
}
}
- return (total);
+ return total;
}
int main(int argc, char **argv)
@@ -57,8 +57,8 @@ int main(int argc, char **argv)
if (vfork() == 0) {
int ret = go(i);
- (void) _exit(ret);
+ _exit(ret);
}
- return (0);
+ return 0;
}
diff --git a/test/triggers/pid-tst-weak1.c b/test/triggers/pid-tst-weak1.c
index 3a48143f..1d8583a1 100644
--- a/test/triggers/pid-tst-weak1.c
+++ b/test/triggers/pid-tst-weak1.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -23,7 +23,7 @@ int _go(int a);
int
go(int a)
{
- return (a + 1);
+ return a + 1;
}
static void
@@ -39,7 +39,7 @@ main(int argc, char **argv)
int i;
struct rlimit rl;
- (void) signal(SIGUSR1, handle);
+ signal(SIGUSR1, handle);
getrlimit(RLIMIT_NOFILE, &rl);
for (i = 0; i < rl.rlim_max; i++)
diff --git a/test/triggers/pid-tst-weak2.c b/test/triggers/pid-tst-weak2.c
index d3d20edd..d24437c6 100644
--- a/test/triggers/pid-tst-weak2.c
+++ b/test/triggers/pid-tst-weak2.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -23,7 +23,7 @@ int _go(int a);
static int
go(int a)
{
- return (a + 1);
+ return a + 1;
}
static void
@@ -39,7 +39,7 @@ main(int argc, char **argv)
int i;
struct rlimit rl;
- (void) signal(SIGUSR1, handle);
+ signal(SIGUSR1, handle);
getrlimit(RLIMIT_NOFILE, &rl);
for (i = 0; i < rl.rlim_max; i++)
diff --git a/test/triggers/proc-tst-sigwait.c b/test/triggers/proc-tst-sigwait.c
index 10289e99..d802397b 100644
--- a/test/triggers/proc-tst-sigwait.c
+++ b/test/triggers/proc-tst-sigwait.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -26,14 +26,14 @@ main(int argc, char **argv)
ev.sigev_signo = SIGUSR1;
if (timer_create(CLOCK_REALTIME, &ev, &tid) == -1) {
- (void) fprintf(stderr, "%s: cannot create CLOCK_HIGHRES "
+ fprintf(stderr, "%s: cannot create CLOCK_HIGHRES "
"timer: %s\n", cmd, strerror(errno));
exit(EXIT_FAILURE);
}
- (void) sigemptyset(&set);
- (void) sigaddset(&set, SIGUSR1);
- (void) sigprocmask(SIG_BLOCK, &set, NULL);
+ sigemptyset(&set);
+ sigaddset(&set, SIGUSR1);
+ sigprocmask(SIG_BLOCK, &set, NULL);
ts.it_value.tv_sec = 5;
ts.it_value.tv_nsec = 0;
@@ -41,16 +41,16 @@ main(int argc, char **argv)
ts.it_interval.tv_nsec = NANOSEC / 2;
if (timer_settime(tid, 0, &ts, NULL) == -1) {
- (void) fprintf(stderr, "%s: timer_settime() failed: %s\n",
+ fprintf(stderr, "%s: timer_settime() failed: %s\n",
cmd, strerror(errno));
exit(EXIT_FAILURE);
}
for (;;) {
int sig;
- (void) sigwait(&set, &sig);
+ sigwait(&set, &sig);
}
/*NOTREACHED*/
- return (0);
+ return 0;
}
diff --git a/test/triggers/profile-tst-ufuncsort.c b/test/triggers/profile-tst-ufuncsort.c
index b56eb1ca..a54fd6ec 100644
--- a/test/triggers/profile-tst-ufuncsort.c
+++ b/test/triggers/profile-tst-ufuncsort.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -53,5 +53,5 @@ main()
fN(f_c, 103);
fN(f_c, 1003);
- return (0);
+ return 0;
}
diff --git a/test/triggers/raise-tst-raise1.c b/test/triggers/raise-tst-raise1.c
index 7953146e..4e3d580a 100644
--- a/test/triggers/raise-tst-raise1.c
+++ b/test/triggers/raise-tst-raise1.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,14 +14,14 @@ main(int argc, char **argv)
{
sigset_t ss;
- (void) sigemptyset(&ss);
- (void) sigaddset(&ss, SIGINT);
- (void) sigprocmask(SIG_BLOCK, &ss, NULL);
+ sigemptyset(&ss);
+ sigaddset(&ss, SIGINT);
+ sigprocmask(SIG_BLOCK, &ss, NULL);
do {
- (void) ioctl(-1, -1, NULL);
- (void) sigpending(&ss);
+ ioctl(-1, -1, NULL);
+ sigpending(&ss);
} while (!sigismember(&ss, SIGINT));
- return (0);
+ return 0;
}
diff --git a/test/triggers/raise-tst-raise2.c b/test/triggers/raise-tst-raise2.c
index 79f17746..3eb95ca1 100644
--- a/test/triggers/raise-tst-raise2.c
+++ b/test/triggers/raise-tst-raise2.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -25,9 +25,8 @@ main(int argc, char **argv)
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
- (void) sigaction(SIGINT, &sa, NULL);
+ sigaction(SIGINT, &sa, NULL);
- for (;;) {
- (void) ioctl(-1, -1, NULL);
- }
+ for (;;)
+ ioctl(-1, -1, NULL);
}
diff --git a/test/triggers/raise-tst-raise3.c b/test/triggers/raise-tst-raise3.c
index 79f17746..3eb95ca1 100644
--- a/test/triggers/raise-tst-raise3.c
+++ b/test/triggers/raise-tst-raise3.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -25,9 +25,8 @@ main(int argc, char **argv)
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
- (void) sigaction(SIGINT, &sa, NULL);
+ sigaction(SIGINT, &sa, NULL);
- for (;;) {
- (void) ioctl(-1, -1, NULL);
- }
+ for (;;)
+ ioctl(-1, -1, NULL);
}
diff --git a/test/triggers/syscall-tst-args.c b/test/triggers/syscall-tst-args.c
index d6a8b6bc..5bbb6670 100644
--- a/test/triggers/syscall-tst-args.c
+++ b/test/triggers/syscall-tst-args.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -12,9 +12,8 @@
int
main(int argc, char **argv)
{
- for (;;) {
- (void) syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678UL);
- }
+ for (;;)
+ syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678UL);
- return (0);
+ return 0;
}
diff --git a/test/triggers/usdt-tst-argmap.c b/test/triggers/usdt-tst-argmap.c
index b9ee79a0..89a0a53f 100644
--- a/test/triggers/usdt-tst-argmap.c
+++ b/test/triggers/usdt-tst-argmap.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,5 +14,5 @@ main(int argc, char **argv)
DTRACE_PROBE2(test_prov, place, 10, 4);
}
- return (0);
+ return 0;
}
diff --git a/test/triggers/usdt-tst-args.c b/test/triggers/usdt-tst-args.c
index 1db7d48b..5f7c8015 100644
--- a/test/triggers/usdt-tst-args.c
+++ b/test/triggers/usdt-tst-args.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,5 +14,5 @@ main(int argc, char **argv)
TEST_PROV_PLACE(10, 4, 20, 30, 40, 50, 60, 70, 80, 90);
}
- return (0);
+ return 0;
}
diff --git a/test/triggers/usdt-tst-forker.c b/test/triggers/usdt-tst-forker.c
index 07250259..ec0caea4 100644
--- a/test/triggers/usdt-tst-forker.c
+++ b/test/triggers/usdt-tst-forker.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -20,8 +20,8 @@ main(int argc, char **argv)
if (fork() == 0)
exit(0);
- (void) wait(NULL);
+ wait(NULL);
}
- return (0);
+ return 0;
}
diff --git a/test/triggers/ustack-tst-bigstack.c b/test/triggers/ustack-tst-bigstack.c
index 4a32bceb..e694a518 100644
--- a/test/triggers/ustack-tst-bigstack.c
+++ b/test/triggers/ustack-tst-bigstack.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -57,5 +57,5 @@ main(int argc, char *argv[])
{
grow(1);
- return (0);
+ return 0;
}
diff --git a/test/triggers/ustack-tst-mtspin.c b/test/triggers/ustack-tst-mtspin.c
index 64b46327..2db62dc1 100644
--- a/test/triggers/ustack-tst-mtspin.c
+++ b/test/triggers/ustack-tst-mtspin.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,19 +14,19 @@ volatile long long count = 0;
int
baz(int a)
{
- (void) getpid();
+ getpid();
while (count != -1) {
count++;
a++;
}
- return (a + 1);
+ return a + 1;
}
int
bar(int a)
{
- return (baz(a + 1) - 1);
+ return baz(a + 1) - 1;
}
struct arg {
@@ -61,7 +61,7 @@ main(int argc, char **argv)
pthread_attr_destroy(&a);
pause();
- pthread_join(threads[0], (void **) &one);
- pthread_join(threads[1], (void **) &two);
+ pthread_join(threads[0], (void **)&one);
+ pthread_join(threads[1], (void **)&two);
return *one - *two;
}
diff --git a/test/triggers/ustack-tst-spin.c b/test/triggers/ustack-tst-spin.c
index 093fcf81..1e972f20 100644
--- a/test/triggers/ustack-tst-spin.c
+++ b/test/triggers/ustack-tst-spin.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -12,30 +12,30 @@ volatile long long count = 0;
int
baz(int a)
{
- (void) getpid();
+ getpid();
while (count != -1) {
count++;
a++;
}
- return (a + 1);
+ return a + 1;
}
int
bar(int a)
{
- return (baz(a + 1) - 1);
+ return baz(a + 1) - 1;
}
int
foo(int a, long b)
{
- return (bar(a) - b);
+ return bar(a) - b;
}
int
main(int argc, char **argv)
{
/* bleah. */
- return (foo(argc, (long)argv) == 0);
+ return foo(argc, (long)argv) == 0;
}
diff --git a/test/unittest/aggs/err.D_LQUANT_MISMATCH.lqbadarg2.d b/test/unittest/aggs/err.D_LQUANT_MISMATCH.lqbadarg2.d
index e281c955..8cd945a2 100644
--- a/test/unittest/aggs/err.D_LQUANT_MISMATCH.lqbadarg2.d
+++ b/test/unittest/aggs/err.D_LQUANT_MISMATCH.lqbadarg2.d
@@ -22,7 +22,7 @@ BEGIN
tick-1
/i < 1000/
{
- @ = lquantize(i, 1100, 1100, -100 );
+ @ = lquantize(i, 1100, 1100, -100);
i += 100;
}
diff --git a/test/unittest/aggs/tst.aggmod_full2.sh b/test/unittest/aggs/tst.aggmod_full2.sh
index e2716a09..30642310 100755
--- a/test/unittest/aggs/tst.aggmod_full2.sh
+++ b/test/unittest/aggs/tst.aggmod_full2.sh
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
}
free(line);
fclose(fd);
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/aggs/tst.lquantize.d b/test/unittest/aggs/tst.lquantize.d
index b2e82f9b..e09214a9 100644
--- a/test/unittest/aggs/tst.lquantize.d
+++ b/test/unittest/aggs/tst.lquantize.d
@@ -26,7 +26,7 @@ BEGIN
tick-10ms
/i < 1000/
{
- @a[i] = lquantize(i, -100, 1100, 100 );
+ @a[i] = lquantize(i, -100, 1100, 100);
i += 100;
}
diff --git a/test/unittest/aggs/tst.subr.d b/test/unittest/aggs/tst.subr.d
index c96caff6..0fa97fe6 100644
--- a/test/unittest/aggs/tst.subr.d
+++ b/test/unittest/aggs/tst.subr.d
@@ -80,11 +80,11 @@ INTFUNC(htonll(0x1234567890abcdefL))
INTFUNC(ntohs(0x1234))
INTFUNC(ntohl(0x12345678))
INTFUNC(ntohll(0x1234567890abcdefL))
-STRFUNC(inet_ntop(AF_INET, (void *)alloca(sizeof (ipaddr_t))))
-STRFUNC(inet_ntoa((ipaddr_t *)alloca(sizeof (ipaddr_t))))
-STRFUNC(inet_ntoa6((in6_addr_t *)alloca(sizeof (in6_addr_t))))
+STRFUNC(inet_ntop(AF_INET, (void *)alloca(sizeof(ipaddr_t))))
+STRFUNC(inet_ntoa((ipaddr_t *)alloca(sizeof(ipaddr_t))))
+STRFUNC(inet_ntoa6((in6_addr_t *)alloca(sizeof(in6_addr_t))))
STRFUNC(d_path(&(curthread->fs->root)))
-STRFUNC(link_ntop(ARPHRD_ETHER, (void *)alloca(sizeof (ipaddr_t))))
+STRFUNC(link_ntop(ARPHRD_ETHER, (void *)alloca(sizeof(ipaddr_t))))
BEGIN
/subr == DIF_SUBR_MAX + 1 - NUM_UNIMPLEMENTED/
diff --git a/test/unittest/arithmetic/tst.basics.d b/test/unittest/arithmetic/tst.basics.d
index 587b7f5a..67a47701 100644
--- a/test/unittest/arithmetic/tst.basics.d
+++ b/test/unittest/arithmetic/tst.basics.d
@@ -35,7 +35,7 @@ BEGIN
i = i - (i + (i * 3) + i) * i / i * i;
printf("The value of i is %d\n", i);
- i = i * (i - 3 + 5 / i * i ) / i * 6;
+ i = i * (i - 3 + 5 / i * i) / i * 6;
printf("The value of i is %d\n", i);
i = i ^ 5;
diff --git a/test/unittest/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d b/test/unittest/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d
index fa5de8a4..d02554d2 100644
--- a/test/unittest/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d
+++ b/test/unittest/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -21,8 +21,8 @@ struct bitRecord{
BEGIN
{
- printf("sizeof (a): %d\nsizeof (b): %d\nsizeof (c): %n",
- sizeof (var.a), sizeof (var.b), sizeof (var.c));
+ printf("sizeof(a): %d\nsizeof(b): %d\nsizeof(c): %n",
+ sizeof(var.a), sizeof(var.b), sizeof(var.c));
exit(0);
}
diff --git a/test/unittest/bitfields/tst.SizeofBitField.d b/test/unittest/bitfields/tst.SizeofBitField.d
index 816ab2fd..1eb4ab5d 100644
--- a/test/unittest/bitfields/tst.SizeofBitField.d
+++ b/test/unittest/bitfields/tst.SizeofBitField.d
@@ -67,22 +67,22 @@ struct bitRecord12 {
BEGIN
{
- printf("sizeof (bitRecord1): %d\n", sizeof (var1));
- printf("sizeof (bitRecord2): %d\n", sizeof (var2));
- printf("sizeof (bitRecord3): %d\n", sizeof (var3));
- printf("sizeof (bitRecord4): %d\n", sizeof (var4));
- printf("sizeof (bitRecord5): %d\n", sizeof (var5));
- printf("sizeof (bitRecord6): %d\n", sizeof (var6));
- printf("sizeof (bitRecord7): %d\n", sizeof (var7));
- printf("sizeof (bitRecord8): %d\n", sizeof (var8));
- printf("sizeof (bitRecord12): %d\n", sizeof (var12));
+ printf("sizeof(bitRecord1): %d\n", sizeof(var1));
+ printf("sizeof(bitRecord2): %d\n", sizeof(var2));
+ printf("sizeof(bitRecord3): %d\n", sizeof(var3));
+ printf("sizeof(bitRecord4): %d\n", sizeof(var4));
+ printf("sizeof(bitRecord5): %d\n", sizeof(var5));
+ printf("sizeof(bitRecord6): %d\n", sizeof(var6));
+ printf("sizeof(bitRecord7): %d\n", sizeof(var7));
+ printf("sizeof(bitRecord8): %d\n", sizeof(var8));
+ printf("sizeof(bitRecord12): %d\n", sizeof(var12));
exit(0);
}
END
-/(1 != sizeof (var1)) || (2 != sizeof (var2)) || (3 != sizeof (var3)) ||
- (4 != sizeof (var4)) || (5 != sizeof (var5)) || (6 != sizeof (var6))
- || (7 != sizeof (var7)) || (8 != sizeof (var8)) || (12 != sizeof (var12))/
+/(1 != sizeof(var1)) || (2 != sizeof(var2)) || (3 != sizeof(var3)) ||
+ (4 != sizeof(var4)) || (5 != sizeof(var5)) || (6 != sizeof(var6))
+ || (7 != sizeof(var7)) || (8 != sizeof(var8)) || (12 != sizeof(var12))/
{
exit(1);
}
diff --git a/test/unittest/bitfields/tst.SizeofBitField.r b/test/unittest/bitfields/tst.SizeofBitField.r
index 9ccbe2d4..9d97b2aa 100644
--- a/test/unittest/bitfields/tst.SizeofBitField.r
+++ b/test/unittest/bitfields/tst.SizeofBitField.r
@@ -1,10 +1,10 @@
-sizeof (bitRecord1): 1
-sizeof (bitRecord2): 2
-sizeof (bitRecord3): 3
-sizeof (bitRecord4): 4
-sizeof (bitRecord5): 5
-sizeof (bitRecord6): 6
-sizeof (bitRecord7): 7
-sizeof (bitRecord8): 8
-sizeof (bitRecord12): 12
+sizeof(bitRecord1): 1
+sizeof(bitRecord2): 2
+sizeof(bitRecord3): 3
+sizeof(bitRecord4): 4
+sizeof(bitRecord5): 5
+sizeof(bitRecord6): 6
+sizeof(bitRecord7): 7
+sizeof(bitRecord8): 8
+sizeof(bitRecord12): 12
diff --git a/test/unittest/builtinvar/tst.psinfo-bug21984854.d b/test/unittest/builtinvar/tst.psinfo-bug21984854.d
index 725bea4b..e6e3acc1 100644
--- a/test/unittest/builtinvar/tst.psinfo-bug21984854.d
+++ b/test/unittest/builtinvar/tst.psinfo-bug21984854.d
@@ -19,10 +19,10 @@
BEGIN
/curpsinfo->pr_dmodel == PR_MODEL_ILP32/
{
- argv = *(uint32_t *)copyin(curpsinfo->pr_argv, sizeof (uint32_t));
+ argv = *(uint32_t *)copyin(curpsinfo->pr_argv, sizeof(uint32_t));
printf("argv[0] = \"%s\"", copyinstr(argv));
- envp = *(uint32_t *)copyin(curpsinfo->pr_envp, sizeof (uint32_t));
+ envp = *(uint32_t *)copyin(curpsinfo->pr_envp, sizeof(uint32_t));
printf("envp[0] = \"%s\"", copyinstr(envp));
exit(0);
}
@@ -30,10 +30,10 @@ BEGIN
BEGIN
/curpsinfo->pr_dmodel == PR_MODEL_LP64/
{
- argv = *(uint64_t *)copyin(curpsinfo->pr_argv, sizeof (uint64_t));
+ argv = *(uint64_t *)copyin(curpsinfo->pr_argv, sizeof(uint64_t));
printf("envp[0] = \"%s\"", copyinstr(argv));
- envp = *(uint64_t *)copyin(curpsinfo->pr_envp, sizeof (uint64_t));
+ envp = *(uint64_t *)copyin(curpsinfo->pr_envp, sizeof(uint64_t));
printf("envp[0] = \"%s\"", copyinstr(envp));
exit(0);
}
diff --git a/test/unittest/consumer/addr2str-null.c b/test/unittest/consumer/addr2str-null.c
index c7541486..c88d261e 100644
--- a/test/unittest/consumer/addr2str-null.c
+++ b/test/unittest/consumer/addr2str-null.c
@@ -27,8 +27,8 @@ int main(int argc, char **argv)
}
char s[128];
- int n = dtrace_addr2str(handle, (uint64_t) 0, s, sizeof(s));
+ int n = dtrace_addr2str(handle, (uint64_t)0, s, sizeof(s));
printf(" %d chars |%s|\n", n, s);
dtrace_close(handle);
- return (strchr(s, '`') != NULL); /* ` is an error */
+ return strchr(s, '`') != NULL; /* ` is an error */
}
diff --git a/test/unittest/consumer/tst.merge_ranges_bug25767469.c b/test/unittest/consumer/tst.merge_ranges_bug25767469.c
index 6a893c71..6773a697 100644
--- a/test/unittest/consumer/tst.merge_ranges_bug25767469.c
+++ b/test/unittest/consumer/tst.merge_ranges_bug25767469.c
@@ -28,8 +28,8 @@ int maxnranges, nranges;
int mycompare(const void *ap, const void *bp)
{
- myrange_t *a = (myrange_t *) ap;
- myrange_t *b = (myrange_t *) bp;
+ myrange_t *a = (myrange_t *)ap;
+ myrange_t *b = (myrange_t *)bp;
if (a->addr < b->addr)
return -1;
if (a->addr > b->addr)
@@ -70,10 +70,9 @@ void check_module_ranges
* - ranges do not overlap or abut
* (otherwise they should have been coalesced)
*/
- for (i = 1; i < n; i++) {
- if ( addrs[i-1].dar_va
- + addrs[i-1].dar_size
- >= addrs[i].dar_va ) {
+ for (i = 1; i < n; i++)
+ if (addrs[i-1].dar_va + addrs[i-1].dar_size
+ >= addrs[i].dar_va) {
printf("ERROR: %s %c range %lx-%lx"
" overlaps or abuts %lx-%lx\n", name, type,
addrs[i-1].dar_va,
@@ -82,7 +81,6 @@ void check_module_ranges
addrs[i].dar_va + addrs[i].dar_size);
nerrors++;
}
- }
/*
* Record ranges so that we can later check
@@ -91,8 +89,8 @@ void check_module_ranges
for (i = 0; i < n; i++) {
if (nranges == maxnranges) {
maxnranges *= 4;
- ranges = (myrange_t *) realloc(ranges,
- maxnranges * sizeof (myrange_t));
+ ranges = (myrange_t *)realloc(ranges,
+ maxnranges * sizeof(myrange_t));
}
ranges[nranges].addr = addrs[i].dar_va;
ranges[nranges].size = addrs[i].dar_size;
@@ -113,16 +111,14 @@ int mod_callback(dtrace_hdl_t * h, const dtrace_objinfo_t * d, void * arg) {
/* when arg==0; dry run: look up info to force filename to load */
GElf_Sym symp;
dtrace_syminfo_t sip;
- if (d->dto_text_addrs_size) {
+ if (d->dto_text_addrs_size)
dtrace_lookup_by_addr(h,
d->dto_text_addrs[0].dar_va, &symp, &sip);
- }
- if (d->dto_data_addrs_size) {
+ if (d->dto_data_addrs_size)
dtrace_lookup_by_addr(h,
d->dto_data_addrs[0].dar_va, &symp, &sip);
- }
}
- return(0);
+ return 0;
}
int main(int argc, char **argv)
@@ -140,7 +136,7 @@ int main(int argc, char **argv)
*/
maxnranges = 4096;
nranges = 0;
- ranges = (myrange_t *) malloc(maxnranges * sizeof (myrange_t));
+ ranges = (myrange_t *)malloc(maxnranges * sizeof(myrange_t));
/*
* Some info is populated lazily.
@@ -158,10 +154,9 @@ int main(int argc, char **argv)
/*
* Sort the ranges from among all modules and check for overlaps.
*/
- qsort(ranges, nranges, sizeof (myrange_t), &mycompare);
- for (i = 1; i < nranges; i++) {
- if ( ranges[i-1].addr + ranges[i-1].size
- > ranges[i].addr ) {
+ qsort(ranges, nranges, sizeof(myrange_t), &mycompare);
+ for (i = 1; i < nranges; i++)
+ if (ranges[i-1].addr + ranges[i-1].size > ranges[i].addr) {
printf("ERROR:");
print_range(&ranges[i-1]);
printf(" overlaps");
@@ -169,9 +164,7 @@ int main(int argc, char **argv)
printf("\n");
nerrors++;
}
- }
printf("test tst.merge_ranges_bug25767469.c had %d errors\n", nerrors);
- return (nerrors != 0);
+ return nerrors != 0;
}
-
diff --git a/test/unittest/consumer/tst.symbols.c b/test/unittest/consumer/tst.symbols.c
index 66f044a3..b8991e01 100644
--- a/test/unittest/consumer/tst.symbols.c
+++ b/test/unittest/consumer/tst.symbols.c
@@ -19,7 +19,7 @@
int nchecks = 0, nerrors = 0;
-typedef struct mysymbol{
+typedef struct mysymbol {
long long unsigned addr;
long long unsigned size;
char *symname;
@@ -32,8 +32,8 @@ int maxnsymbols = 0, nsymbols = 0;
int mycompare(const void *ap, const void *bp)
{
- mysymbol_t *a = (mysymbol_t *) ap;
- mysymbol_t *b = (mysymbol_t *) bp;
+ mysymbol_t *a = (mysymbol_t *)ap;
+ mysymbol_t *b = (mysymbol_t *)bp;
if (a->addr < b->addr)
return -1;
if (a->addr > b->addr)
@@ -68,8 +68,8 @@ int read_symbols() {
maxnsymbols *= 2;
if (maxnsymbols == 0)
maxnsymbols = 128 * 1024;
- symbols = (mysymbol_t *) realloc(symbols,
- maxnsymbols * sizeof (mysymbol_t));
+ symbols = (mysymbol_t *)realloc(symbols,
+ maxnsymbols * sizeof(mysymbol_t));
if (symbols == NULL) {
printf("ERROR: could not allocate symbols\n");
fclose(fd);
@@ -155,8 +155,8 @@ int read_symbols() {
void print_symbol(int i) {
printf(" %16.16llx %8.8llx %32s %20s\n",
- (long long) symbols[i].addr,
- (long long) symbols[i].size,
+ (long long)symbols[i].addr,
+ (long long)symbols[i].size,
symbols[i].symname,
symbols[i].modname);
}
@@ -175,9 +175,9 @@ int duplicate(int i) {
continue;
if (strcmp(s, symbols[j].symname) == 0 &&
strcmp(m, symbols[j].modname) == 0)
- return (j);
+ return j;
}
- return (-1);
+ return -1;
}
void match_at_addr(int i, GElf_Sym *symp, dtrace_syminfo_t *sip) {
@@ -193,8 +193,8 @@ void match_at_addr(int i, GElf_Sym *symp, dtrace_syminfo_t *sip) {
printf(" expect:");
print_symbol(i);
printf(" actual: %16.16llx %8.8llx %32s %20s\n",
- (long long) symp->st_value,
- (long long) symp->st_size,
+ (long long)symp->st_value,
+ (long long)symp->st_size,
sip->dts_name,
sip->dts_object);
}
@@ -235,8 +235,8 @@ void match_at_addr(int i, GElf_Sym *symp, dtrace_syminfo_t *sip) {
printf(" expect:");
print_symbol(i);
printf(" actual: %16.16llx %8.8llx %32s %20s\n",
- (long long) symp->st_value,
- (long long) symp->st_size,
+ (long long)symp->st_value,
+ (long long)symp->st_size,
sip->dts_name,
sip->dts_object);
}
@@ -261,7 +261,7 @@ int check_lookup_by_addr(dtrace_hdl_t *h) {
nchecks++;
if (dtrace_lookup_by_addr
- (h, (GElf_Addr) symbols[i].addr, &sym, &si)) {
+ (h, (GElf_Addr)symbols[i].addr, &sym, &si)) {
printf("ERROR: dtrace_lookup_by_addr failed: %s\n",
dtrace_errmsg(h, dtrace_errno(h)));
@@ -312,8 +312,8 @@ int check_lookup_by_name(dtrace_hdl_t *h, int specify_module) {
printf(" expect:");
print_symbol(i);
printf(" actual: %16.16llx %8.8llx %32s %20s\n",
- (long long) sym.st_value,
- (long long) sym.st_size,
+ (long long)sym.st_value,
+ (long long)sym.st_size,
si.dts_name,
si.dts_object);
nerrors++;
@@ -334,7 +334,7 @@ int main(int argc, char **argv) {
if (read_symbols() != 0)
return 1;
- qsort(symbols, nsymbols, sizeof (mysymbol_t), &mycompare);
+ qsort(symbols, nsymbols, sizeof(mysymbol_t), &mycompare);
check_lookup_by_addr(h);
check_lookup_by_name(h, 1);
@@ -344,5 +344,5 @@ int main(int argc, char **argv) {
printf("test tst.symbols.c had %d errors (out of %d)\n",
nerrors, nchecks);
- return (nerrors != 0);
+ return nerrors != 0;
}
diff --git a/test/unittest/error/tst.DTRACEFLT_BADADDR2.d b/test/unittest/error/tst.DTRACEFLT_BADADDR2.d
index 968f9779..23663f3c 100644
--- a/test/unittest/error/tst.DTRACEFLT_BADADDR2.d
+++ b/test/unittest/error/tst.DTRACEFLT_BADADDR2.d
@@ -29,9 +29,9 @@ ERROR
BEGIN
{
/*
- x = (int *) 64;
+ x = (int *)64;
*/
- x = (int *) 0x4000;
+ x = (int *)0x4000;
y = *x;
trace(y);
}
diff --git a/test/unittest/error/tst.DTRACEFLT_UNKNOWN.d b/test/unittest/error/tst.DTRACEFLT_UNKNOWN.d
index 9a382699..001903ff 100644
--- a/test/unittest/error/tst.DTRACEFLT_UNKNOWN.d
+++ b/test/unittest/error/tst.DTRACEFLT_UNKNOWN.d
@@ -27,7 +27,7 @@ ERROR
BEGIN
{
- x = (int *) 64;
+ x = (int *)64;
y = *x;
trace(y);
}
diff --git a/test/unittest/funcs/err.badalloca.d b/test/unittest/funcs/err.badalloca.d
index 5b8a700f..98f1f565 100644
--- a/test/unittest/funcs/err.badalloca.d
+++ b/test/unittest/funcs/err.badalloca.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -19,12 +19,12 @@
BEGIN
{
- ptr = alloca(sizeof (unsigned long));
+ ptr = alloca(sizeof(unsigned long));
}
tick-1
{
- bcopy((void *)&`max_pfn, ptr, sizeof (unsigned long));
+ bcopy((void *)&`max_pfn, ptr, sizeof(unsigned long));
exit(0);
}
diff --git a/test/unittest/funcs/err.badbcopy.d b/test/unittest/funcs/err.badbcopy.d
index 5adc979d..f4cc2287 100644
--- a/test/unittest/funcs/err.badbcopy.d
+++ b/test/unittest/funcs/err.badbcopy.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -19,11 +19,11 @@
BEGIN
{
- ptr = alloca(sizeof (unsigned long));
+ ptr = alloca(sizeof(unsigned long));
/* Attempt a copy from scratch memory to a kernel address */
- bcopy(ptr, (void *)&`max_pfn, sizeof (unsigned long));
+ bcopy(ptr, (void *)&`max_pfn, sizeof(unsigned long));
exit(0);
}
diff --git a/test/unittest/funcs/err.badbcopy1.d b/test/unittest/funcs/err.badbcopy1.d
index 2f528047..d3b15d91 100644
--- a/test/unittest/funcs/err.badbcopy1.d
+++ b/test/unittest/funcs/err.badbcopy1.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -23,7 +23,7 @@ BEGIN
ptr = alloca(0);
/* Attempt to bcopy to scratch memory that isn't allocated */
- bcopy((void *)&`max_pfn, ptr, sizeof (unsigned long));
+ bcopy((void *)&`max_pfn, ptr, sizeof(unsigned long));
exit(0);
}
diff --git a/test/unittest/funcs/err.badbcopy2.d b/test/unittest/funcs/err.badbcopy2.d
index a9dc3964..e394ddf4 100644
--- a/test/unittest/funcs/err.badbcopy2.d
+++ b/test/unittest/funcs/err.badbcopy2.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -22,7 +22,7 @@ BEGIN
{
/* Attempt to copy to non-scratch memory */
- bcopy((void *)&`max_pfn, ptr, sizeof (unsigned long));
+ bcopy((void *)&`max_pfn, ptr, sizeof(unsigned long));
exit(0);
}
diff --git a/test/unittest/funcs/err.badbcopy3.d b/test/unittest/funcs/err.badbcopy3.d
index 5028301f..b0cb0c2b 100644
--- a/test/unittest/funcs/err.badbcopy3.d
+++ b/test/unittest/funcs/err.badbcopy3.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -19,7 +19,7 @@
BEGIN
{
/* Attempt to copy to a NULL address */
- bcopy((void *)&`max_pfn, (void *)NULL, sizeof (unsigned long));
+ bcopy((void *)&`max_pfn, (void *)NULL, sizeof(unsigned long));
exit(0);
}
diff --git a/test/unittest/funcs/err.badbcopy4.d b/test/unittest/funcs/err.badbcopy4.d
index bfda1f87..842b7270 100644
--- a/test/unittest/funcs/err.badbcopy4.d
+++ b/test/unittest/funcs/err.badbcopy4.d
@@ -20,10 +20,10 @@
BEGIN
{
- ptr = alloca(sizeof (int));
+ ptr = alloca(sizeof(int));
/* Attempt to copy from a NULL address */
- bcopy((void *)NULL, ptr, sizeof (int));
+ bcopy((void *)NULL, ptr, sizeof(int));
exit(0);
}
diff --git a/test/unittest/funcs/err.badbcopy5.d b/test/unittest/funcs/err.badbcopy5.d
index 7c462f7a..de8001a8 100644
--- a/test/unittest/funcs/err.badbcopy5.d
+++ b/test/unittest/funcs/err.badbcopy5.d
@@ -22,10 +22,10 @@ int *badptr;
BEGIN
{
- ptr = alloca(sizeof (int));
+ ptr = alloca(sizeof(int));
/* Attempt to copy from a invalid address */
- bcopy(badptr, ptr, sizeof (int));
+ bcopy(badptr, ptr, sizeof(int));
exit(0);
}
diff --git a/test/unittest/funcs/err.copyoutbadaddr.sh b/test/unittest/funcs/err.copyoutbadaddr.sh
index 8b2a0591..fefaee19 100755
--- a/test/unittest/funcs/err.copyoutbadaddr.sh
+++ b/test/unittest/funcs/err.copyoutbadaddr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -22,9 +22,9 @@ dtrace_script()
BEGIN
{
- ptr = alloca(sizeof (char *));
- copyinto(curpsinfo->pr_envp, sizeof (char *), ptr);
- copyout(ptr, 0, sizeof (char *));
+ ptr = alloca(sizeof(char *));
+ copyinto(curpsinfo->pr_envp, sizeof(char *), ptr);
+ copyout(ptr, 0, sizeof(char *));
}
ERROR
diff --git a/test/unittest/funcs/err.copyoutstrbadaddr.sh b/test/unittest/funcs/err.copyoutstrbadaddr.sh
index 04bc9679..b8ab8dd3 100755
--- a/test/unittest/funcs/err.copyoutstrbadaddr.sh
+++ b/test/unittest/funcs/err.copyoutstrbadaddr.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -21,9 +21,9 @@ dtrace_script()
BEGIN
{
- ptr = alloca(sizeof (char *));
- copyinto(curpsinfo->pr_envp, sizeof (char *), ptr);
- copyout(ptr, 0, sizeof (char *));
+ ptr = alloca(sizeof(char *));
+ copyinto(curpsinfo->pr_envp, sizeof(char *), ptr);
+ copyout(ptr, 0, sizeof(char *));
}
ERROR
diff --git a/test/unittest/funcs/err.inet_ntopbadarg.d b/test/unittest/funcs/err.inet_ntopbadarg.d
index 926b9a49..5677b579 100644
--- a/test/unittest/funcs/err.inet_ntopbadarg.d
+++ b/test/unittest/funcs/err.inet_ntopbadarg.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -11,7 +11,7 @@ ipaddr_t *ip4a;
BEGIN
{
- this->buf4a = alloca(sizeof (ipaddr_t));
+ this->buf4a = alloca(sizeof(ipaddr_t));
ip4a = this->buf4a;
*ip4a = htonl(0xc0a80117);
diff --git a/test/unittest/funcs/err.link_ntopbadarg.d b/test/unittest/funcs/err.link_ntopbadarg.d
index 0224bbb7..289dc168 100644
--- a/test/unittest/funcs/err.link_ntopbadarg.d
+++ b/test/unittest/funcs/err.link_ntopbadarg.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -9,7 +9,7 @@
BEGIN
{
- this->buf_eth = (uint64_t *)alloca(sizeof (uint64_t));
+ this->buf_eth = (uint64_t *)alloca(sizeof(uint64_t));
/* Ethernet MAC address 00:01:02:03:04:05 */
*(this->buf_eth) = htonll(0x000102030405 << 16);
diff --git a/test/unittest/funcs/tst.bcopy.d b/test/unittest/funcs/tst.bcopy.d
index 72fea9a9..8e6b6ac4 100644
--- a/test/unittest/funcs/tst.bcopy.d
+++ b/test/unittest/funcs/tst.bcopy.d
@@ -20,8 +20,8 @@
BEGIN
{
- ptr = alloca(sizeof (unsigned long));
- bcopy((void *)&`max_pfn, ptr, sizeof (unsigned long));
+ ptr = alloca(sizeof(unsigned long));
+ bcopy((void *)&`max_pfn, ptr, sizeof(unsigned long));
ulongp = (unsigned long *)ptr;
ret = (`max_pfn == *ulongp) ? 0 : 1;
}
diff --git a/test/unittest/funcs/tst.copyin.d b/test/unittest/funcs/tst.copyin.d
index 2b8165ad..a707eedd 100644
--- a/test/unittest/funcs/tst.copyin.d
+++ b/test/unittest/funcs/tst.copyin.d
@@ -20,7 +20,7 @@
BEGIN
/curpsinfo->pr_dmodel == PR_MODEL_ILP32/
{
- envp = *(uint32_t *)copyin(curpsinfo->pr_envp, sizeof (uint32_t));
+ envp = *(uint32_t *)copyin(curpsinfo->pr_envp, sizeof(uint32_t));
printf("envp[0] = \"%s\"", copyinstr(envp));
exit(0);
}
@@ -28,7 +28,7 @@ BEGIN
BEGIN
/curpsinfo->pr_dmodel == PR_MODEL_LP64/
{
- envp = *(uint64_t *)copyin(curpsinfo->pr_envp, sizeof (uint64_t));
+ envp = *(uint64_t *)copyin(curpsinfo->pr_envp, sizeof(uint64_t));
printf("envp[0] = \"%s\"", copyinstr(envp));
exit(0);
}
diff --git a/test/unittest/funcs/tst.copyinto.d b/test/unittest/funcs/tst.copyinto.d
index ff62e73f..b7abfce0 100644
--- a/test/unittest/funcs/tst.copyinto.d
+++ b/test/unittest/funcs/tst.copyinto.d
@@ -20,8 +20,8 @@
BEGIN
/curpsinfo->pr_dmodel == PR_MODEL_ILP32/
{
- envp = alloca(sizeof (uint32_t));
- copyinto(curpsinfo->pr_envp, sizeof (uint32_t), envp);
+ envp = alloca(sizeof(uint32_t));
+ copyinto(curpsinfo->pr_envp, sizeof(uint32_t), envp);
printf("envp[0] = \"%s\"", copyinstr(*(uint32_t *)envp));
exit(0);
}
@@ -29,8 +29,8 @@ BEGIN
BEGIN
/curpsinfo->pr_dmodel == PR_MODEL_LP64/
{
- envp = alloca(sizeof (uint64_t));
- copyinto(curpsinfo->pr_envp, sizeof (uint64_t), envp);
+ envp = alloca(sizeof(uint64_t));
+ copyinto(curpsinfo->pr_envp, sizeof(uint64_t), envp);
printf("envp[0] = \"%s\"", copyinstr(*(uint64_t *)envp));
exit(0);
}
diff --git a/test/unittest/funcs/tst.ddi_pathname.d b/test/unittest/funcs/tst.ddi_pathname.d
index 586326ed..c9aefd26 100644
--- a/test/unittest/funcs/tst.ddi_pathname.d
+++ b/test/unittest/funcs/tst.ddi_pathname.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -11,13 +11,13 @@
BEGIN
{
- this->dev = (struct dev_info *)alloca(sizeof (struct dev_info));
+ this->dev = (struct dev_info *)alloca(sizeof(struct dev_info));
this->minor1 =
- (struct ddi_minor_data *)alloca(sizeof (struct ddi_minor_data));
+ (struct ddi_minor_data *)alloca(sizeof(struct ddi_minor_data));
this->minor2 =
- (struct ddi_minor_data *)alloca(sizeof (struct ddi_minor_data));
+ (struct ddi_minor_data *)alloca(sizeof(struct ddi_minor_data));
this->minor3 =
- (struct ddi_minor_data *)alloca(sizeof (struct ddi_minor_data));
+ (struct ddi_minor_data *)alloca(sizeof(struct ddi_minor_data));
this->minor1->d_minor.dev = 0;
this->minor1->next = this->minor2;
diff --git a/test/unittest/funcs/tst.inet_ntoa.d b/test/unittest/funcs/tst.inet_ntoa.d
index 322a6298..75161cf1 100644
--- a/test/unittest/funcs/tst.inet_ntoa.d
+++ b/test/unittest/funcs/tst.inet_ntoa.d
@@ -15,10 +15,10 @@ ipaddr_t *ip4d;
BEGIN
{
- this->buf4a = alloca(sizeof (ipaddr_t));
- this->buf4b = alloca(sizeof (ipaddr_t));
- this->buf4c = alloca(sizeof (ipaddr_t));
- this->buf4d = alloca(sizeof (ipaddr_t));
+ this->buf4a = alloca(sizeof(ipaddr_t));
+ this->buf4b = alloca(sizeof(ipaddr_t));
+ this->buf4c = alloca(sizeof(ipaddr_t));
+ this->buf4d = alloca(sizeof(ipaddr_t));
ip4a = this->buf4a;
ip4b = this->buf4b;
ip4c = this->buf4c;
diff --git a/test/unittest/funcs/tst.inet_ntoa6.d b/test/unittest/funcs/tst.inet_ntoa6.d
index 41abf617..971456b1 100644
--- a/test/unittest/funcs/tst.inet_ntoa6.d
+++ b/test/unittest/funcs/tst.inet_ntoa6.d
@@ -18,13 +18,13 @@ struct in6_addr *ip6g;
BEGIN
{
- this->buf6a = alloca(sizeof (struct in6_addr));
- this->buf6b = alloca(sizeof (struct in6_addr));
- this->buf6c = alloca(sizeof (struct in6_addr));
- this->buf6d = alloca(sizeof (struct in6_addr));
- this->buf6e = alloca(sizeof (struct in6_addr));
- this->buf6f = alloca(sizeof (struct in6_addr));
- this->buf6g = alloca(sizeof (struct in6_addr));
+ this->buf6a = alloca(sizeof(struct in6_addr));
+ this->buf6b = alloca(sizeof(struct in6_addr));
+ this->buf6c = alloca(sizeof(struct in6_addr));
+ this->buf6d = alloca(sizeof(struct in6_addr));
+ this->buf6e = alloca(sizeof(struct in6_addr));
+ this->buf6f = alloca(sizeof(struct in6_addr));
+ this->buf6g = alloca(sizeof(struct in6_addr));
ip6a = this->buf6a;
ip6b = this->buf6b;
ip6c = this->buf6c;
diff --git a/test/unittest/funcs/tst.inet_ntop.d b/test/unittest/funcs/tst.inet_ntop.d
index acfb4f36..234effb2 100644
--- a/test/unittest/funcs/tst.inet_ntop.d
+++ b/test/unittest/funcs/tst.inet_ntop.d
@@ -23,18 +23,18 @@ struct in6_addr *ip6h;
BEGIN
{
- this->buf4a = alloca(sizeof (struct in_addr));
- this->buf4b = alloca(sizeof (struct in_addr));
- this->buf4c = alloca(sizeof (struct in_addr));
- this->buf4d = alloca(sizeof (struct in_addr));
- this->buf6a = alloca(sizeof (struct in6_addr));
- this->buf6b = alloca(sizeof (struct in6_addr));
- this->buf6c = alloca(sizeof (struct in6_addr));
- this->buf6d = alloca(sizeof (struct in6_addr));
- this->buf6e = alloca(sizeof (struct in6_addr));
- this->buf6f = alloca(sizeof (struct in6_addr));
- this->buf6g = alloca(sizeof (struct in6_addr));
- this->buf6h = alloca(sizeof (struct in6_addr));
+ this->buf4a = alloca(sizeof(struct in_addr));
+ this->buf4b = alloca(sizeof(struct in_addr));
+ this->buf4c = alloca(sizeof(struct in_addr));
+ this->buf4d = alloca(sizeof(struct in_addr));
+ this->buf6a = alloca(sizeof(struct in6_addr));
+ this->buf6b = alloca(sizeof(struct in6_addr));
+ this->buf6c = alloca(sizeof(struct in6_addr));
+ this->buf6d = alloca(sizeof(struct in6_addr));
+ this->buf6e = alloca(sizeof(struct in6_addr));
+ this->buf6f = alloca(sizeof(struct in6_addr));
+ this->buf6g = alloca(sizeof(struct in6_addr));
+ this->buf6h = alloca(sizeof(struct in6_addr));
ip4a = this->buf4a;
ip4b = this->buf4b;
ip4c = this->buf4c;
diff --git a/test/unittest/funcs/tst.link_ntop.d b/test/unittest/funcs/tst.link_ntop.d
index d0f6a8fd..0548ffec 100644
--- a/test/unittest/funcs/tst.link_ntop.d
+++ b/test/unittest/funcs/tst.link_ntop.d
@@ -12,7 +12,7 @@ uint8_t ibaddr[20];
BEGIN
{
- this->buf_eth = (uint64_t *)alloca(sizeof (uint64_t));
+ this->buf_eth = (uint64_t *)alloca(sizeof(uint64_t));
/* Ethernet MAC address 00:01:02:03:04:05 */
*(this->buf_eth) = htonll(0x000102030405 << 16);
diff --git a/test/unittest/misc/tst.haslam.d b/test/unittest/misc/tst.haslam.d
index 304805f8..997d22df 100644
--- a/test/unittest/misc/tst.haslam.d
+++ b/test/unittest/misc/tst.haslam.d
@@ -32,7 +32,7 @@ syscall:::entry
END
{
- printf("%s, %s, %s, %d numtids", "hhh", "jjj", "ggg", numtids );
+ printf("%s, %s, %s, %d numtids", "hhh", "jjj", "ggg", numtids);
printa(@sys);
}
diff --git a/test/unittest/pid/tst.provregex1.sh b/test/unittest/pid/tst.provregex1.sh
index e66ac68d..41c5b7b3 100755
--- a/test/unittest/pid/tst.provregex1.sh
+++ b/test/unittest/pid/tst.provregex1.sh
@@ -41,7 +41,7 @@ main(int argc, char **argv)
{
go();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/pid/tst.provregex2.sh b/test/unittest/pid/tst.provregex2.sh
index 59bbf907..305aafe9 100755
--- a/test/unittest/pid/tst.provregex2.sh
+++ b/test/unittest/pid/tst.provregex2.sh
@@ -64,17 +64,17 @@ main(int argc, char **argv)
if ((alt = dlopen("$DIR/altlib.so", RTLD_LAZY | RTLD_LOCAL))
== NULL) {
printf("dlopen of altlib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
if ((alt_go = dlsym(alt, "go")) == NULL) {
printf("failed to lookup 'go' in altlib.so\n");
- return (1);
+ return 1;
}
((void (*)(void))alt_go)();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/pid/tst.provregex4.sh b/test/unittest/pid/tst.provregex4.sh
index 5f6905c5..a9ff3238 100755
--- a/test/unittest/pid/tst.provregex4.sh
+++ b/test/unittest/pid/tst.provregex4.sh
@@ -87,17 +87,17 @@ main(int argc, char **argv)
if ((alt = dlopen("$DIR/altlib.so", RTLD_LAZY | RTLD_LOCAL))
== NULL) {
printf("dlopen of altlib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
if ((alt_go = dlsym(alt, "go")) == NULL) {
printf("failed to lookup 'go' in altlib.so\n");
- return (1);
+ return 1;
}
((void (*)(void))alt_go)();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/pointers/err.BadAlign.d b/test/unittest/pointers/err.BadAlign.d
index 55e15baf..cd4138ae 100644
--- a/test/unittest/pointers/err.BadAlign.d
+++ b/test/unittest/pointers/err.BadAlign.d
@@ -19,7 +19,7 @@
BEGIN
{
- x = (int *) 64;
+ x = (int *)64;
y = *x;
trace(y);
}
diff --git a/test/unittest/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d b/test/unittest/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d
index 499490ff..0f169c87 100644
--- a/test/unittest/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d
+++ b/test/unittest/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d
@@ -18,8 +18,8 @@ void *p;
BEGIN
{
- printf("p: %d\n", (int) p);
- printf("p+1: %d\n", (int) (p+1));
- printf("p+2: %d\n", (int) (p+2));
+ printf("p: %d\n", (int)p);
+ printf("p+1: %d\n", (int)(p+1));
+ printf("p+2: %d\n", (int)(p+2));
exit(0);
}
diff --git a/test/unittest/pointers/err.D_OP_LVAL.AddressChange.d b/test/unittest/pointers/err.D_OP_LVAL.AddressChange.d
index 06aa979c..751c7e49 100644
--- a/test/unittest/pointers/err.D_OP_LVAL.AddressChange.d
+++ b/test/unittest/pointers/err.D_OP_LVAL.AddressChange.d
@@ -19,9 +19,9 @@
BEGIN
{
- &`max_pfn = (int *) 0x185ede4;
+ &`max_pfn = (int *)0x185ede4;
pfnAddress = &`max_pfn;
- printf("Address of max_pfn: %d\n", (int) pfnAddress);
+ printf("Address of max_pfn: %d\n", (int)pfnAddress);
printf("Value of max_pfn: %d\n", `max_pfn);
}
diff --git a/test/unittest/pointers/err.InvalidAddress1.d b/test/unittest/pointers/err.InvalidAddress1.d
index 7bc0c3be..b2aa92ce 100644
--- a/test/unittest/pointers/err.InvalidAddress1.d
+++ b/test/unittest/pointers/err.InvalidAddress1.d
@@ -20,7 +20,7 @@ BEGIN
{
pfnAddress = &`max_pfn;
*pfnAddress = 20;
- printf("Address of pfnAddress: %d\n", (int) pfnAddress);
+ printf("Address of pfnAddress: %d\n", (int)pfnAddress);
printf("Value of pfnAddress: %d\n", `max_pfn);
exit(0);
}
diff --git a/test/unittest/pointers/err.InvalidAddress2.d b/test/unittest/pointers/err.InvalidAddress2.d
index 616af39a..682ad650 100644
--- a/test/unittest/pointers/err.InvalidAddress2.d
+++ b/test/unittest/pointers/err.InvalidAddress2.d
@@ -19,9 +19,9 @@
BEGIN
{
- x = (int *)alloca(sizeof (int));
+ x = (int *)alloca(sizeof(int));
trace(x);
- y = (int *) (x - 3300778156056);
+ y = (int *)(x - 3300778156056);
*y = 3;
trace(*y);
}
diff --git a/test/unittest/pointers/err.InvalidAddress3.d b/test/unittest/pointers/err.InvalidAddress3.d
index 0128fd77..90cb7815 100644
--- a/test/unittest/pointers/err.InvalidAddress3.d
+++ b/test/unittest/pointers/err.InvalidAddress3.d
@@ -19,7 +19,7 @@
BEGIN
{
- y = (int *) (-33007);
+ y = (int *)(-33007);
*y = 3;
trace(*y);
}
diff --git a/test/unittest/pointers/err.InvalidAddress4.d b/test/unittest/pointers/err.InvalidAddress4.d
index d92eb93d..1e2b4f62 100644
--- a/test/unittest/pointers/err.InvalidAddress4.d
+++ b/test/unittest/pointers/err.InvalidAddress4.d
@@ -19,11 +19,11 @@
BEGIN
{
- x = (int *)alloca(sizeof (int));
- printf("Address x: %x\n", (int) x);
- y = (int *) (x - 2);
+ x = (int *)alloca(sizeof(int));
+ printf("Address x: %x\n", (int)x);
+ y = (int *)(x - 2);
*y = 3;
- printf("Address y: %x\tValue: %d\n", (int) y, *y);
+ printf("Address y: %x\tValue: %d\n", (int)y, *y);
}
ERROR
diff --git a/test/unittest/pointers/err.InvalidAddress5.d b/test/unittest/pointers/err.InvalidAddress5.d
index 7ed45e7e..6a05c78f 100644
--- a/test/unittest/pointers/err.InvalidAddress5.d
+++ b/test/unittest/pointers/err.InvalidAddress5.d
@@ -27,11 +27,11 @@ BEGIN
array[1] = 40;
array[2] = 80;
- uptr = (uintptr_t) &array[0];
+ uptr = (uintptr_t)&array[0];
- p = (int *) (uptr);
- q = (int *) (uptr + 2);
- r = (int *) (uptr + 3);
+ p = (int *)(uptr);
+ q = (int *)(uptr + 2);
+ r = (int *)(uptr + 3);
printf("array[0]: %d\t*p: %d\n", array[0], *p);
printf("array[1]: %d\t*q: %d\n", array[1], *q);
diff --git a/test/unittest/pointers/tst.ArrayPointer1.d b/test/unittest/pointers/tst.ArrayPointer1.d
index ecb94e07..8ee23799 100644
--- a/test/unittest/pointers/tst.ArrayPointer1.d
+++ b/test/unittest/pointers/tst.ArrayPointer1.d
@@ -95,59 +95,59 @@ BEGIN
enum_var0 = &enum_array[0]; enum_var2 = &enum_array[2];
printf("char_var2 - char_var0: %d\n",
- (int) char_var2 - (int) char_var0);
+ (int)char_var2 - (int)char_var0);
printf("short_var3 - short_var0: %d\n",
- (int) short_var3 - (int) short_var0);
- printf("int_var5 - int_var3: %d\n", (int) int_var5 - (int) int_var3);
+ (int)short_var3 - (int)short_var0);
+ printf("int_var5 - int_var3: %d\n", (int)int_var5 - (int)int_var3);
printf("long_var4 - long_var0: %d\n",
- (int) long_var4 - (int) long_var0);
+ (int)long_var4 - (int)long_var0);
printf("long_long_var2 - long_long_var0: %d\n",
- (int) long_long_var2 - (int) long_long_var0);
+ (int)long_long_var2 - (int)long_long_var0);
printf("int8_var5 - int8_var3: %d\n",
- (int) int8_var5 - (int) int8_var3);
+ (int)int8_var5 - (int)int8_var3);
printf("int16_var4 - int16_var0: %d\n",
- (int) int16_var4 - (int) int16_var0);
+ (int)int16_var4 - (int)int16_var0);
printf("int32_var3 - int32_var0: %d\n",
- (int) int32_var3 - (int) int32_var0);
+ (int)int32_var3 - (int)int32_var0);
printf("int64_var1 - int64_var0: %d\n",
- (int) int64_var1 - (int) int64_var0);
+ (int)int64_var1 - (int)int64_var0);
printf("uintptr_var2 - uintptr_var0: %d\n",
- (int) uintptr_var2 - (int) uintptr_var0);
+ (int)uintptr_var2 - (int)uintptr_var0);
printf("struct_var2 - struct_var0: %d\n",
- (int) struct_var2 - (int) struct_var0);
+ (int)struct_var2 - (int)struct_var0);
printf("anon_struct_var5 - anon_struct_var3: %d\n",
- (int) anon_struct_var5 - (int) anon_struct_var3);
+ (int)anon_struct_var5 - (int)anon_struct_var3);
printf("union_var3 - union_var0: %d\n",
- (int) union_var3 - (int) union_var0);
+ (int)union_var3 - (int)union_var0);
printf("anon_union_var4 - anon_union_var0: %d\n",
- (int) anon_union_var4 - (int) anon_union_var0);
+ (int)anon_union_var4 - (int)anon_union_var0);
printf("enum_var2 - enum_var0: %d\n",
- (int) enum_var2 - (int) enum_var0);
+ (int)enum_var2 - (int)enum_var0);
exit(0);
}
END
-/(2 != ((int) char_var2 - (int) char_var0)) ||
- (6 != ((int) short_var3 - (int) short_var0)) ||
- (8 != ((int) int_var5 - (int) int_var3)) ||
- ((32 != ((int) long_var4 - (int) long_var0)) &&
- (16 != ((int) long_var4 - (int) long_var0))) ||
- (16 != ((int) long_long_var2 - (int) long_long_var0)) ||
- (2 != ((int) int8_var5 - (int) int8_var3))
- || (8 != ((int) int16_var4 - (int) int16_var0)) ||
- (12 != ((int) int32_var3 - (int) int32_var0)) ||
- (8 != ((int) int64_var1 - (int) int64_var0)) ||
- ((16 != ((int) uintptr_var2 - (int) uintptr_var0))
- && (8 != ((int) uintptr_var2 - (int) uintptr_var0))) ||
- (16 != ((int) struct_var2 - (int) struct_var0)) ||
- (16 != ((int) anon_struct_var5 - (int) anon_struct_var3))
- || (12 != ((int) union_var3 - (int) union_var0)) ||
- (16 != ((int) anon_union_var4 - (int) anon_union_var0)) ||
- (8 != ((int) enum_var2 - (int) enum_var0))/
+/(2 != ((int)char_var2 - (int)char_var0)) ||
+ (6 != ((int)short_var3 - (int)short_var0)) ||
+ (8 != ((int)int_var5 - (int)int_var3)) ||
+ ((32 != ((int)long_var4 - (int)long_var0)) &&
+ (16 != ((int)long_var4 - (int)long_var0))) ||
+ (16 != ((int)long_long_var2 - (int)long_long_var0)) ||
+ (2 != ((int)int8_var5 - (int)int8_var3))
+ || (8 != ((int)int16_var4 - (int)int16_var0)) ||
+ (12 != ((int)int32_var3 - (int)int32_var0)) ||
+ (8 != ((int)int64_var1 - (int)int64_var0)) ||
+ ((16 != ((int)uintptr_var2 - (int)uintptr_var0))
+ && (8 != ((int)uintptr_var2 - (int)uintptr_var0))) ||
+ (16 != ((int)struct_var2 - (int)struct_var0)) ||
+ (16 != ((int)anon_struct_var5 - (int)anon_struct_var3))
+ || (12 != ((int)union_var3 - (int)union_var0)) ||
+ (16 != ((int)anon_union_var4 - (int)anon_union_var0)) ||
+ (8 != ((int)enum_var2 - (int)enum_var0))/
{
exit(1);
}
diff --git a/test/unittest/pointers/tst.GlobalVar.d b/test/unittest/pointers/tst.GlobalVar.d
index 469f8787..3ec73bd3 100644
--- a/test/unittest/pointers/tst.GlobalVar.d
+++ b/test/unittest/pointers/tst.GlobalVar.d
@@ -22,7 +22,7 @@ BEGIN
i = 0;
pfnAddress = &`max_pfn;
pfnValue = *pfnAddress;
- printf("Address of max_pfn: %x\n", (int) pfnAddress);
+ printf("Address of max_pfn: %x\n", (int)pfnAddress);
printf("Value of max_pfn: %d\n", pfnValue);
}
diff --git a/test/unittest/pointers/tst.IntegerArithmetic1.d b/test/unittest/pointers/tst.IntegerArithmetic1.d
index e4fdc5cc..7bf97574 100644
--- a/test/unittest/pointers/tst.IntegerArithmetic1.d
+++ b/test/unittest/pointers/tst.IntegerArithmetic1.d
@@ -30,11 +30,11 @@ BEGIN
array[1] = 40;
array[2] = 80;
- uptr = (uintptr_t) &array[0];
+ uptr = (uintptr_t)&array[0];
- p = (int *) (uptr);
- q = (int *) (uptr + 4);
- r = (int *) (uptr + 8);
+ p = (int *)(uptr);
+ q = (int *)(uptr + 4);
+ r = (int *)(uptr + 8);
printf("array[0]: %d\t*p: %d\n", array[0], *p);
printf("array[1]: %d\t*q: %d\n", array[1], *q);
diff --git a/test/unittest/pointers/tst.PointerArithmetic1.d b/test/unittest/pointers/tst.PointerArithmetic1.d
index ef0e689e..08855ba4 100644
--- a/test/unittest/pointers/tst.PointerArithmetic1.d
+++ b/test/unittest/pointers/tst.PointerArithmetic1.d
@@ -23,14 +23,14 @@ int *x;
BEGIN
{
- printf("x: %x\n", (int) x);
- printf("x + 1: %x\n", (int) (x+1));
- printf("x + 2: %x\n", (int) (x+2));
+ printf("x: %x\n", (int)x);
+ printf("x + 1: %x\n", (int)(x+1));
+ printf("x + 2: %x\n", (int)(x+2));
exit(0);
}
END
-/(0 != (int) x) || (4 != (int) (x+1)) || (8 != (int) (x+2))/
+/(0 != (int)x) || (4 != (int)(x+1)) || (8 != (int)(x+2))/
{
printf("Error");
exit(1);
diff --git a/test/unittest/pointers/tst.PointerArithmetic3.d b/test/unittest/pointers/tst.PointerArithmetic3.d
index 0c14c706..304e908c 100644
--- a/test/unittest/pointers/tst.PointerArithmetic3.d
+++ b/test/unittest/pointers/tst.PointerArithmetic3.d
@@ -28,12 +28,12 @@ BEGIN
x = &a[0];
y = &a[2];
- printf("y-x: %x\n", (int) (y-x));
+ printf("y-x: %x\n", (int)(y-x));
exit(0);
}
END
-/(2 != (int) (y-x)) /
+/(2 != (int)(y-x))/
{
printf("Error");
exit(1);
diff --git a/test/unittest/pointers/tst.ValidPointer1.d b/test/unittest/pointers/tst.ValidPointer1.d
index 2ba1abe7..95a2baa7 100644
--- a/test/unittest/pointers/tst.ValidPointer1.d
+++ b/test/unittest/pointers/tst.ValidPointer1.d
@@ -19,11 +19,11 @@
BEGIN
{
- x = (int *)alloca(sizeof (int));
- printf("Address x: %x\n", (int) x);
- y = (int *) (x);
+ x = (int *)alloca(sizeof(int));
+ printf("Address x: %x\n", (int)x);
+ y = (int *)(x);
*y = 3;
- printf("Address y: %x\tValue: %d\n", (int) y, *y);
+ printf("Address y: %x\tValue: %d\n", (int)y, *y);
exit(0);
}
diff --git a/test/unittest/pointers/tst.ValidPointer2.d b/test/unittest/pointers/tst.ValidPointer2.d
index c2829911..ca8c0dcf 100644
--- a/test/unittest/pointers/tst.ValidPointer2.d
+++ b/test/unittest/pointers/tst.ValidPointer2.d
@@ -19,11 +19,11 @@
BEGIN
{
- x = (int *)alloca(sizeof (int));
- printf("Address x: %x\n", (int) x);
- y = (int *) (x + 2);
+ x = (int *)alloca(sizeof(int));
+ printf("Address x: %x\n", (int)x);
+ y = (int *)(x + 2);
*y = 3;
- printf("Address y: %x\tValue: %d\n", (int) y, *y);
+ printf("Address y: %x\tValue: %d\n", (int)y, *y);
exit(0);
}
diff --git a/test/unittest/pointers/tst.VoidCast.d b/test/unittest/pointers/tst.VoidCast.d
index 0f30959a..8c831e6a 100644
--- a/test/unittest/pointers/tst.VoidCast.d
+++ b/test/unittest/pointers/tst.VoidCast.d
@@ -26,7 +26,7 @@ BEGIN
array[2] = 434;
p = &array[0];
- newp = (int *) p;
+ newp = (int *)p;
printf("array[0]: %d, newp: %d\n", array[0], *newp);
exit(0);
diff --git a/test/unittest/pointers/tst.basic1.d b/test/unittest/pointers/tst.basic1.d
index 0f8a7a9e..e0b9e3cd 100644
--- a/test/unittest/pointers/tst.basic1.d
+++ b/test/unittest/pointers/tst.basic1.d
@@ -21,7 +21,7 @@ BEGIN
{
pfnAddress = &`max_pfn;
pfnValue = *pfnAddress;
- printf("Address of max_pfn: %x\n", (int) pfnAddress);
+ printf("Address of max_pfn: %x\n", (int)pfnAddress);
printf("Value of max_pfn: %d\n", pfnValue);
exit(0);
}
diff --git a/test/unittest/pointers/tst.basic2.d b/test/unittest/pointers/tst.basic2.d
index 5e6e4ad6..559fd93b 100644
--- a/test/unittest/pointers/tst.basic2.d
+++ b/test/unittest/pointers/tst.basic2.d
@@ -21,7 +21,7 @@ BEGIN
{
assoc_array["pfnAddress"] = &`max_pfn;
pfnValue = *(assoc_array["pfnAddress"]);
- printf("Address of max_pfn: %x\n", (int) assoc_array["pfnAddress"]);
+ printf("Address of max_pfn: %x\n", (int)assoc_array["pfnAddress"]);
printf("Value of max_pfn: %d\n", pfnValue);
exit(0);
}
diff --git a/test/unittest/sizeof/err.D_IDENT_BADREF.SizeofAssoc.d b/test/unittest/sizeof/err.D_IDENT_BADREF.SizeofAssoc.d
index a4dbcb61..b556eb23 100644
--- a/test/unittest/sizeof/err.D_IDENT_BADREF.SizeofAssoc.d
+++ b/test/unittest/sizeof/err.D_IDENT_BADREF.SizeofAssoc.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -21,10 +21,10 @@ BEGIN
assoc_array[1] = 100;
assoc_array[2] = 210;
- printf("sizeof (assoc_array): %d\n", sizeof (assoc_array));
- printf("sizeof (assoc_array[0]): %d\n", sizeof (assoc_array[0]));
- printf("sizeof (assoc_array[1]): %d\n", sizeof (assoc_array[1]));
- printf("sizeof (assoc_array[2]): %d\n", sizeof (assoc_array[2]));
+ printf("sizeof(assoc_array): %d\n", sizeof(assoc_array));
+ printf("sizeof(assoc_array[0]): %d\n", sizeof(assoc_array[0]));
+ printf("sizeof(assoc_array[1]): %d\n", sizeof(assoc_array[1]));
+ printf("sizeof(assoc_array[2]): %d\n", sizeof(assoc_array[2]));
exit(0);
}
diff --git a/test/unittest/sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d b/test/unittest/sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d
index aa2bd73e..56c93d43 100644
--- a/test/unittest/sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d
+++ b/test/unittest/sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -16,6 +16,6 @@
BEGIN
{
- printf("sizeof (`): %d\n", sizeof (`));
+ printf("sizeof(`): %d\n", sizeof(`));
exit(0);
}
diff --git a/test/unittest/sizeof/err.D_SIZEOF_TYPE.d b/test/unittest/sizeof/err.D_SIZEOF_TYPE.d
index 98d1c671..9533a2c8 100644
--- a/test/unittest/sizeof/err.D_SIZEOF_TYPE.d
+++ b/test/unittest/sizeof/err.D_SIZEOF_TYPE.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,6 +15,6 @@
BEGIN
{
- trace(sizeof (void));
+ trace(sizeof(void));
exit(0);
}
diff --git a/test/unittest/sizeof/err.D_SYNTAX.SizeofBadType.d b/test/unittest/sizeof/err.D_SYNTAX.SizeofBadType.d
index bec8eaab..fcb0c512 100644
--- a/test/unittest/sizeof/err.D_SYNTAX.SizeofBadType.d
+++ b/test/unittest/sizeof/err.D_SYNTAX.SizeofBadType.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -16,6 +16,6 @@
BEGIN
{
- printf("sizeof (*): %d\n", sizeof (*));
+ printf("sizeof(*): %d\n", sizeof(*));
exit(0);
}
diff --git a/test/unittest/sizeof/tst.SizeofArray.d b/test/unittest/sizeof/tst.SizeofArray.d
index 6c620906..7ad9784b 100644
--- a/test/unittest/sizeof/tst.SizeofArray.d
+++ b/test/unittest/sizeof/tst.SizeofArray.d
@@ -25,17 +25,17 @@ BEGIN
array[1] = 100;
array[2] = 210;
- printf("sizeof (array): %d\n", sizeof (array));
- printf("sizeof (array[0]): %d\n", sizeof (array[0]));
- printf("sizeof (array[1]): %d\n", sizeof (array[1]));
- printf("sizeof (array[2]): %d\n", sizeof (array[2]));
+ printf("sizeof(array): %d\n", sizeof(array));
+ printf("sizeof(array[0]): %d\n", sizeof(array[0]));
+ printf("sizeof(array[1]): %d\n", sizeof(array[1]));
+ printf("sizeof(array[2]): %d\n", sizeof(array[2]));
exit(0);
}
END
-/(20 != sizeof (array)) || (4 != sizeof (array[0])) || (4 != sizeof (array[1]))
- || (4 != sizeof (array[2]))/
+/(20 != sizeof(array)) || (4 != sizeof(array[0])) || (4 != sizeof(array[1]))
+ || (4 != sizeof(array[2]))/
{
exit(1);
}
diff --git a/test/unittest/sizeof/tst.SizeofArray.r b/test/unittest/sizeof/tst.SizeofArray.r
index 30bafff6..4ad05ac6 100644
--- a/test/unittest/sizeof/tst.SizeofArray.r
+++ b/test/unittest/sizeof/tst.SizeofArray.r
@@ -1,5 +1,5 @@
-sizeof (array): 20
-sizeof (array[0]): 4
-sizeof (array[1]): 4
-sizeof (array[2]): 4
+sizeof(array): 20
+sizeof(array[0]): 4
+sizeof(array[1]): 4
+sizeof(array[2]): 4
diff --git a/test/unittest/sizeof/tst.SizeofDataTypes.d b/test/unittest/sizeof/tst.SizeofDataTypes.d
index b4396b66..e5db3721 100644
--- a/test/unittest/sizeof/tst.SizeofDataTypes.d
+++ b/test/unittest/sizeof/tst.SizeofDataTypes.d
@@ -68,34 +68,34 @@ int *pointer;
BEGIN
{
- printf("sizeof (new_char): %d\n", sizeof (new_char));
- printf("sizeof (new_short): %d\n", sizeof (new_short));
- printf("sizeof (new_int): %d\n", sizeof (new_int));
- printf("sizeof (new_long): %d\n", sizeof (new_long));
- printf("sizeof (new_long_long): %d\n", sizeof (new_long_long));
- printf("sizeof (new_int8): %d\n", sizeof (new_int8));
- printf("sizeof (new_int16): %d\n", sizeof (new_int16));
- printf("sizeof (new_int32): %d\n", sizeof (new_int32));
- printf("sizeof (new_int64): %d\n", sizeof (new_int64));
- printf("sizeof (pointer): %d\n", sizeof (pointer));
- printf("sizeof (intptr_t): %d\n", sizeof (intptr_t));
- printf("sizeof (new_struct): %d\n", sizeof (new_struct));
- printf("sizeof (anon_struct): %d\n", sizeof (anon_struct));
- printf("sizeof (new_union): %d\n", sizeof (new_union));
- printf("sizeof (anon_union): %d\n", sizeof (anon_union));
- printf("sizeof (new_enum): %d\n", sizeof (new_enum));
+ printf("sizeof(new_char): %d\n", sizeof(new_char));
+ printf("sizeof(new_short): %d\n", sizeof(new_short));
+ printf("sizeof(new_int): %d\n", sizeof(new_int));
+ printf("sizeof(new_long): %d\n", sizeof(new_long));
+ printf("sizeof(new_long_long): %d\n", sizeof(new_long_long));
+ printf("sizeof(new_int8): %d\n", sizeof(new_int8));
+ printf("sizeof(new_int16): %d\n", sizeof(new_int16));
+ printf("sizeof(new_int32): %d\n", sizeof(new_int32));
+ printf("sizeof(new_int64): %d\n", sizeof(new_int64));
+ printf("sizeof(pointer): %d\n", sizeof(pointer));
+ printf("sizeof(intptr_t): %d\n", sizeof(intptr_t));
+ printf("sizeof(new_struct): %d\n", sizeof(new_struct));
+ printf("sizeof(anon_struct): %d\n", sizeof(anon_struct));
+ printf("sizeof(new_union): %d\n", sizeof(new_union));
+ printf("sizeof(anon_union): %d\n", sizeof(anon_union));
+ printf("sizeof(new_enum): %d\n", sizeof(new_enum));
exit(0);
}
END
-/(1 != sizeof (new_char)) || (2 != sizeof (new_short)) ||
- (4 != sizeof (new_int)) ||
- ((4 != sizeof (new_long)) && (8 != sizeof (new_long))) ||
- (8 != sizeof (new_long_long)) ||
- (1 != sizeof (new_int8)) || (2 != sizeof (new_int16)) ||
- (4 != sizeof (new_int32)) || (8 != sizeof (new_int64)) ||
- (sizeof (pointer) != sizeof (new_intptr)) || (8 != sizeof (new_struct)) ||
- (4 != sizeof (new_union)) || (4 != sizeof (new_enum))/
+/(1 != sizeof(new_char)) || (2 != sizeof(new_short)) ||
+ (4 != sizeof(new_int)) ||
+ ((4 != sizeof(new_long)) && (8 != sizeof(new_long))) ||
+ (8 != sizeof(new_long_long)) ||
+ (1 != sizeof(new_int8)) || (2 != sizeof(new_int16)) ||
+ (4 != sizeof(new_int32)) || (8 != sizeof(new_int64)) ||
+ (sizeof(pointer) != sizeof(new_intptr)) || (8 != sizeof(new_struct)) ||
+ (4 != sizeof(new_union)) || (4 != sizeof(new_enum))/
{
exit(1);
}
diff --git a/test/unittest/sizeof/tst.SizeofDataTypes.r b/test/unittest/sizeof/tst.SizeofDataTypes.r
index 6742f53d..e4193523 100644
--- a/test/unittest/sizeof/tst.SizeofDataTypes.r
+++ b/test/unittest/sizeof/tst.SizeofDataTypes.r
@@ -1,17 +1,17 @@
-sizeof (new_char): 1
-sizeof (new_short): 2
-sizeof (new_int): 4
-sizeof (new_long): 8
-sizeof (new_long_long): 8
-sizeof (new_int8): 1
-sizeof (new_int16): 2
-sizeof (new_int32): 4
-sizeof (new_int64): 8
-sizeof (pointer): 8
-sizeof (intptr_t): 8
-sizeof (new_struct): 8
-sizeof (anon_struct): 8
-sizeof (new_union): 4
-sizeof (anon_union): 4
-sizeof (new_enum): 4
+sizeof(new_char): 1
+sizeof(new_short): 2
+sizeof(new_int): 4
+sizeof(new_long): 8
+sizeof(new_long_long): 8
+sizeof(new_int8): 1
+sizeof(new_int16): 2
+sizeof(new_int32): 4
+sizeof(new_int64): 8
+sizeof(pointer): 8
+sizeof(intptr_t): 8
+sizeof(new_struct): 8
+sizeof(anon_struct): 8
+sizeof(new_union): 4
+sizeof(anon_union): 4
+sizeof(new_enum): 4
diff --git a/test/unittest/sizeof/tst.SizeofExpression.d b/test/unittest/sizeof/tst.SizeofExpression.d
index 0ab7980b..0589259d 100644
--- a/test/unittest/sizeof/tst.SizeofExpression.d
+++ b/test/unittest/sizeof/tst.SizeofExpression.d
@@ -17,27 +17,27 @@
BEGIN
{
- printf("sizeof ('c') : %d\n", sizeof ('c'));
- printf("sizeof (10 * 'c') : %d\n", sizeof (10 * 'c'));
- printf("sizeof (100 + 12345) : %d\n", sizeof (100 + 12345));
- printf("sizeof (1234567890) : %d\n", sizeof (1234567890));
+ printf("sizeof('c') : %d\n", sizeof('c'));
+ printf("sizeof(10 * 'c') : %d\n", sizeof(10 * 'c'));
+ printf("sizeof(100 + 12345) : %d\n", sizeof(100 + 12345));
+ printf("sizeof(1234567890) : %d\n", sizeof(1234567890));
- printf("sizeof (1234512345 * 1234512345 * 12345678 * 1ULL) : %d\n",
- sizeof (1234512345 * 1234512345 * 12345678 * 1ULL));
- printf("sizeof (-129) : %d\n", sizeof (-129));
- printf("sizeof (0x67890/0x77000) : %d\n", sizeof (0x67890/0x77000));
+ printf("sizeof(1234512345 * 1234512345 * 12345678 * 1ULL) : %d\n",
+ sizeof(1234512345 * 1234512345 * 12345678 * 1ULL));
+ printf("sizeof(-129) : %d\n", sizeof(-129));
+ printf("sizeof(0x67890/0x77000) : %d\n", sizeof(0x67890/0x77000));
- printf("sizeof (3 > 2 ? 3 : 2) : %d\n", sizeof (3 > 2 ? 3 : 2));
+ printf("sizeof(3 > 2 ? 3 : 2) : %d\n", sizeof(3 > 2 ? 3 : 2));
exit(0);
}
END
-/(4 != sizeof ('c')) || (4 != sizeof (10 * 'c')) ||
- (4 != sizeof (100 + 12345)) || (4 != sizeof (1234567890)) ||
- (8 != sizeof (1234512345 * 1234512345 * 12345678 * 1ULL)) ||
- (4 != sizeof (-129)) || (4 != sizeof (0x67890/0x77000)) ||
- (4 != sizeof (3 > 2 ? 3 : 2))/
+/(4 != sizeof('c')) || (4 != sizeof(10 * 'c')) ||
+ (4 != sizeof(100 + 12345)) || (4 != sizeof(1234567890)) ||
+ (8 != sizeof(1234512345 * 1234512345 * 12345678 * 1ULL)) ||
+ (4 != sizeof(-129)) || (4 != sizeof(0x67890/0x77000)) ||
+ (4 != sizeof(3 > 2 ? 3 : 2))/
{
exit(1);
}
diff --git a/test/unittest/sizeof/tst.SizeofExpression.r b/test/unittest/sizeof/tst.SizeofExpression.r
index 8eb7becd..316dc630 100644
--- a/test/unittest/sizeof/tst.SizeofExpression.r
+++ b/test/unittest/sizeof/tst.SizeofExpression.r
@@ -1,9 +1,9 @@
-sizeof ('c') : 4
-sizeof (10 * 'c') : 4
-sizeof (100 + 12345) : 4
-sizeof (1234567890) : 4
-sizeof (1234512345 * 1234512345 * 12345678 * 1ULL) : 8
-sizeof (-129) : 4
-sizeof ({ptr}/{ptr}) : 4
-sizeof (3 > 2 ? 3 : 2) : 4
+sizeof('c') : 4
+sizeof(10 * 'c') : 4
+sizeof(100 + 12345) : 4
+sizeof(1234567890) : 4
+sizeof(1234512345 * 1234512345 * 12345678 * 1ULL) : 8
+sizeof(-129) : 4
+sizeof({ptr}/{ptr}) : 4
+sizeof(3 > 2 ? 3 : 2) : 4
diff --git a/test/unittest/sizeof/tst.SizeofNULL.d b/test/unittest/sizeof/tst.SizeofNULL.d
index 93362f8f..aacd66d8 100644
--- a/test/unittest/sizeof/tst.SizeofNULL.d
+++ b/test/unittest/sizeof/tst.SizeofNULL.d
@@ -16,12 +16,12 @@
BEGIN
{
- printf("sizeof (NULL): %d\n", sizeof (NULL));
+ printf("sizeof(NULL): %d\n", sizeof(NULL));
exit(0);
}
END
-/4 != sizeof (NULL)/
+/4 != sizeof(NULL)/
{
exit(1);
}
diff --git a/test/unittest/sizeof/tst.SizeofNULL.r b/test/unittest/sizeof/tst.SizeofNULL.r
index 1e1b82a2..a2aad778 100644
--- a/test/unittest/sizeof/tst.SizeofNULL.r
+++ b/test/unittest/sizeof/tst.SizeofNULL.r
@@ -1,2 +1,2 @@
-sizeof (NULL): 4
+sizeof(NULL): 4
diff --git a/test/unittest/sizeof/tst.SizeofStrConst.d b/test/unittest/sizeof/tst.SizeofStrConst.d
index 06eedc1b..5ab3db12 100644
--- a/test/unittest/sizeof/tst.SizeofStrConst.d
+++ b/test/unittest/sizeof/tst.SizeofStrConst.d
@@ -16,6 +16,6 @@
BEGIN
{
- printf("sizeof \"hi\": %d\n", sizeof ("hi"));
+ printf("sizeof \"hi\": %d\n", sizeof("hi"));
exit(0);
}
diff --git a/test/unittest/sizeof/tst.SizeofString1.d b/test/unittest/sizeof/tst.SizeofString1.d
index 782436d9..30b58b25 100644
--- a/test/unittest/sizeof/tst.SizeofString1.d
+++ b/test/unittest/sizeof/tst.SizeofString1.d
@@ -22,10 +22,10 @@ BEGIN
assoc_array["hi"] = "hi";
assoc_array["hello"] = "hello, world";
- printf("sizeof (assoc_array[\"hello\"]): %d\n",
- sizeof (assoc_array["hello"]));
- printf("sizeof (assoc_array[\"hi\"]): %d\n",
- sizeof (assoc_array["hi"]));
+ printf("sizeof(assoc_array[\"hello\"]): %d\n",
+ sizeof(assoc_array["hello"]));
+ printf("sizeof(assoc_array[\"hi\"]): %d\n",
+ sizeof(assoc_array["hi"]));
exit(0);
}
diff --git a/test/unittest/sizeof/tst.SizeofString1.r b/test/unittest/sizeof/tst.SizeofString1.r
index 9c43b1e3..22fa3a62 100644
--- a/test/unittest/sizeof/tst.SizeofString1.r
+++ b/test/unittest/sizeof/tst.SizeofString1.r
@@ -1,3 +1,3 @@
-sizeof (assoc_array["hello"]): 256
-sizeof (assoc_array["hi"]): 256
+sizeof(assoc_array["hello"]): 256
+sizeof(assoc_array["hi"]): 256
diff --git a/test/unittest/sizeof/tst.SizeofString2.d b/test/unittest/sizeof/tst.SizeofString2.d
index a974d71a..62378a46 100644
--- a/test/unittest/sizeof/tst.SizeofString2.d
+++ b/test/unittest/sizeof/tst.SizeofString2.d
@@ -19,6 +19,6 @@
BEGIN
{
var = "hello";
- printf("sizeof (var): %d\n", sizeof (var));
+ printf("sizeof(var): %d\n", sizeof(var));
exit(0);
}
diff --git a/test/unittest/sizeof/tst.SizeofString2.r b/test/unittest/sizeof/tst.SizeofString2.r
index fdeca699..7ae51e0c 100644
--- a/test/unittest/sizeof/tst.SizeofString2.r
+++ b/test/unittest/sizeof/tst.SizeofString2.r
@@ -1,2 +1,2 @@
-sizeof (var): 256
+sizeof(var): 256
diff --git a/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d b/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d
index 450decd4..08caeb4d 100644
--- a/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d
+++ b/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d
@@ -23,7 +23,7 @@ size_t nbytes;
BEGIN
{
self->i = 0;
- addr = (uintptr_t) &a[0];
+ addr = (uintptr_t)&a[0];
nbytes = 10;
var = speculation();
}
diff --git a/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d b/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d
index fe172cb9..00bd6faa 100644
--- a/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d
+++ b/test/unittest/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d
@@ -22,7 +22,7 @@ size_t maxlen;
BEGIN
{
self->i = 0;
- addr = (uintptr_t) &a[0];
+ addr = (uintptr_t)&a[0];
maxlen = 10;
var = speculation();
}
diff --git a/test/unittest/tracemem/tst.three_arg.sh b/test/unittest/tracemem/tst.three_arg.sh
index 0d40250a..63153ffa 100755
--- a/test/unittest/tracemem/tst.three_arg.sh
+++ b/test/unittest/tracemem/tst.three_arg.sh
@@ -70,19 +70,19 @@ BEGIN {
nchks = 0; # number of lines that are correct
}
{
- if ( and(state, 1) ) { # state 1 and state 3
+ if (and(state, 1)) { # state 1 and state 3
n = 5; # number of bytes is 5 for state 1 and 3 for state 3
- if ( state == 3 ) {
+ if (state == 3) {
n = 3;
state = -1; # cycle state back around
}
- if ( NF != n ) {
+ if (NF != n) {
printf "ERROR expected %d bytes but got %d\n", n, NF;
nerrs += 1;
exit 1;
}
for (i = 0; i < n; i++) {
- if ( x[i] != (\$i + 0) ) { # $i+0 to convert $i to number
+ if (x[i] != (\$i + 0)) { # $i+0 to convert $i to number
printf "ERROR expected byte %x but got %x\n", x[i], \$i;
nerrs += 1;
exit 1;
@@ -90,7 +90,7 @@ BEGIN {
}
nchks += 1;
} else { # state 0 and state 2
- if ( NF != 8 ) { # number of bytes is 8
+ if (NF != 8) { # number of bytes is 8
printf "ERROR expected 8 bytes but got %d\n", NF;
nerrs += 1;
exit 1;
@@ -100,12 +100,11 @@ BEGIN {
state += 1;
}
END {
- if ( nerrs == 0 ) {
- if ( nchks < 4 ) {
+ if (nerrs == 0) {
+ if (nchks < 4)
printf "insufficient number (only %d) of checks\n", nchks;
- } else {
+ else
print "SUCCESS";
- }
}
}
EOF
diff --git a/test/unittest/translators/err.D_DECL_TYPERED.BadTransDecl.d b/test/unittest/translators/err.D_DECL_TYPERED.BadTransDecl.d
index 17039841..4544619f 100644
--- a/test/unittest/translators/err.D_DECL_TYPERED.BadTransDecl.d
+++ b/test/unittest/translators/err.D_DECL_TYPERED.BadTransDecl.d
@@ -32,8 +32,8 @@ translator struct output_struct
struct input_struct *uvar
}
{
- myi = ((struct input_struct *) uvar)->i;
- myc = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myc = ((struct input_struct *)uvar)->c;
}
BEGIN
diff --git a/test/unittest/translators/err.D_OP_INCOMPLETE.NonExistentInput1.d b/test/unittest/translators/err.D_OP_INCOMPLETE.NonExistentInput1.d
index d7067276..f6992783 100644
--- a/test/unittest/translators/err.D_OP_INCOMPLETE.NonExistentInput1.d
+++ b/test/unittest/translators/err.D_OP_INCOMPLETE.NonExistentInput1.d
@@ -22,8 +22,8 @@ struct output_struct {
translator struct output_struct < struct input_struct *ivar >
{
- myi = ((struct input_struct *) ivar)->nonexistentI;
- myc = ((struct input_struct *) ivar)->nonexistentC;
+ myi = ((struct input_struct *)ivar)->nonexistentI;
+ myc = ((struct input_struct *)ivar)->nonexistentC;
};
BEGIN
diff --git a/test/unittest/translators/err.D_SYNTAX.BadTransDecl1.d b/test/unittest/translators/err.D_SYNTAX.BadTransDecl1.d
index bed5e3f7..b17d27ba 100644
--- a/test/unittest/translators/err.D_SYNTAX.BadTransDecl1.d
+++ b/test/unittest/translators/err.D_SYNTAX.BadTransDecl1.d
@@ -26,10 +26,10 @@ struct output_struct {
char myc;
};
-translator struct output_struct ( struct input_struct *uvar )
+translator struct output_struct (struct input_struct *uvar)
{
- myi = ((struct input_struct *) uvar)->i;
- myc = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myc = ((struct input_struct *)uvar)->c;
}
BEGIN
diff --git a/test/unittest/translators/err.D_SYNTAX.BadTransDecl3.d b/test/unittest/translators/err.D_SYNTAX.BadTransDecl3.d
index 2564be43..36a1a02b 100644
--- a/test/unittest/translators/err.D_SYNTAX.BadTransDecl3.d
+++ b/test/unittest/translators/err.D_SYNTAX.BadTransDecl3.d
@@ -27,8 +27,8 @@ struct output_struct {
};
translator struct output_struct < struct input_struct *uvar >
- myi = ((struct input_struct *) uvar)->i;
- myc = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myc = ((struct input_struct *)uvar)->c;
;
BEGIN
diff --git a/test/unittest/translators/err.D_SYNTAX.BadTransDecl4.d b/test/unittest/translators/err.D_SYNTAX.BadTransDecl4.d
index 97c3e197..acc59046 100644
--- a/test/unittest/translators/err.D_SYNTAX.BadTransDecl4.d
+++ b/test/unittest/translators/err.D_SYNTAX.BadTransDecl4.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < struct input_struct *uvar >
{
- myi = ((struct input_struct *) uvar)->i;
- myc = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myc = ((struct input_struct *)uvar)->c;
}
translator struct output_struct < struct new_struct *newvar >
diff --git a/test/unittest/translators/err.D_TYPE_MEMBER.NonExistentInput2.d b/test/unittest/translators/err.D_TYPE_MEMBER.NonExistentInput2.d
index 11b8cbe7..16c9b2c0 100644
--- a/test/unittest/translators/err.D_TYPE_MEMBER.NonExistentInput2.d
+++ b/test/unittest/translators/err.D_TYPE_MEMBER.NonExistentInput2.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < struct input_struct *ivar >
{
- myi = ((struct input_struct *) ivar)->i;
- myc = ((struct input_struct *) ivar)->nonexistent;
+ myi = ((struct input_struct *)ivar)->i;
+ myc = ((struct input_struct *)ivar)->nonexistent;
};
BEGIN
diff --git a/test/unittest/translators/err.D_XLATE_INCOMPAT.BadInputType1.d b/test/unittest/translators/err.D_XLATE_INCOMPAT.BadInputType1.d
index 42b1f68e..2a1fb92f 100644
--- a/test/unittest/translators/err.D_XLATE_INCOMPAT.BadInputType1.d
+++ b/test/unittest/translators/err.D_XLATE_INCOMPAT.BadInputType1.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < struct input_struct *uvar >
{
- myi = ((struct input_struct *) uvar)->i;
- myc = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myc = ((struct input_struct *)uvar)->c;
};
BEGIN
diff --git a/test/unittest/translators/err.D_XLATE_MEMB.NonExistentOutput2.d b/test/unittest/translators/err.D_XLATE_MEMB.NonExistentOutput2.d
index fdb28bd3..a94034aa 100644
--- a/test/unittest/translators/err.D_XLATE_MEMB.NonExistentOutput2.d
+++ b/test/unittest/translators/err.D_XLATE_MEMB.NonExistentOutput2.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < struct input_struct *ivar >
{
- myi = ((struct input_struct *) ivar)->i;
- yourc = ((struct input_struct *) ivar)->nonexistent;
+ myi = ((struct input_struct *)ivar)->i;
+ yourc = ((struct input_struct *)ivar)->nonexistent;
};
BEGIN
diff --git a/test/unittest/translators/err.D_XLATE_NONE.BadTransDecl6.d b/test/unittest/translators/err.D_XLATE_NONE.BadTransDecl6.d
index ac53ad8b..2e3907e9 100644
--- a/test/unittest/translators/err.D_XLATE_NONE.BadTransDecl6.d
+++ b/test/unittest/translators/err.D_XLATE_NONE.BadTransDecl6.d
@@ -29,8 +29,8 @@ struct myoutput_struct {
translator struct myoutput_struct < struct myinput_struct *ivar >
{
- myi = ((struct myinput_struct *) ivar)->i;
- myc = ((struct myinput_struct *) ivar)->c;
+ myi = ((struct myinput_struct *)ivar)->i;
+ myc = ((struct myinput_struct *)ivar)->c;
};
diff --git a/test/unittest/translators/err.D_XLATE_REDECL.RepeatTransDecl.d b/test/unittest/translators/err.D_XLATE_REDECL.RepeatTransDecl.d
index 74106a1d..3288621e 100644
--- a/test/unittest/translators/err.D_XLATE_REDECL.RepeatTransDecl.d
+++ b/test/unittest/translators/err.D_XLATE_REDECL.RepeatTransDecl.d
@@ -28,14 +28,14 @@ struct output_struct {
translator struct output_struct < struct input_struct *ivar1 >
{
- oi = ((struct input_struct *) ivar1)->ii1;
- oc = ((struct input_struct *) ivar1)->ic1;
+ oi = ((struct input_struct *)ivar1)->ii1;
+ oc = ((struct input_struct *)ivar1)->ic1;
};
translator struct output_struct < struct input_struct *ivar1 >
{
- oi = ((struct input_struct *) ivar1)->ii1;
- oc = ((struct input_struct *) ivar1)->ic1;
+ oi = ((struct input_struct *)ivar1)->ii1;
+ oc = ((struct input_struct *)ivar1)->ic1;
};
diff --git a/test/unittest/translators/err.D_XLATE_SOU.NonExistentOutput1.d b/test/unittest/translators/err.D_XLATE_SOU.NonExistentOutput1.d
index 3e7aa1b4..b8ad41ee 100644
--- a/test/unittest/translators/err.D_XLATE_SOU.NonExistentOutput1.d
+++ b/test/unittest/translators/err.D_XLATE_SOU.NonExistentOutput1.d
@@ -23,8 +23,8 @@ struct input_struct {
translator struct output_struct < struct input_struct *ivar >
{
- myi = ((struct input_struct *) ivar)->i;
- myc = ((struct input_struct *) ivar)->nonexistent;
+ myi = ((struct input_struct *)ivar)->i;
+ myc = ((struct input_struct *)ivar)->nonexistent;
};
BEGIN
diff --git a/test/unittest/translators/tst.CircularTransDecl.d b/test/unittest/translators/tst.CircularTransDecl.d
index cb8a0782..dda08c2a 100644
--- a/test/unittest/translators/tst.CircularTransDecl.d
+++ b/test/unittest/translators/tst.CircularTransDecl.d
@@ -28,14 +28,14 @@ struct output_struct {
translator struct output_struct < struct input_struct ivar >
{
- myi = ((struct input_struct ) ivar).i;
- myc = ((struct input_struct ) ivar).c;
+ myi = ((struct input_struct)ivar).i;
+ myc = ((struct input_struct)ivar).c;
};
translator struct input_struct < struct output_struct uvar >
{
- i = ((struct output_struct ) uvar).myi;
- c = ((struct output_struct ) uvar).myc;
+ i = ((struct output_struct)uvar).myi;
+ c = ((struct output_struct)uvar).myc;
};
struct input_struct f1;
diff --git a/test/unittest/translators/tst.ForwardTag.d b/test/unittest/translators/tst.ForwardTag.d
index 649c496e..0ba64e65 100644
--- a/test/unittest/translators/tst.ForwardTag.d
+++ b/test/unittest/translators/tst.ForwardTag.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < struct callmewhatever *idontcare >
{
- myi = ((struct input_struct *) uvar)->i;
- myc = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myc = ((struct input_struct *)uvar)->c;
};
BEGIN
diff --git a/test/unittest/translators/tst.InputAliasTrans.d b/test/unittest/translators/tst.InputAliasTrans.d
index 7342284f..52034243 100644
--- a/test/unittest/translators/tst.InputAliasTrans.d
+++ b/test/unittest/translators/tst.InputAliasTrans.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < input_t *ivar >
{
- oi = ((input_t *) ivar)->ii;
- oc = ((input_t *) ivar)->ic;
+ oi = ((input_t *)ivar)->ii;
+ oc = ((input_t *)ivar)->ic;
};
BEGIN
diff --git a/test/unittest/translators/tst.InputIntTrans.d b/test/unittest/translators/tst.InputIntTrans.d
index 303ecdc3..67f63dd6 100644
--- a/test/unittest/translators/tst.InputIntTrans.d
+++ b/test/unittest/translators/tst.InputIntTrans.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < int idontcare >
{
- myi = ((struct input_struct *) uvar)->i;
- myi = ((struct input_struct *) uvar)->c;
+ myi = ((struct input_struct *)uvar)->i;
+ myi = ((struct input_struct *)uvar)->c;
};
BEGIN
diff --git a/test/unittest/translators/tst.OutputAliasTrans.d b/test/unittest/translators/tst.OutputAliasTrans.d
index e99c7c4a..6cbd1b30 100644
--- a/test/unittest/translators/tst.OutputAliasTrans.d
+++ b/test/unittest/translators/tst.OutputAliasTrans.d
@@ -31,8 +31,8 @@ typedef struct output_struct output_t;
translator output_t < struct input_struct *ivar >
{
- oi = ((struct input_struct *) ivar)->ii;
- oc = ((struct input_struct *) ivar)->ic;
+ oi = ((struct input_struct *)ivar)->ii;
+ oc = ((struct input_struct *)ivar)->ic;
};
BEGIN
diff --git a/test/unittest/translators/tst.PartialDereferencing.d b/test/unittest/translators/tst.PartialDereferencing.d
index ffc74acc..3d8c913d 100644
--- a/test/unittest/translators/tst.PartialDereferencing.d
+++ b/test/unittest/translators/tst.PartialDereferencing.d
@@ -29,8 +29,8 @@ struct output_struct {
translator struct output_struct < struct input_struct ivar >
{
- oi = ((struct input_struct) ivar).ii;
- oc = ((struct input_struct) ivar).ic;
+ oi = ((struct input_struct)ivar).ii;
+ oc = ((struct input_struct)ivar).ic;
};
struct output_struct out;
diff --git a/test/unittest/translators/tst.PartialOutputTransDefn.d b/test/unittest/translators/tst.PartialOutputTransDefn.d
index 4b2c36ed..8f6a71c7 100644
--- a/test/unittest/translators/tst.PartialOutputTransDefn.d
+++ b/test/unittest/translators/tst.PartialOutputTransDefn.d
@@ -29,7 +29,7 @@ struct output_struct {
translator struct output_struct < struct input_struct *ivar >
{
- oi = ((struct input_struct *) ivar)->ii;
+ oi = ((struct input_struct *)ivar)->ii;
};
BEGIN
diff --git a/test/unittest/translators/tst.RepeatDeclaration.d b/test/unittest/translators/tst.RepeatDeclaration.d
index 021541f1..4ac17323 100644
--- a/test/unittest/translators/tst.RepeatDeclaration.d
+++ b/test/unittest/translators/tst.RepeatDeclaration.d
@@ -33,14 +33,14 @@ struct output_struct {
translator struct output_struct < struct input_struct1 *ivar1 >
{
- oi = ((struct input_struct1 *) ivar1)->ii1;
- oc = ((struct input_struct1 *) ivar1)->ic1;
+ oi = ((struct input_struct1 *)ivar1)->ii1;
+ oc = ((struct input_struct1 *)ivar1)->ic1;
};
translator struct output_struct < struct input_struct2 *ivar2 >
{
- oi = ((struct input_struct2 *) ivar2)->ii2;
- oc = ((struct input_struct2 *) ivar2)->ic2;
+ oi = ((struct input_struct2 *)ivar2)->ii2;
+ oc = ((struct input_struct2 *)ivar2)->ic2;
};
BEGIN
diff --git a/test/unittest/translators/tst.SimultaneousTranslators.d b/test/unittest/translators/tst.SimultaneousTranslators.d
index 735a8bfb..ee925d28 100644
--- a/test/unittest/translators/tst.SimultaneousTranslators.d
+++ b/test/unittest/translators/tst.SimultaneousTranslators.d
@@ -35,12 +35,12 @@ struct output_struct {
translator struct output_struct < struct input_struct1 *ivar1 >
{
- oi = ((struct input_struct1 *) ivar1)->ii1;
+ oi = ((struct input_struct1 *)ivar1)->ii1;
};
translator struct output_struct < struct input_struct2 *ivar2 >
{
- oc = ((struct input_struct2 *) ivar2)->ic2;
+ oc = ((struct input_struct2 *)ivar2)->ic2;
};
BEGIN
diff --git a/test/unittest/translators/tst.StructureAssignment.d b/test/unittest/translators/tst.StructureAssignment.d
index 2ee9e85c..9ed501d1 100644
--- a/test/unittest/translators/tst.StructureAssignment.d
+++ b/test/unittest/translators/tst.StructureAssignment.d
@@ -30,7 +30,7 @@ struct output_struct {
translator struct output_struct < struct input_struct ivar >
{
- oi = ((struct input_struct) ivar).ii;
+ oi = ((struct input_struct)ivar).ii;
};
struct output_struct out;
diff --git a/test/unittest/translators/tst.TransNonPointer.d b/test/unittest/translators/tst.TransNonPointer.d
index dbebc749..34be6189 100644
--- a/test/unittest/translators/tst.TransNonPointer.d
+++ b/test/unittest/translators/tst.TransNonPointer.d
@@ -29,8 +29,8 @@ struct myoutput_struct {
translator struct myoutput_struct < struct myinput_struct ivar >
{
- myi = ((struct myinput_struct ) ivar).i;
- myc = ((struct myinput_struct ) ivar).c;
+ myi = ((struct myinput_struct)ivar).i;
+ myc = ((struct myinput_struct)ivar).c;
};
diff --git a/test/unittest/translators/tst.TransOutputPointer.d b/test/unittest/translators/tst.TransOutputPointer.d
index 354040d6..2ad03d2e 100644
--- a/test/unittest/translators/tst.TransOutputPointer.d
+++ b/test/unittest/translators/tst.TransOutputPointer.d
@@ -29,8 +29,8 @@ struct myoutput_struct {
translator struct myoutput_struct < struct myinput_struct ivar >
{
- myi = ((struct myinput_struct ) ivar).i;
- myc = ((struct myinput_struct ) ivar).c;
+ myi = ((struct myinput_struct)ivar).i;
+ myc = ((struct myinput_struct)ivar).c;
};
diff --git a/test/unittest/translators/tst.TransPointer.d b/test/unittest/translators/tst.TransPointer.d
index e4485dab..df8f0e49 100644
--- a/test/unittest/translators/tst.TransPointer.d
+++ b/test/unittest/translators/tst.TransPointer.d
@@ -28,8 +28,8 @@ struct myoutput_struct {
translator struct myoutput_struct < struct myinput_struct *ivar >
{
- myi = ((struct myinput_struct *) ivar)->i;
- myc = ((struct myinput_struct *) ivar)->c;
+ myi = ((struct myinput_struct *)ivar)->i;
+ myc = ((struct myinput_struct *)ivar)->c;
};
diff --git a/test/unittest/translators/tst.TranslateSelf.d b/test/unittest/translators/tst.TranslateSelf.d
index 12823377..e89fb169 100644
--- a/test/unittest/translators/tst.TranslateSelf.d
+++ b/test/unittest/translators/tst.TranslateSelf.d
@@ -25,8 +25,8 @@ struct output_struct {
translator struct output_struct < struct output_struct uvar >
{
- myi = ((struct output_struct ) uvar).myi;
- myc = ((struct output_struct ) uvar).myc;
+ myi = ((struct output_struct)uvar).myi;
+ myc = ((struct output_struct)uvar).myc;
};
struct output_struct out;
diff --git a/test/unittest/translators/tst.UnionInputTrans.d b/test/unittest/translators/tst.UnionInputTrans.d
index 91806f6f..977384fa 100644
--- a/test/unittest/translators/tst.UnionInputTrans.d
+++ b/test/unittest/translators/tst.UnionInputTrans.d
@@ -28,8 +28,8 @@ struct output_struct {
translator struct output_struct < union input_union *ivar >
{
- myi = ((union input_union *) ivar)->i;
- myc = ((union input_union *) ivar)->c;
+ myi = ((union input_union *)ivar)->i;
+ myc = ((union input_union *)ivar)->c;
};
diff --git a/test/unittest/translators/tst.UnionOutputTrans.d b/test/unittest/translators/tst.UnionOutputTrans.d
index 2aa54cf8..20b33a0f 100644
--- a/test/unittest/translators/tst.UnionOutputTrans.d
+++ b/test/unittest/translators/tst.UnionOutputTrans.d
@@ -28,8 +28,8 @@ union output_union {
translator union output_union < struct input_struct *ivar >
{
- oi = ((struct input_struct *) ivar)->ii;
- oc = ((struct input_struct *) ivar)->ic;
+ oi = ((struct input_struct *)ivar)->ii;
+ oc = ((struct input_struct *)ivar)->ic;
};
diff --git a/test/unittest/types/tst.basics.d b/test/unittest/types/tst.basics.d
index 0ab2993d..cb469d72 100644
--- a/test/unittest/types/tst.basics.d
+++ b/test/unittest/types/tst.basics.d
@@ -18,21 +18,20 @@
BEGIN
{
- printf("\nsizeof (char) = %u\n", sizeof (char));
- printf("sizeof (signed char) = %u\n", sizeof (signed char));
- printf("sizeof (unsigned char) = %u\n", sizeof (unsigned char));
- printf("sizeof (short) = %u\n", sizeof (short));
- printf("sizeof (signed short) = %u\n", sizeof (signed short));
- printf("sizeof (unsigned short) = %u\n", sizeof (unsigned short));
- printf("sizeof (int) = %u\n", sizeof (int));
- printf("sizeof (signed int) = %u\n", sizeof (signed int));
- printf("sizeof (unsigned int) = %u\n", sizeof (unsigned int));
- printf("sizeof (long long) = %u\n", sizeof (long long));
- printf("sizeof (signed long long) = %u\n", sizeof (signed long long));
- printf("sizeof (unsigned long long) = %u\n",
- sizeof (unsigned long long));
- printf("sizeof (float) = %u\n", sizeof (float));
- printf("sizeof (double) = %u\n", sizeof (double));
+ printf("\nsizeof(char) = %u\n", sizeof(char));
+ printf("sizeof(signed char) = %u\n", sizeof(signed char));
+ printf("sizeof(unsigned char) = %u\n", sizeof(unsigned char));
+ printf("sizeof(short) = %u\n", sizeof(short));
+ printf("sizeof(signed short) = %u\n", sizeof(signed short));
+ printf("sizeof(unsigned short) = %u\n", sizeof(unsigned short));
+ printf("sizeof(int) = %u\n", sizeof(int));
+ printf("sizeof(signed int) = %u\n", sizeof(signed int));
+ printf("sizeof(unsigned int) = %u\n", sizeof(unsigned int));
+ printf("sizeof(long long) = %u\n", sizeof(long long));
+ printf("sizeof(signed long long) = %u\n", sizeof(signed long long));
+ printf("sizeof(unsigned long long) = %u\n", sizeof(unsigned long long));
+ printf("sizeof(float) = %u\n", sizeof(float));
+ printf("sizeof(double) = %u\n", sizeof(double));
exit(0);
}
diff --git a/test/unittest/types/tst.basics.r b/test/unittest/types/tst.basics.r
index fd05217f..d4fd680c 100644
--- a/test/unittest/types/tst.basics.r
+++ b/test/unittest/types/tst.basics.r
@@ -1,16 +1,16 @@
-sizeof (char) = 1
-sizeof (signed char) = 1
-sizeof (unsigned char) = 1
-sizeof (short) = 2
-sizeof (signed short) = 2
-sizeof (unsigned short) = 2
-sizeof (int) = 4
-sizeof (signed int) = 4
-sizeof (unsigned int) = 4
-sizeof (long long) = 8
-sizeof (signed long long) = 8
-sizeof (unsigned long long) = 8
-sizeof (float) = 4
-sizeof (double) = 8
+sizeof(char) = 1
+sizeof(signed char) = 1
+sizeof(unsigned char) = 1
+sizeof(short) = 2
+sizeof(signed short) = 2
+sizeof(unsigned short) = 2
+sizeof(int) = 4
+sizeof(signed int) = 4
+sizeof(unsigned int) = 4
+sizeof(long long) = 8
+sizeof(signed long long) = 8
+sizeof(unsigned long long) = 8
+sizeof(float) = 4
+sizeof(double) = 8
diff --git a/test/unittest/types/tst.complex.d b/test/unittest/types/tst.complex.d
index f4848d6c..a1435185 100644
--- a/test/unittest/types/tst.complex.d
+++ b/test/unittest/types/tst.complex.d
@@ -46,6 +46,6 @@ struct s {
BEGIN
{
- tracemem(curthread, sizeof (struct s));
+ tracemem(curthread, sizeof(struct s));
exit(0);
}
diff --git a/test/unittest/types/tst.intops.d b/test/unittest/types/tst.intops.d
index 7d8ca14f..9f0f51bb 100644
--- a/test/unittest/types/tst.intops.d
+++ b/test/unittest/types/tst.intops.d
@@ -29,7 +29,7 @@ tick-1
{
printf("Shouldn't end up here (1)\n");
printf("int_1 = %x int_2 = %x int_3 = %x\n",
- (int) int_1, (int) int_2, (int) int_3);
+ (int)int_1, (int)int_2, (int)int_3);
exit(1);
}
@@ -38,7 +38,7 @@ tick-1
{
printf("Shouldn't end up here (2)\n");
printf("int_1 = %x int_2 = %x int_3 = %x\n",
- (int) int_1, (int) int_2, (int) int_3);
+ (int)int_1, (int)int_2, (int)int_3);
exit(1);
}
diff --git a/test/unittest/types/tst.inttypes.d b/test/unittest/types/tst.inttypes.d
index 8cb9cc9a..5afbe1af 100644
--- a/test/unittest/types/tst.inttypes.d
+++ b/test/unittest/types/tst.inttypes.d
@@ -14,16 +14,16 @@
BEGIN
{
- printf("sizeof (int8_t) = %u\n", sizeof (int8_t));
- printf("sizeof (int16_t) = %u\n", sizeof (int16_t));
- printf("sizeof (int32_t) = %u\n", sizeof (int32_t));
- printf("sizeof (int64_t) = %u\n", sizeof (int64_t));
- printf("sizeof (intptr_t) = %u\n", sizeof (intptr_t));
- printf("sizeof (uint8_t) = %u\n", sizeof (uint8_t));
- printf("sizeof (uint16_t) = %u\n", sizeof (uint16_t));
- printf("sizeof (uint32_t) = %u\n", sizeof (uint32_t));
- printf("sizeof (uint64_t) = %u\n", sizeof (uint64_t));
- printf("sizeof (uintptr_t) = %u\n", sizeof (uintptr_t));
+ printf("sizeof(int8_t) = %u\n", sizeof(int8_t));
+ printf("sizeof(int16_t) = %u\n", sizeof(int16_t));
+ printf("sizeof(int32_t) = %u\n", sizeof(int32_t));
+ printf("sizeof(int64_t) = %u\n", sizeof(int64_t));
+ printf("sizeof(intptr_t) = %u\n", sizeof(intptr_t));
+ printf("sizeof(uint8_t) = %u\n", sizeof(uint8_t));
+ printf("sizeof(uint16_t) = %u\n", sizeof(uint16_t));
+ printf("sizeof(uint32_t) = %u\n", sizeof(uint32_t));
+ printf("sizeof(uint64_t) = %u\n", sizeof(uint64_t));
+ printf("sizeof(uintptr_t) = %u\n", sizeof(uintptr_t));
exit(0);
}
diff --git a/test/unittest/types/tst.inttypes.r b/test/unittest/types/tst.inttypes.r
index cfcca90d..6d9a8974 100644
--- a/test/unittest/types/tst.inttypes.r
+++ b/test/unittest/types/tst.inttypes.r
@@ -1,14 +1,14 @@
FUNCTION:NAME
- :BEGIN sizeof (int8_t) = 1
-sizeof (int16_t) = 2
-sizeof (int32_t) = 4
-sizeof (int64_t) = 8
-sizeof (intptr_t) = 8
-sizeof (uint8_t) = 1
-sizeof (uint16_t) = 2
-sizeof (uint32_t) = 4
-sizeof (uint64_t) = 8
-sizeof (uintptr_t) = 8
+ :BEGIN sizeof(int8_t) = 1
+sizeof(int16_t) = 2
+sizeof(int32_t) = 4
+sizeof(int64_t) = 8
+sizeof(intptr_t) = 8
+sizeof(uint8_t) = 1
+sizeof(uint16_t) = 2
+sizeof(uint32_t) = 4
+sizeof(uint64_t) = 8
+sizeof(uintptr_t) = 8
-- @@stderr --
diff --git a/test/unittest/types/tst.ptrops.d b/test/unittest/types/tst.ptrops.d
index d6779c7b..34da22ee 100644
--- a/test/unittest/types/tst.ptrops.d
+++ b/test/unittest/types/tst.ptrops.d
@@ -30,7 +30,7 @@ tick-1
{
printf("Shouldn't end up here (1)\n");
printf("ptr_1 = %x ptr_2 = %x ptr_3 = %x\n",
- (int) ptr_1, (int) ptr_2, (int) ptr_3);
+ (int)ptr_1, (int)ptr_2, (int)ptr_3);
exit(1);
}
@@ -39,7 +39,7 @@ tick-1
{
printf("Shouldn't end up here (2)\n");
printf("ptr_1 = %x ptr_2 = %x ptr_3 = %x\n",
- (int) ptr_1, (int) ptr_2, (int) ptr_3);
+ (int)ptr_1, (int)ptr_2, (int)ptr_3);
exit(1);
}
diff --git a/test/unittest/types/tst.struct.d b/test/unittest/types/tst.struct.d
index da63ee13..627a8585 100644
--- a/test/unittest/types/tst.struct.d
+++ b/test/unittest/types/tst.struct.d
@@ -41,7 +41,7 @@ struct dqstr {
BEGIN
{
s = (struct D`dqstr *)alloca(sizeof(struct D`dqstr));
- bcopy(&curthread->fs->root.dentry->d_name, s, sizeof (struct D`dqstr));
+ bcopy(&curthread->fs->root.dentry->d_name, s, sizeof(struct D`dqstr));
printf("hash = %d\n", s->hash);
printf("len = %d\n", s->len);
diff --git a/test/unittest/types/tst.typedef.d b/test/unittest/types/tst.typedef.d
index b9bcbca6..744c93c2 100644
--- a/test/unittest/types/tst.typedef.d
+++ b/test/unittest/types/tst.typedef.d
@@ -41,7 +41,7 @@ typedef struct dqstr {
BEGIN
{
s = (D`dqstr_t *)alloca(sizeof(D`dqstr_t));
- bcopy(&curthread->fs->root.dentry->d_name, s, sizeof (D`dqstr_t));
+ bcopy(&curthread->fs->root.dentry->d_name, s, sizeof(D`dqstr_t));
printf("hash = %d\n", s->hash);
printf("len = %d\n", s->len);
diff --git a/test/unittest/usdt/tst.dlclose1.sh b/test/unittest/usdt/tst.dlclose1.sh
index ddd4044e..017bff43 100755
--- a/test/unittest/usdt/tst.dlclose1.sh
+++ b/test/unittest/usdt/tst.dlclose1.sh
@@ -97,14 +97,14 @@ main(int argc, char **argv)
if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
printf("dlopen of livelib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
- (void) dlclose(live);
+ dlclose(live);
pause();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.dlclose2.sh b/test/unittest/usdt/tst.dlclose2.sh
index ac90aeea..0ee868fa 100755
--- a/test/unittest/usdt/tst.dlclose2.sh
+++ b/test/unittest/usdt/tst.dlclose2.sh
@@ -94,29 +94,29 @@ main(int argc, char **argv)
if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
printf("dlopen of livelib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
- (void) dlclose(live);
+ dlclose(live);
if ((dead = dlopen("./deadlib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
printf("dlopen of deadlib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
printf("dlopen of livelib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
if ((go = dlsym(live, "go")) == NULL) {
printf("failed to lookup 'go' in livelib.so\n");
- return (1);
+ return 1;
}
((void (*)(void))go)();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.dlclose3.sh b/test/unittest/usdt/tst.dlclose3.sh
index 97ad290c..e206d216 100755
--- a/test/unittest/usdt/tst.dlclose3.sh
+++ b/test/unittest/usdt/tst.dlclose3.sh
@@ -93,7 +93,7 @@ cat > main.c <<EOF
static void
foo(void)
{
- (void) close(-1);
+ close(-1);
}
int
@@ -103,14 +103,14 @@ main(int argc, char **argv)
if ((live = dlopen("./livelib.so", RTLD_LAZY | RTLD_LOCAL)) == NULL) {
printf("dlopen of livelib.so failed: %s\n", dlerror());
- return (1);
+ return 1;
}
- (void) dlclose(live);
+ dlclose(live);
foo();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.eliminate.sh b/test/unittest/usdt/tst.eliminate.sh
index 5c89bae7..4dbd5284 100755
--- a/test/unittest/usdt/tst.eliminate.sh
+++ b/test/unittest/usdt/tst.eliminate.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
# @@xfail: Linux ld does not seem to supoprt STV_ELIMINATE
@@ -50,7 +50,7 @@ main(int argc, char **argv)
{
foo();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.enabled2.sh b/test/unittest/usdt/tst.enabled2.sh
index 032c26ab..da7233a7 100755
--- a/test/unittest/usdt/tst.enabled2.sh
+++ b/test/unittest/usdt/tst.enabled2.sh
@@ -43,7 +43,7 @@ cat > test.c <<EOF
int
foo(void)
{
- return (24);
+ return 24;
}
int
@@ -53,9 +53,9 @@ main(int argc, char **argv)
if (TEST_PROV_GO_ENABLED()) {
TEST_PROV_GO();
}
- (void) printf("%d %d %d\n", a, a, a);
+ printf("%d %d %d\n", a, a, a);
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.fork.sh b/test/unittest/usdt/tst.fork.sh
index 4c3c2064..7c99ecc1 100755
--- a/test/unittest/usdt/tst.fork.sh
+++ b/test/unittest/usdt/tst.fork.sh
@@ -43,13 +43,13 @@ main(int argc, char **argv)
TEST_PROV_GO();
if (fork() == 0) {
TEST_PROV_GO();
- return (0);
+ return 0;
}
- (void) wait(NULL);
+ wait(NULL);
TEST_PROV_GO();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.multiple.sh b/test/unittest/usdt/tst.multiple.sh
index 524397e2..28a3fcd8 100755
--- a/test/unittest/usdt/tst.multiple.sh
+++ b/test/unittest/usdt/tst.multiple.sh
@@ -43,7 +43,7 @@ main(int argc, char **argv)
TEST_PROV_GO();
TEST_PROV_GO();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.onlyenabled.sh b/test/unittest/usdt/tst.onlyenabled.sh
index c46fd264..a469fac1 100755
--- a/test/unittest/usdt/tst.onlyenabled.sh
+++ b/test/unittest/usdt/tst.onlyenabled.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -38,9 +38,9 @@ int
main(int argc, char **argv)
{
if (TEST_PROV_GO_ENABLED())
- return (2);
+ return 2;
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/usdt/tst.user.sh b/test/unittest/usdt/tst.user.sh
index c6c360f4..fc916f50 100755
--- a/test/unittest/usdt/tst.user.sh
+++ b/test/unittest/usdt/tst.user.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -41,7 +41,7 @@ main(int argc, char **argv)
{
TEST_PROV_GO();
- return (0);
+ return 0;
}
EOF
diff --git a/test/unittest/ustack/tst.frames.sh b/test/unittest/ustack/tst.frames.sh
index 28c547fe..968ab57d 100755
--- a/test/unittest/ustack/tst.frames.sh
+++ b/test/unittest/ustack/tst.frames.sh
@@ -29,67 +29,67 @@ int fooz() {
}
/* have a relatively deep stack; prevent tail calls */
-int fooy() { return (fooz() ^ 1); }
-int foox() { return (fooy() ^ 1); }
-int foow() { return (foox() ^ 1); }
-int foov() { return (foow() ^ 1); }
-int foou() { return (foov() ^ 1); }
-int foot() { return (foou() ^ 1); }
-int foos() { return (foot() ^ 1); }
-int foor() { return (foos() ^ 1); }
-int fooq() { return (foor() ^ 1); }
-int foop() { return (fooq() ^ 1); }
-int fooo() { return (foop() ^ 1); }
-int foon() { return (fooo() ^ 1); }
-int foom() { return (foon() ^ 1); }
-int fool() { return (foom() ^ 1); }
-int fook() { return (fool() ^ 1); }
-int fooj() { return (fook() ^ 1); }
-int fooi() { return (fooj() ^ 1); }
-int fooh() { return (fooi() ^ 1); }
-int foog() { return (fooh() ^ 1); }
-int foof() { return (foog() ^ 1); }
-int fooe() { return (foof() ^ 1); }
-int food() { return (fooe() ^ 1); }
-int fooc() { return (food() ^ 1); }
-int foob() { return (fooc() ^ 1); }
-int fooa() { return (foob() ^ 1); }
-int fooZ() { return (fooa() ^ 1); }
-int fooY() { return (fooZ() ^ 1); }
-int fooX() { return (fooY() ^ 1); }
-int fooW() { return (fooX() ^ 1); }
-int fooV() { return (fooW() ^ 1); }
-int fooU() { return (fooV() ^ 1); }
-int fooT() { return (fooU() ^ 1); }
-int fooS() { return (fooT() ^ 1); }
-int fooR() { return (fooS() ^ 1); }
-int fooQ() { return (fooR() ^ 1); }
-int fooP() { return (fooQ() ^ 1); }
-int fooO() { return (fooP() ^ 1); }
-int fooN() { return (fooO() ^ 1); }
-int fooM() { return (fooN() ^ 1); }
-int fooL() { return (fooM() ^ 1); }
-int fooK() { return (fooL() ^ 1); }
-int fooJ() { return (fooK() ^ 1); }
-int fooI() { return (fooJ() ^ 1); }
-int fooH() { return (fooI() ^ 1); }
-int fooG() { return (fooH() ^ 1); }
-int fooF() { return (fooG() ^ 1); }
-int fooE() { return (fooF() ^ 1); }
-int fooD() { return (fooE() ^ 1); }
-int fooC() { return (fooD() ^ 1); }
-int fooB() { return (fooC() ^ 1); }
-int fooA() { return (fooB() ^ 1); }
-int foo9() { return (fooA() ^ 1); }
-int foo8() { return (foo9() ^ 1); }
-int foo7() { return (foo8() ^ 1); }
-int foo6() { return (foo7() ^ 1); }
-int foo5() { return (foo6() ^ 1); }
-int foo4() { return (foo5() ^ 1); }
-int foo3() { return (foo4() ^ 1); }
-int foo2() { return (foo3() ^ 1); }
-int foo1() { return (foo2() ^ 1); }
-int foo0() { return (foo1() ^ 1); }
+int fooy() { return fooz() ^ 1; }
+int foox() { return fooy() ^ 1; }
+int foow() { return foox() ^ 1; }
+int foov() { return foow() ^ 1; }
+int foou() { return foov() ^ 1; }
+int foot() { return foou() ^ 1; }
+int foos() { return foot() ^ 1; }
+int foor() { return foos() ^ 1; }
+int fooq() { return foor() ^ 1; }
+int foop() { return fooq() ^ 1; }
+int fooo() { return foop() ^ 1; }
+int foon() { return fooo() ^ 1; }
+int foom() { return foon() ^ 1; }
+int fool() { return foom() ^ 1; }
+int fook() { return fool() ^ 1; }
+int fooj() { return fook() ^ 1; }
+int fooi() { return fooj() ^ 1; }
+int fooh() { return fooi() ^ 1; }
+int foog() { return fooh() ^ 1; }
+int foof() { return foog() ^ 1; }
+int fooe() { return foof() ^ 1; }
+int food() { return fooe() ^ 1; }
+int fooc() { return food() ^ 1; }
+int foob() { return fooc() ^ 1; }
+int fooa() { return foob() ^ 1; }
+int fooZ() { return fooa() ^ 1; }
+int fooY() { return fooZ() ^ 1; }
+int fooX() { return fooY() ^ 1; }
+int fooW() { return fooX() ^ 1; }
+int fooV() { return fooW() ^ 1; }
+int fooU() { return fooV() ^ 1; }
+int fooT() { return fooU() ^ 1; }
+int fooS() { return fooT() ^ 1; }
+int fooR() { return fooS() ^ 1; }
+int fooQ() { return fooR() ^ 1; }
+int fooP() { return fooQ() ^ 1; }
+int fooO() { return fooP() ^ 1; }
+int fooN() { return fooO() ^ 1; }
+int fooM() { return fooN() ^ 1; }
+int fooL() { return fooM() ^ 1; }
+int fooK() { return fooL() ^ 1; }
+int fooJ() { return fooK() ^ 1; }
+int fooI() { return fooJ() ^ 1; }
+int fooH() { return fooI() ^ 1; }
+int fooG() { return fooH() ^ 1; }
+int fooF() { return fooG() ^ 1; }
+int fooE() { return fooF() ^ 1; }
+int fooD() { return fooE() ^ 1; }
+int fooC() { return fooD() ^ 1; }
+int fooB() { return fooC() ^ 1; }
+int fooA() { return fooB() ^ 1; }
+int foo9() { return fooA() ^ 1; }
+int foo8() { return foo9() ^ 1; }
+int foo7() { return foo8() ^ 1; }
+int foo6() { return foo7() ^ 1; }
+int foo5() { return foo6() ^ 1; }
+int foo4() { return foo5() ^ 1; }
+int foo3() { return foo4() ^ 1; }
+int foo2() { return foo3() ^ 1; }
+int foo1() { return foo2() ^ 1; }
+int foo0() { return foo1() ^ 1; }
/* sleep so frames can be resolved before process exits */
int main(int c, char **v) {
diff --git a/test/utils/baddof.c b/test/utils/baddof.c
index ef745fcf..5f844625 100644
--- a/test/utils/baddof.c
+++ b/test/utils/baddof.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -187,5 +187,5 @@ main(int argc, char **argv)
}
/* NOTREACHED */
- return (0);
+ return 0;
}
diff --git a/test/utils/badioctl.c b/test/utils/badioctl.c
index 68852df2..8a5c286c 100644
--- a/test/utils/badioctl.c
+++ b/test/utils/badioctl.c
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -88,7 +88,7 @@ badioctl(pid_t parent)
read(random, addr, ps);
}
- read(random, &ioc, sizeof (ioc));
+ read(random, &ioc, sizeof(ioc));
ioc %= DTRACEIOC_MAX;
ioc++;
ioctl(fd, DTRACEIOC | ioc, addr);
@@ -125,5 +125,5 @@ main()
}
/* NOTREACHED */
- return (0);
+ return 0;
}
--
2.18.4
More information about the DTrace-devel
mailing list