diff options
| author | Wenji Huang <wenji.huang@oracle.com> | 2009-10-14 10:26:03 +0800 |
|---|---|---|
| committer | Wenji Huang <wenji.huang@oracle.com> | 2009-10-14 10:26:03 +0800 |
| commit | 8c41e846e74026844d4b3e43778e53160f7dc27c (patch) | |
| tree | ba2daa7a5fef99d3275b1f47047fc5935fda32d5 /tapsets.cxx | |
| parent | 6928ee0a21a1832c9845c125b0998d45b801af81 (diff) | |
| parent | 1c1f1a255cd969934bb7ce1678f4a411337be6f9 (diff) | |
| download | systemtap-steved-8c41e846e74026844d4b3e43778e53160f7dc27c.tar.gz systemtap-steved-8c41e846e74026844d4b3e43778e53160f7dc27c.tar.xz systemtap-steved-8c41e846e74026844d4b3e43778e53160f7dc27c.zip | |
Merge branch 'master' of ssh://wenji@sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 5182bdd4..ba6f4ee4 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -2135,7 +2135,6 @@ dwarf_var_expanding_visitor::visit_target_symbol_context (target_symbol* e) return; target_symbol *tsym = new target_symbol; - print_format* pf = new print_format; // Convert $$parms to sprintf of a list of parms and active local vars // which we recursively evaluate @@ -2148,12 +2147,7 @@ dwarf_var_expanding_visitor::visit_target_symbol_context (target_symbol* e) pf_tok->type = tok_identifier; pf_tok->content = "sprint"; - pf->tok = pf_tok; - pf->print_to_stream = false; - pf->print_with_format = true; - pf->print_with_delim = false; - pf->print_with_newline = false; - pf->print_char = false; + print_format* pf = print_format::create(pf_tok); if (q.has_return && (e->base_name == "$$return")) { @@ -5618,8 +5612,6 @@ tracepoint_var_expanding_visitor::visit_target_symbol_context (target_symbol* e) } else if (e->base_name == "$$vars" || e->base_name == "$$parms") { - print_format* pf = new print_format; - // Convert $$vars to sprintf of a list of vars which we recursively evaluate // NB: we synthesize a new token here rather than reusing // e->tok, because print_format::print likes to use @@ -5627,12 +5619,7 @@ tracepoint_var_expanding_visitor::visit_target_symbol_context (target_symbol* e) token* pf_tok = new token(*e->tok); pf_tok->content = "sprintf"; - pf->tok = pf_tok; - pf->print_to_stream = false; - pf->print_with_format = true; - pf->print_with_delim = false; - pf->print_with_newline = false; - pf->print_char = false; + print_format* pf = print_format::create(pf_tok); for (unsigned i = 0; i < args.size(); ++i) { |