summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-04-25 14:52:44 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-04-25 14:52:44 -0400
commit9f99b110fbee8a6935ca60c152cc3c7cd809461b (patch)
treee13eaa14af0205f482673aeada1c14f779ed6d48 /tapsets.cxx
parenteec2d7f43b36dff4460771576044fcc9f077d11d (diff)
parenta53c9645aeb7a97a122e161aaa4359152802d5f7 (diff)
downloadsystemtap-steved-9f99b110fbee8a6935ca60c152cc3c7cd809461b.tar.gz
systemtap-steved-9f99b110fbee8a6935ca60c152cc3c7cd809461b.tar.xz
systemtap-steved-9f99b110fbee8a6935ca60c152cc3c7cd809461b.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
* 'master' of ssh://sources.redhat.com/git/systemtap: Handles markers with no format string. Fixed task_finder.c kernel 2.6.25 change.
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index c0a090e2..23e85a0e 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -6488,6 +6488,11 @@ mark_builder::build(systemtap_session & sess,
string::size_type notwhite = format.find_first_not_of(" \t");
format.erase(0, notwhite);
+ // If the format is empty, make sure we add back a space
+ // character, which is what MARK_NOARGS expands to.
+ if (format.length() == 0)
+ format = " ";
+
if (sess.verbose>3)
clog << "'" << name << "' '" << module << "' '" << format
<< "'" << endl;