summaryrefslogtreecommitdiffstats
path: root/tapset
diff options
context:
space:
mode:
Diffstat (limited to 'tapset')
-rw-r--r--tapset/ChangeLog4
-rw-r--r--tapset/conversions.stp7
2 files changed, 5 insertions, 6 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index b213692f..1f8cd767 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -7,6 +7,10 @@
* nfsd.stp (__svc_fh): Added missing semicolon.
+2007-09-24 Frank Ch. Eigler <fche@elastic.org>
+
+ * conversions.stp (user_string): Redefine in terms of user_string2.
+
2007-09-23 Ulrich Drepper <drepper@redhat.com>
* syscalls2.stp (readlinkat): Add.
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,