summaryrefslogtreecommitdiffstats
path: root/parse.cxx
diff options
context:
space:
mode:
authorjistone <jistone>2006-03-03 18:37:33 +0000
committerjistone <jistone>2006-03-03 18:37:33 +0000
commit77a5c1f9949be4bdf3ebc6fb969debd68a9ebd27 (patch)
treefce8b8d79cbfc5f7dd416463bd5929a43446bdd4 /parse.cxx
parent4090de8ca2717fd028548f06783582b7c6c74931 (diff)
downloadsystemtap-steved-77a5c1f9949be4bdf3ebc6fb969debd68a9ebd27.tar.gz
systemtap-steved-77a5c1f9949be4bdf3ebc6fb969debd68a9ebd27.tar.xz
systemtap-steved-77a5c1f9949be4bdf3ebc6fb969debd68a9ebd27.zip
2006-03-03 Josh Stone <joshua.i.stone@intel.com>
* main.cxx (main): search forward for dashes in the kernel release, to work properly with release names with more than one dash. * parse.cxx (eval_pp_conditional): ditto * tapsets.cxx (profile_derived_probe::profile_derived_probe): ditto * safety/safety.py (StaticSafety::__build_search_suffixes): ditto, and add copyright & GPL tag
Diffstat (limited to 'parse.cxx')
-rw-r--r--parse.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/parse.cxx b/parse.cxx
index 04e01ebc..f7ea157b 100644
--- a/parse.cxx
+++ b/parse.cxx
@@ -1,5 +1,6 @@
// recursive descent parser for systemtap scripts
// Copyright (C) 2005-2006 Red Hat Inc.
+// Copyright (C) 2006 Intel Corporation.
//
// This file is part of systemtap, and is free software. You can
// redistribute it and/or modify it under the terms of the GNU General
@@ -154,7 +155,7 @@ bool eval_pp_conditional (systemtap_session& s,
string target_kernel_vr = s.kernel_release;
string target_kernel_v = target_kernel_vr;
// cut off any release code suffix
- string::size_type dr = target_kernel_vr.rfind ('-');
+ string::size_type dr = target_kernel_vr.find ('-');
if (dr > 0 && dr != string::npos)
target_kernel_v = target_kernel_vr.substr (0, dr);