summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2021-09-02 17:21:40 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2021-09-02 17:21:40 +0000
commitf0ae9b4b30750ae1fc455e0dc27eb609c4da3f5d (patch)
tree1989e0fdee5b44f75812855308a4b4a64c4a94cc /usr.sbin
parent7e6db7a96d62719d55ea260c3c5da088a8c145f6 (diff)
rename struct dt_evt fields to make it clear this isn't only used for tracing syscalls
and adjust btrace(8) accordingly. extracted from a larger diff by Tom Rollet. ok mpi@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/btrace/btrace.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/btrace/btrace.c b/usr.sbin/btrace/btrace.c
index 5eca405bcfc..b4bb8864e07 100644
--- a/usr.sbin/btrace/btrace.c
+++ b/usr.sbin/btrace/btrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: btrace.c,v 1.45 2021/09/01 13:21:24 mpi Exp $ */
+/* $OpenBSD: btrace.c,v 1.46 2021/09/02 17:21:39 jasper Exp $ */
/*
* Copyright (c) 2019 - 2021 Martin Pieuchot <mpi@openbsd.org>
@@ -653,7 +653,7 @@ builtin_arg(struct dt_evt *dtev, enum bt_argtype dat)
static char buf[sizeof("18446744073709551615")]; /* UINT64_MAX */
snprintf(buf, sizeof(buf), "%lu",
- dtev->dtev_sysargs[dat - B_AT_BI_ARG0]);
+ dtev->dtev_args[dat - B_AT_BI_ARG0]);
return buf;
}
@@ -882,7 +882,7 @@ stmt_store(struct bt_stmt *bs, struct dt_evt *dtev)
xabort("store not implemented for type %d", ba->ba_type);
}
- debug("bv=%p var '%s' store (%p) \n", bv, bv_name(bv), bv->bv_value);
+ debug("bv=%p var '%s' store (%p)\n", bv, bv_name(bv), bv->bv_value);
}
/*
@@ -1268,10 +1268,10 @@ ba2long(struct bt_arg *ba, struct dt_evt *dtev)
val = builtin_nsecs(dtev);
break;
case B_AT_BI_ARG0 ... B_AT_BI_ARG9:
- val = dtev->dtev_sysargs[ba->ba_type - B_AT_BI_ARG0];
+ val = dtev->dtev_args[ba->ba_type - B_AT_BI_ARG0];
break;
case B_AT_BI_RETVAL:
- val = dtev->dtev_sysretval[0];
+ val = dtev->dtev_retval[0];
break;
case B_AT_OP_PLUS ... B_AT_OP_LOR:
val = baexpr2long(ba, dtev);
@@ -1331,7 +1331,7 @@ ba2str(struct bt_arg *ba, struct dt_evt *dtev)
str = builtin_arg(dtev, ba->ba_type);
break;
case B_AT_BI_RETVAL:
- snprintf(buf, sizeof(buf), "%ld", (long)dtev->dtev_sysretval[0]);
+ snprintf(buf, sizeof(buf), "%ld", (long)dtev->dtev_retval[0]);
str = buf;
break;
case B_AT_MAP: