summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tapset/ChangeLog2
-rw-r--r--tapset/context.stp11
2 files changed, 5 insertions, 8 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 57380ea6..f30af435 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,6 +1,6 @@
2006-05-09 Josh Stone <joshua.i.stone@intel.com>
- * context.stp (probefunc): define our own exit label
+ * context.stp (probefunc): remove use of labels
2006-05-08 Josh Stone <joshua.i.stone@intel.com>
diff --git a/tapset/context.stp b/tapset/context.stp
index a97d6f13..00629900 100644
--- a/tapset/context.stp
+++ b/tapset/context.stp
@@ -104,9 +104,7 @@ function probefunc:string () %{ /* pure */
while (*ptr != '@' && --len > 0 && *ptr)
*dst++ = *ptr++;
*dst = 0;
- goto done;
- }
- if (CONTEXT->regs) {
+ } else if (CONTEXT->regs) {
str = _stp_string_init (0);
_stp_symbol_sprint(str, REG_IP(CONTEXT->regs));
start = strstr(_stp_string_ptr(str), " : ");
@@ -120,10 +118,9 @@ function probefunc:string () %{ /* pure */
else {
strlcpy(THIS->__retvalue, _stp_string_ptr(str),MAXSTRINGLEN);
}
- goto done;
- }
- THIS->__retvalue[0] = '\0';
-done: ;
+ } else {
+ THIS->__retvalue[0] = '\0';
+ }
%}
function is_return:long () %{ /* pure */