From d09fee573204cf53ae20ed3e669588575508b856 Mon Sep 17 00:00:00 2001
From: dsmith <dsmith>
Date: Thu, 29 Nov 2007 15:44:13 +0000
Subject: 2007-11-29  David Smith  <dsmith@redhat.com>

	* tapsets.cxx (mark_derived_probe::initialize_probe_context_vars):
	Handles the case where one marker has more than one string
	argument.
---
 tapsets.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tapsets.cxx')

diff --git a/tapsets.cxx b/tapsets.cxx
index 3b992d4d..35fe1e4b 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -5290,6 +5290,7 @@ mark_derived_probe::initialize_probe_context_vars (translator_output* o)
   if (! target_symbol_seen)
     return;
 
+  bool deref_fault_needed = false;
   for (unsigned i = 0; i < mark_args.size(); i++)
     {
       string localname = "l->__mark_arg" + lex_cast<string>(i+1);
@@ -5307,9 +5308,8 @@ mark_derived_probe::initialize_probe_context_vars (translator_output* o)
 		       << " tmp_str = va_arg(*c->mark_va_list, "
 		       << mark_args[i]->c_type << ");";
 	  o->newline() << "deref_string (" << localname
-		       << ", tmp_str, MAXSTRINGLEN);";
-	  // Need to report errors?
-	  o->newline() << "deref_fault: ; }";
+		       << ", tmp_str, MAXSTRINGLEN); }";
+	  deref_fault_needed = true;
 	  break;
 
 	default:
@@ -5317,6 +5317,9 @@ mark_derived_probe::initialize_probe_context_vars (translator_output* o)
 	  break;
 	}
     }
+  if (deref_fault_needed)
+    // Need to report errors?
+    o->newline() << "deref_fault: ;";
 }
 
 
-- 
cgit