summaryrefslogtreecommitdiffstats
path: root/tapset/conversions.stp
diff options
context:
space:
mode:
authorfche <fche>2007-09-24 18:13:48 +0000
committerfche <fche>2007-09-24 18:13:48 +0000
commitb8037bcbc882bad9bf1749c1272a8d927c6972a1 (patch)
treee9c26199b55e2f989ec32d8c1db43497072d5191 /tapset/conversions.stp
parent45aef9a3a9f50d2f7f128e8cc924f9aeafc8c634 (diff)
downloadsystemtap-steved-b8037bcbc882bad9bf1749c1272a8d927c6972a1.tar.gz
systemtap-steved-b8037bcbc882bad9bf1749c1272a8d927c6972a1.tar.xz
systemtap-steved-b8037bcbc882bad9bf1749c1272a8d927c6972a1.zip
* conversions.stp (user_string): Redefine in terms of user_string2.
Diffstat (limited to 'tapset/conversions.stp')
-rw-r--r--tapset/conversions.stp7
1 files changed, 1 insertions, 6 deletions
diff --git a/tapset/conversions.stp b/tapset/conversions.stp
index 3993c8ac..e894e4fa 100644
--- a/tapset/conversions.stp
+++ b/tapset/conversions.stp
@@ -64,12 +64,7 @@ deref_fault: /* branched to from deref() */
// On rare cases when userspace data is not accessible,
// this function returns "<unknown>"
-function user_string:string (addr:long) %{ /* pure */
- if (_stp_strncpy_from_user (THIS->__retvalue,
- (const char __user*) (uintptr_t) THIS->addr,
- MAXSTRINGLEN) < 0)
- strlcpy (THIS->__retvalue, "<unknown>", MAXSTRINGLEN);
-%}
+function user_string:string (addr:long) { return user_string2 (addr, "<unknown>") }
function user_string2:string (addr:long, err_msg:string) %{ /* pure */
if (_stp_strncpy_from_user (THIS->__retvalue,