[PATCH 7/8] Clean up double semicolons

eugene.loh
2024-06-04T18:00:36Z

From: Eugene Loh <eugene.loh@oracle.com>

Signed-off-by: Eugene Loh <eugene.loh@oracle.com>
---
dtprobed/dtprobed.c | 2 +-
libdtrace/dt_cg.c | 2 +-
libdtrace/dt_probe.c | 4 ++--
libdtrace/dt_prov_fbt.c | 2 +-
libdtrace/dt_prov_lockstat.c | 4 ++--
libdtrace/dt_prov_profile.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dtprobed/dtprobed.c b/dtprobed/dtprobed.c
index bbdde35e..fdcdee14 100644
--- a/dtprobed/dtprobed.c
+++ b/dtprobed/dtprobed.c
@@ -516,7 +516,7 @@ helper_ioctl(fuse_req_t req, int cmd, void *arg,
gen = dof_stash_remove(pid, (uintptr_t) arg);
fuse_reply_ioctl(req, gen, NULL, 0);
return;
- default: errmsg = "invalid ioctl";;
+ default: errmsg = "invalid ioctl";
fuse_log(FUSE_LOG_WARNING, "%i: dtprobed: %s %x\n",
pid, errmsg, cmd);
goto fuse_err;
diff --git a/libdtrace/dt_cg.c b/libdtrace/dt_cg.c
index fc2cebf0..e166d2d8 100644
--- a/libdtrace/dt_cg.c
+++ b/libdtrace/dt_cg.c
@@ -6562,7 +6562,7 @@ dt_cg_subr_inet_ntop(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
{
dt_node_t *af = dnp->dn_args;
dt_node_t *addr = af->dn_list;
- dt_node_t *tnp, *cnp, *lnp, *rnp, *anp, *xnp;;
+ dt_node_t *tnp, *cnp, *lnp, *rnp, *anp, *xnp;
dt_idsig_t *isp;
dt_decl_t *ddp;

diff --git a/libdtrace/dt_probe.c b/libdtrace/dt_probe.c
index 4f8730b9..e1099d75 100644
--- a/libdtrace/dt_probe.c
+++ b/libdtrace/dt_probe.c
@@ -1345,7 +1345,7 @@ dt_probe_add_clause(dtrace_hdl_t *dtp, dt_probe_t *prp, dt_ident_t *idp)
{
dt_probe_clause_t *pcp;

- pcp = dt_zalloc(dtp, sizeof(dt_probe_clause_t));;
+ pcp = dt_zalloc(dtp, sizeof(dt_probe_clause_t));
if (pcp == NULL)
return dt_set_errno(dtp, EDT_NOMEM);

@@ -1395,7 +1395,7 @@ dt_probe_add_dependent(dtrace_hdl_t *dtp, dt_probe_t *prp, dt_probe_t *dprp)
return 0;
}

- pdp = dt_zalloc(dtp, sizeof(dt_probe_dependent_t));;
+ pdp = dt_zalloc(dtp, sizeof(dt_probe_dependent_t));
if (pdp == NULL)
return dt_set_errno(dtp, EDT_NOMEM);

diff --git a/libdtrace/dt_prov_fbt.c b/libdtrace/dt_prov_fbt.c
index fa888ed8..f9d81d9a 100644
--- a/libdtrace/dt_prov_fbt.c
+++ b/libdtrace/dt_prov_fbt.c
@@ -367,7 +367,7 @@ static int kprobe_attach(dtrace_hdl_t *dtp, const dt_probe_t *prp, int bpf_fd)
EVENTSFS, FBT_GROUP_DATA, prp->desc->fun) + 1;
fn = dt_alloc(dtp, len);
if (fn == NULL)
- return -ENOENT;;
+ return -ENOENT;

snprintf(fn, len, "%s" FBT_GROUP_FMT "/%s/format", EVENTSFS,
FBT_GROUP_DATA, prp->desc->fun);
diff --git a/libdtrace/dt_prov_lockstat.c b/libdtrace/dt_prov_lockstat.c
index e98287ca..c73edf9b 100644
--- a/libdtrace/dt_prov_lockstat.c
+++ b/libdtrace/dt_prov_lockstat.c
@@ -288,7 +288,7 @@ static int trampoline(dt_pcb_t *pcb, uint_t exitlbl)
return 1;
} else {
int kind = 1; /* reader (default) */
- uint_t lbl_reset = dt_irlist_label(dlp);;
+ uint_t lbl_reset = dt_irlist_label(dlp);

if (strstr(uprp->desc->fun, "_write_") != NULL)
kind = 0; /* writer */
@@ -337,7 +337,7 @@ static int trampoline(dt_pcb_t *pcb, uint_t exitlbl)
copy_lockaddr_into_cpuinfo(dlp, 0);
return 1;
} else {
- uint_t lbl_reset = dt_irlist_label(dlp);;
+ uint_t lbl_reset = dt_irlist_label(dlp);

if (strstr(uprp->desc->fun, "_trylock") != NULL) {
/* The return value (arg1) must be 1. */
diff --git a/libdtrace/dt_prov_profile.c b/libdtrace/dt_prov_profile.c
index 86fc03cb..bc224348 100644
--- a/libdtrace/dt_prov_profile.c
+++ b/libdtrace/dt_prov_profile.c
@@ -261,7 +261,7 @@ static int attach(dtrace_hdl_t *dtp, const dt_probe_t *prp, int bpf_fd)
{
profile_probe_t *pp = prp->prv_data;
struct perf_event_attr attr;
- int i, nattach = 0;;
+ int i, nattach = 0;
int cnt = FDS_CNT(pp->kind);

memset(&attr, 0, sizeof(attr));
--
2.18.4