From 77a5c1f9949be4bdf3ebc6fb969debd68a9ebd27 Mon Sep 17 00:00:00 2001 From: jistone Date: Fri, 3 Mar 2006 18:37:33 +0000 Subject: 2006-03-03 Josh Stone * 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 --- tapsets.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tapsets.cxx') diff --git a/tapsets.cxx b/tapsets.cxx index 2e2c933e..8337eff7 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -1,6 +1,6 @@ // tapset resolution // Copyright (C) 2005, 2006 Red Hat Inc. -// Copyright (C) 2005 Intel Corporation. +// Copyright (C) 2005, 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 @@ -3355,9 +3355,9 @@ profile_derived_probe::profile_derived_probe (systemtap_session &s, probe* p, pr string target_kernel_v; // cut off any release code suffix - string::size_type dash_rindex = s.kernel_release.rfind ('-'); - if (dash_rindex > 0 && dash_rindex != string::npos) - target_kernel_v = s.kernel_release.substr (0, dash_rindex); + string::size_type dash_index = s.kernel_release.find ('-'); + if (dash_index > 0 && dash_index != string::npos) + target_kernel_v = s.kernel_release.substr (0, dash_index); else target_kernel_v = s.kernel_release; -- cgit