aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-01-17 17:10:34 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-01-17 17:10:34 +0000
commit0907be07ef324e9eb14573f65481ad7168ec12f9 (patch)
tree18537584a0f14e83a946cee586455a4620b1e264
parent83cf7b602d9595658609cf621b823a6a5ed30e89 (diff)
downloadpaludis-0907be07ef324e9eb14573f65481ad7168ec12f9.tar.gz
paludis-0907be07ef324e9eb14573f65481ad7168ec12f9.tar.xz
Fix thread-safety.
-rw-r--r--paludis/repositories/e/qa/default_functions.cc16
-rw-r--r--paludis/repositories/e/qa/header.cc6
2 files changed, 11 insertions, 11 deletions
diff --git a/paludis/repositories/e/qa/default_functions.cc b/paludis/repositories/e/qa/default_functions.cc
index 5d4e802..aa654c9 100644
--- a/paludis/repositories/e/qa/default_functions.cc
+++ b/paludis/repositories/e/qa/default_functions.cc
@@ -46,14 +46,14 @@ paludis::erepository::default_functions_check(
{
Context context("When performing check '" + name + "' using default_functions on '" + stringify(*id) + "':");
- static pcrepp::Pcre::Pcre r_echo("^\\s*(echo|einfo|ewarn)[^|<>]*$");
- static pcrepp::Pcre::Pcre r_colon("^\\s*:");
- static pcrepp::Pcre::Pcre r_true("^\\s*true");
- static pcrepp::Pcre::Pcre r_comment("^\\s*#");
- static pcrepp::Pcre::Pcre r_econf("^\\s*econf( *\\|\\| *die.*)?$");
- static pcrepp::Pcre::Pcre r_emake("^\\s*emake( *\\|\\| *die.*)?$");
- static pcrepp::Pcre::Pcre r_unpack("^\\s*unpack *([$]A|[$][{]A[}]|\"[$][{]A[}]\"|[$][{]A[}])( *\\|\\| *die.*)?$");
- static pcrepp::Pcre::Pcre r_cd_s("^\\s*cd *([$]S|[$][{]S[}]|\"[$][{]S[}]\"|[$][{]S[}])( *\\|\\| *die.*)?$");
+ pcrepp::Pcre::Pcre r_echo("^\\s*(echo|einfo|ewarn)[^|<>]*$");
+ pcrepp::Pcre::Pcre r_colon("^\\s*:");
+ pcrepp::Pcre::Pcre r_true("^\\s*true");
+ pcrepp::Pcre::Pcre r_comment("^\\s*#");
+ pcrepp::Pcre::Pcre r_econf("^\\s*econf( *\\|\\| *die.*)?$");
+ pcrepp::Pcre::Pcre r_emake("^\\s*emake( *\\|\\| *die.*)?$");
+ pcrepp::Pcre::Pcre r_unpack("^\\s*unpack *([$]A|[$][{]A[}]|\"[$][{]A[}]\"|[$][{]A[}])( *\\|\\| *die.*)?$");
+ pcrepp::Pcre::Pcre r_cd_s("^\\s*cd *([$]S|[$][{]S[}]|\"[$][{]S[}]\"|[$][{]S[}])( *\\|\\| *die.*)?$");
Log::get_instance()->message(ll_debug, lc_context) << "default_functions '"
<< entry << "', '" << *id << "', '" << name << "'";
diff --git a/paludis/repositories/e/qa/header.cc b/paludis/repositories/e/qa/header.cc
index 3060b73..e337770 100644
--- a/paludis/repositories/e/qa/header.cc
+++ b/paludis/repositories/e/qa/header.cc
@@ -37,10 +37,10 @@ paludis::erepository::header_check(
{
Context context("When performing check '" + name + "' using default_functions on '" + stringify(*id) + "':");
- static pcrepp::Pcre::Pcre r_licence("^# Distributed under the terms of the GNU General Public License v2$");
+ pcrepp::Pcre::Pcre r_licence("^# Distributed under the terms of the GNU General Public License v2$");
// Match both CVS tag and extract year.[0]
- static pcrepp::Pcre::Pcre r_cvs_header("^#\\s*\\$Header.*\\s(\\d{4})/\\d{2}/\\d{2}\\s.*\\$$");
- static pcrepp::Pcre::Pcre r_cvs_empty_header("^#\\s*\\$Header:\\s*\\$$");
+ pcrepp::Pcre::Pcre r_cvs_header("^#\\s*\\$Header.*\\s(\\d{4})/\\d{2}/\\d{2}\\s.*\\$$");
+ pcrepp::Pcre::Pcre r_cvs_empty_header("^#\\s*\\$Header:\\s*\\$$");
std::vector<std::string> lines;
tokenise<delim_kind::AnyOfTag, delim_mode::DelimiterTag>(content, "\n", "", std::back_inserter(lines));