aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-09-17 03:29:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-09-17 03:29:59 +0000
commit303dc6669b0607d5fec73486b0d2111493e6c09f (patch)
treeab9ecd30e4eea7fec20e4a1e694e134eadc763a1
parent8980e15dff02bea1d5e228e47198031ec0a257cd (diff)
downloadpaludis-303dc6669b0607d5fec73486b0d2111493e6c09f.tar.gz
paludis-303dc6669b0607d5fec73486b0d2111493e6c09f.tar.xz
Take advantage of g++-4.1 code diagnostic utilities
-rw-r--r--configure.ac41
-rw-r--r--paludis/Makefile.am.m41
-rw-r--r--paludis/args/args_error.cc4
-rw-r--r--paludis/args/args_group.cc8
-rw-r--r--paludis/args/args_option.cc54
-rw-r--r--paludis/config_file.cc48
-rw-r--r--paludis/contents.cc18
-rw-r--r--paludis/contents.hh4
-rw-r--r--paludis/default_config.cc52
-rw-r--r--paludis/default_environment.cc10
-rw-r--r--paludis/dep_atom.cc12
-rw-r--r--paludis/dep_list.cc22
-rw-r--r--paludis/dep_tag.cc8
-rw-r--r--paludis/package_database.cc24
-rw-r--r--paludis/portage_dep_lexer.cc4
-rw-r--r--paludis/portage_dep_parser.cc2
-rw-r--r--paludis/qa/create_metadata_check.cc6
-rw-r--r--paludis/qa/dep_any_check.cc6
-rw-r--r--paludis/qa/dep_flags_check.cc6
-rw-r--r--paludis/qa/dep_packages_check.cc6
-rw-r--r--paludis/qa/deps_exist_check.cc6
-rw-r--r--paludis/qa/deps_visible_check.cc6
-rw-r--r--paludis/qa/description_check.cc6
-rw-r--r--paludis/qa/extract_check.cc6
-rw-r--r--paludis/qa/homepage_check.cc6
-rw-r--r--paludis/qa/inherits_check.cc6
-rw-r--r--paludis/qa/iuse_check.cc12
-rw-r--r--paludis/qa/keywords_check.cc6
-rw-r--r--paludis/qa/license_check.cc12
-rw-r--r--paludis/qa/parse_deps_check.cc18
-rw-r--r--paludis/qa/pdepend_overlap_check.cc6
-rw-r--r--paludis/qa/qa_environment.cc4
-rw-r--r--paludis/qa/restrict_check.cc6
-rw-r--r--paludis/qa/slot_check.cc6
-rw-r--r--paludis/qa/src_uri_check.cc18
-rw-r--r--paludis/repositories/cran/cran_dep_parser.cc2
-rw-r--r--paludis/repositories/cran/cran_description.cc2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc2
-rw-r--r--paludis/repositories/cran/cran_repository.cc4
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc4
-rw-r--r--paludis/repositories/fake/fake_repository.cc4
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc4
-rw-r--r--paludis/repositories/portage/portage_repository_ebin_entries.cc38
-rw-r--r--paludis/repositories/portage/portage_repository_ebuild_entries.cc48
-rw-r--r--paludis/repositories/portage/portage_repository_news.cc4
-rw-r--r--paludis/repositories/portage/portage_repository_sets.cc16
-rw-r--r--paludis/repository.cc8
-rw-r--r--paludis/selinux/security_context.hh7
-rw-r--r--paludis/tasks/uninstall_task.hh6
-rw-r--r--paludis/util/exception.cc8
-rw-r--r--paludis/util/fs_entry.cc8
-rw-r--r--paludis/util/pstream.cc4
-rw-r--r--paludis/util/system.cc4
-rw-r--r--src/paludis/install.cc6
-rw-r--r--test/test_framework.cc4
55 files changed, 329 insertions, 314 deletions
diff --git a/configure.ac b/configure.ac
index 5048159..1f66d8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,23 +236,28 @@ AC_CHECK_FUNCS([grantpt], [], [AC_MSG_ERROR([I need grantpt])])
AC_CHECK_FUNCS([unlockpt], [], [AC_MSG_ERROR([I need unlockpt])])
dnl }}}
+dnl {{{ pch support
+AC_MSG_CHECKING([whether to build g++ precompiled headers])
+AC_ARG_ENABLE([precompiled-headers],
+ AS_HELP_STRING([--enable-precompiled-headers], [Enable g++ precompiled headers (highly dodgy)]),
+ enable_precompiled_headers=$enableval,
+ enable_precompiled_headers=no)
+AC_MSG_RESULT($enable_precompiled_headers)
+AM_CONDITIONAL([ENABLE_PRECOMPILED_HEADERS], test "x$enable_precompiled_headers" = "xyes")
+dnl }}}
+
dnl {{{ check for cxxflags
-AC_MSG_CHECKING([for go faster stripes])
-if echo "${LDFLAGS} ${CFLAGS} ${CXXFLAGS}" | grep "as-needed" >/dev/null ; then
- AC_MSG_RESULT([as-needed])
- AC_MSG_ERROR([Bad ricer. No bagel.])
-else
- if echo "${LDFLAGS} ${CFLAGS} ${CXXFLAGS}" | grep "visibility" >/dev/null ; then
- AC_MSG_RESULT([visibility])
- AC_MSG_ERROR([Bad ricer. No bagel.])
- else
- if echo "${LDFLAGS} ${CFLAGS} ${CXXFLAGS}" | grep "enforce-eh" >/dev/null ; then
- AC_MSG_RESULT([enforce-eh])
+if test x == x"$LET_ME_RICE"
+then
+ AC_MSG_CHECKING([for go faster stripes])
+ for x in "as-needed" "visibility" "enforce-eh" "fast-math" "rtti"
+ do
+ if echo "${LDFLAGS} ${CFLAGS} ${CXXFLAGS}" | grep "$x" >/dev/null ; then
+ AC_MSG_RESULT([$x])
AC_MSG_ERROR([Bad ricer. No bagel.])
- else
- AC_MSG_RESULT([no])
fi
- fi
+ done
+ AC_MSG_RESULT([no])
fi
PALUDIS_CXXFLAGS=
@@ -315,6 +320,14 @@ elif test "x${ac_cv_cxx_compiler_gnu}" = "xyes" ; then
CHECK_CXXFLAG([-Wstrict-null-sentinel])
CHECK_CXXFLAG([-Wmissing-noreturn])
CHECK_CXXFLAG([-Woverloaded-virtual])
+ CHECK_CXXFLAG([-Winit-self])
+ CHECK_CXXFLAG([-Wsequence-point])
+ CHECK_CXXFLAG([-Wunreachable-code])
+ CHECK_CXXFLAG([-Wunused-function])
+ CHECK_CXXFLAG([-Wshadow])
+ if test "x${enable_precompiled_headers}" = "xyes" ; then
+ CHECK_CXXFLAG([-Winvalid-pch])
+ fi
CHECK_CXXFLAG([-pedantic])
else
CHECK_CXXFLAG([-Wall])
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 6705d31..fc7eb3e 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -67,6 +67,7 @@ BUILT_SOURCES = srcleanlist
libpaludis_la_SOURCES = filelist
libpaludis_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludis_la_LIBADD = $(top_builddir)/paludis/util/libpaludisutil.la @DYNAMIC_LD_LIBS@
TESTS = testlist
diff --git a/paludis/args/args_error.cc b/paludis/args/args_error.cc
index 5222ec3..b3f8d7e 100644
--- a/paludis/args/args_error.cc
+++ b/paludis/args/args_error.cc
@@ -28,8 +28,8 @@
using namespace paludis::args;
-ArgsError::ArgsError(const std::string & message) throw () :
- paludis::Exception("Error handling command line: " + message)
+ArgsError::ArgsError(const std::string & our_message) throw () :
+ paludis::Exception("Error handling command line: " + our_message)
{
}
diff --git a/paludis/args/args_group.cc b/paludis/args/args_group.cc
index 0752caa..45b6d74 100644
--- a/paludis/args/args_group.cc
+++ b/paludis/args/args_group.cc
@@ -43,11 +43,11 @@ namespace paludis
};
}
-ArgsGroup::ArgsGroup(ArgsHandler * h, const std::string & name,
- const std::string & description) :
+ArgsGroup::ArgsGroup(ArgsHandler * h, const std::string & our_name,
+ const std::string & our_description) :
PrivateImplementationPattern<ArgsGroup>(new Implementation<ArgsGroup>),
- _name(name),
- _description(description),
+ _name(our_name),
+ _description(our_description),
_handler(h)
{
h->add(this);
diff --git a/paludis/args/args_option.cc b/paludis/args/args_option.cc
index 51ea673..dbe0eff 100644
--- a/paludis/args/args_option.cc
+++ b/paludis/args/args_option.cc
@@ -30,25 +30,25 @@
using namespace paludis::args;
-ArgsOption::ArgsOption(ArgsGroup * const g, const std::string & long_name,
- const char short_name, const std::string & description) :
+ArgsOption::ArgsOption(ArgsGroup * const g, const std::string & our_long_name,
+ const char our_short_name, const std::string & our_description) :
_group(g),
- _long_name(long_name),
- _short_name(short_name),
- _description(description),
+ _long_name(our_long_name),
+ _short_name(our_short_name),
+ _description(our_description),
_specified(false)
{
g->add(this);
- g->handler()->add_option(this, long_name, short_name);
+ g->handler()->add_option(this, our_long_name, our_short_name);
}
ArgsOption::~ArgsOption()
{
}
-SwitchArg::SwitchArg(ArgsGroup * const group, std::string long_name, char short_name,
- std::string description) :
- ArgsOption(group, long_name, short_name, description)
+SwitchArg::SwitchArg(ArgsGroup * const our_group, std::string our_long_name, char our_short_name,
+ std::string our_description) :
+ ArgsOption(our_group, our_long_name, our_short_name, our_description)
{
}
@@ -56,16 +56,16 @@ SwitchArg::~SwitchArg()
{
}
-AliasArg::AliasArg(ArgsOption * const other, const std::string & long_name) :
- ArgsOption(other->group(), long_name, '\0', "Alias for --" + other->long_name()),
+AliasArg::AliasArg(ArgsOption * const other, const std::string & our_long_name) :
+ ArgsOption(other->group(), our_long_name, '\0', "Alias for --" + other->long_name()),
_other(other)
{
- other->group()->handler()->add_option(other, long_name);
+ other->group()->handler()->add_option(other, our_long_name);
}
-StringArg::StringArg(ArgsGroup * const g, const std::string & long_name,
- const char short_name, const std::string & description) :
- ArgsOption(g, long_name, short_name, description)
+StringArg::StringArg(ArgsGroup * const g, const std::string & our_long_name,
+ const char our_short_name, const std::string & our_description) :
+ ArgsOption(g, our_long_name, our_short_name, our_description)
{
}
@@ -84,9 +84,9 @@ namespace paludis
};
}
-StringSetArg::StringSetArg(ArgsGroup * const g, const std::string & long_name,
- const char short_name, const std::string & description) :
- ArgsOption(g, long_name, short_name, description),
+StringSetArg::StringSetArg(ArgsGroup * const g, const std::string & our_long_name,
+ const char our_short_name, const std::string & our_description) :
+ ArgsOption(g, our_long_name, our_short_name, our_description),
PrivateImplementationPattern<StringSetArg>(new Implementation<StringSetArg>)
{
}
@@ -109,9 +109,9 @@ StringSetArg::add_argument(const std::string & arg)
_imp->args.insert(arg);
}
-IntegerArg::IntegerArg(ArgsGroup * const group, const std::string& long_name,
- char short_name, const std::string& description) :
- ArgsOption(group, long_name, short_name, description)
+IntegerArg::IntegerArg(ArgsGroup * const our_group, const std::string & our_long_name,
+ char our_short_name, const std::string & our_description) :
+ ArgsOption(our_group, our_long_name, our_short_name, our_description)
{
}
@@ -197,13 +197,13 @@ EnumArg::EnumArgOptions::~EnumArgOptions()
{
}
-EnumArg::EnumArg(ArgsGroup * const group, const std::string & long_name,
- const char short_name, const std::string & description,
- const EnumArgOptions & opts, const std::string & default_arg) :
- ArgsOption(group, long_name, short_name, description),
+EnumArg::EnumArg(ArgsGroup * const our_group, const std::string & our_long_name,
+ const char our_short_name, const std::string & our_description,
+ const EnumArgOptions & opts, const std::string & our_default_arg) :
+ ArgsOption(our_group, our_long_name, our_short_name, our_description),
PrivateImplementationPattern<EnumArg>(new Implementation<EnumArg>),
- _argument(default_arg),
- _default_arg(default_arg)
+ _argument(our_default_arg),
+ _default_arg(our_default_arg)
{
_imp->allowed_args = opts._imp->options;
}
diff --git a/paludis/config_file.cc b/paludis/config_file.cc
index b9db95b..2b06f46 100644
--- a/paludis/config_file.cc
+++ b/paludis/config_file.cc
@@ -39,8 +39,8 @@
using namespace paludis;
-ConfigFileError::ConfigFileError(const std::string & message) throw () :
- ConfigurationError("Config file error: " + message)
+ConfigFileError::ConfigFileError(const std::string & our_message) throw () :
+ ConfigurationError("Config file error: " + our_message)
{
}
@@ -51,10 +51,10 @@ ConfigFile::ConfigFile(std::istream * const stream) :
{
}
-ConfigFile::ConfigFile(const std::string & filename) try :
- _stream(_make_stream(filename)),
+ConfigFile::ConfigFile(const std::string & our_filename) try :
+ _stream(_make_stream(our_filename)),
_has_lines(false),
- _filename(filename),
+ _filename(our_filename),
_destroy_stream(true)
{
}
@@ -64,10 +64,10 @@ catch (...)
throw;
}
-ConfigFile::ConfigFile(const FSEntry & filename) try :
- _stream(_make_stream(stringify(filename))),
+ConfigFile::ConfigFile(const FSEntry & our_filename) try :
+ _stream(_make_stream(stringify(our_filename))),
_has_lines(false),
- _filename(stringify(filename)),
+ _filename(stringify(our_filename)),
_destroy_stream(true)
{
}
@@ -177,15 +177,15 @@ LineConfigFile::LineConfigFile(std::istream * const s) :
need_lines();
}
-LineConfigFile::LineConfigFile(const std::string & filename) :
- ConfigFile(filename),
+LineConfigFile::LineConfigFile(const std::string & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<LineConfigFile>(new Implementation<LineConfigFile>)
{
need_lines();
}
-LineConfigFile::LineConfigFile(const FSEntry & filename) :
- ConfigFile(filename),
+LineConfigFile::LineConfigFile(const FSEntry & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<LineConfigFile>(new Implementation<LineConfigFile>)
{
need_lines();
@@ -244,15 +244,15 @@ KeyValueConfigFile::KeyValueConfigFile(std::istream * const s) :
need_lines();
}
-KeyValueConfigFile::KeyValueConfigFile(const std::string & filename) :
- ConfigFile(filename),
+KeyValueConfigFile::KeyValueConfigFile(const std::string & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<KeyValueConfigFile>(new Implementation<KeyValueConfigFile>)
{
need_lines();
}
-KeyValueConfigFile::KeyValueConfigFile(const FSEntry & filename) :
- ConfigFile(filename),
+KeyValueConfigFile::KeyValueConfigFile(const FSEntry & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<KeyValueConfigFile>(new Implementation<KeyValueConfigFile>)
{
need_lines();
@@ -267,18 +267,18 @@ KeyValueConfigFile::KeyValueConfigFile(std::istream * const s,
need_lines();
}
-KeyValueConfigFile::KeyValueConfigFile(const std::string & filename,
+KeyValueConfigFile::KeyValueConfigFile(const std::string & our_filename,
AssociativeCollection<std::string, std::string>::ConstPointer m) :
- ConfigFile(filename),
+ ConfigFile(our_filename),
PrivateImplementationPattern<KeyValueConfigFile>(new Implementation<KeyValueConfigFile>)
{
_imp->entries.insert(m->begin(), m->end());
need_lines();
}
-KeyValueConfigFile::KeyValueConfigFile(const FSEntry & filename,
+KeyValueConfigFile::KeyValueConfigFile(const FSEntry & our_filename,
AssociativeCollection<std::string, std::string>::ConstPointer m) :
- ConfigFile(filename),
+ ConfigFile(our_filename),
PrivateImplementationPattern<KeyValueConfigFile>(new Implementation<KeyValueConfigFile>)
{
_imp->entries.insert(m->begin(), m->end());
@@ -483,16 +483,16 @@ AdvisoryFile::AdvisoryFile(std::istream * const s) :
sanitise();
}
-AdvisoryFile::AdvisoryFile(const std::string & filename) :
- ConfigFile(filename),
+AdvisoryFile::AdvisoryFile(const std::string & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<AdvisoryFile>(new Implementation<AdvisoryFile>)
{
need_lines();
sanitise();
}
-AdvisoryFile::AdvisoryFile(const FSEntry & filename) :
- ConfigFile(filename),
+AdvisoryFile::AdvisoryFile(const FSEntry & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<AdvisoryFile>(new Implementation<AdvisoryFile>)
{
need_lines();
diff --git a/paludis/contents.cc b/paludis/contents.cc
index acf9210..471b6f1 100644
--- a/paludis/contents.cc
+++ b/paludis/contents.cc
@@ -32,24 +32,24 @@ ContentsEntry::~ContentsEntry()
{
}
-ContentsFileEntry::ContentsFileEntry(const std::string & name) :
- ContentsEntry(name)
+ContentsFileEntry::ContentsFileEntry(const std::string & our_name) :
+ ContentsEntry(our_name)
{
}
-ContentsDirEntry::ContentsDirEntry(const std::string & name) :
- ContentsEntry(name)
+ContentsDirEntry::ContentsDirEntry(const std::string & our_name) :
+ ContentsEntry(our_name)
{
}
-ContentsMiscEntry::ContentsMiscEntry(const std::string & name) :
- ContentsEntry(name)
+ContentsMiscEntry::ContentsMiscEntry(const std::string & our_name) :
+ ContentsEntry(our_name)
{
}
-ContentsSymEntry::ContentsSymEntry(const std::string & name, const std::string & target) :
- ContentsEntry(name),
- _target(target)
+ContentsSymEntry::ContentsSymEntry(const std::string & our_name, const std::string & our_target) :
+ ContentsEntry(our_name),
+ _target(our_target)
{
}
diff --git a/paludis/contents.hh b/paludis/contents.hh
index 0615057..21cae7a 100644
--- a/paludis/contents.hh
+++ b/paludis/contents.hh
@@ -67,8 +67,8 @@ namespace paludis
///\name Basic operations
///\{
- ContentsEntry(const std::string & name) :
- _name(name)
+ ContentsEntry(const std::string & our_name) :
+ _name(our_name)
{
}
diff --git a/paludis/default_config.cc b/paludis/default_config.cc
index 012d7b7..636b4c4 100644
--- a/paludis/default_config.cc
+++ b/paludis/default_config.cc
@@ -138,51 +138,51 @@ DefaultConfig::DefaultConfig() :
/* indirection */
std::string root_prefix;
- std::string config_suffix;
+ std::string local_config_suffix;
if (! _imp->config_suffix.empty())
- config_suffix = "-" + _imp->config_suffix;
+ local_config_suffix = "-" + _imp->config_suffix;
- FSEntry config_dir(FSEntry(getenv_with_default("PALUDIS_HOME", getenv_or_error("HOME"))) /
- (".paludis" + config_suffix)), old_config_dir(config_dir);
- if (! config_dir.exists())
- config_dir = (FSEntry(SYSCONFDIR) / ("paludis" + config_suffix));
- if (! config_dir.exists())
+ FSEntry local_config_dir(FSEntry(getenv_with_default("PALUDIS_HOME", getenv_or_error("HOME"))) /
+ (".paludis" + local_config_suffix)), old_config_dir(local_config_dir);
+ if (! local_config_dir.exists())
+ local_config_dir = (FSEntry(SYSCONFDIR) / ("paludis" + local_config_suffix));
+ if (! local_config_dir.exists())
throw DefaultConfigError("Can't find configuration directory (tried '"
- + stringify(old_config_dir) + "', '" + stringify(config_dir) + "')");
+ + stringify(old_config_dir) + "', '" + stringify(local_config_dir) + "')");
Log::get_instance()->message(ll_debug, lc_no_context, "DefaultConfig initial directory is '"
- + stringify(config_dir) + "'");
+ + stringify(local_config_dir) + "'");
- if ((config_dir / "specpath").exists())
+ if ((local_config_dir / "specpath").exists())
{
- KeyValueConfigFile specpath(config_dir / "specpath");
+ KeyValueConfigFile specpath(local_config_dir / "specpath");
root_prefix = specpath.get("root");
- config_suffix = specpath.get("config-suffix");
+ local_config_suffix = specpath.get("config-suffix");
if (! root_prefix.empty() && stringify(FSEntry(root_prefix).realpath()) != "/")
{
- config_dir = FSEntry(root_prefix) / SYSCONFDIR / ("paludis" + config_suffix);
- if (! config_dir.exists())
+ local_config_dir = FSEntry(root_prefix) / SYSCONFDIR / ("paludis" + local_config_suffix);
+ if (! local_config_dir.exists())
throw DefaultConfigError("Can't find configuration directory under root ("
- "tried '" + stringify(config_dir) + "'");
+ "tried '" + stringify(local_config_dir) + "'");
}
}
_imp->root = root_prefix;
- _imp->config_dir = stringify(config_dir);
+ _imp->config_dir = stringify(local_config_dir);
AssociativeCollection<std::string, std::string>::Pointer conf_vars(
new AssociativeCollection<std::string, std::string>::Concrete);
conf_vars->insert("ROOT", root_prefix);
Log::get_instance()->message(ll_debug, lc_no_context, "DefaultConfig real directory is '"
- + stringify(config_dir) + "', root prefix is '" + root_prefix +
- "', config suffix is '" + config_suffix + "'");
+ + stringify(local_config_dir) + "', root prefix is '" + root_prefix +
+ "', config suffix is '" + local_config_suffix + "'");
/* repositories */
{
std::list<FSEntry> dirs;
- dirs.push_back(config_dir / "repositories");
+ dirs.push_back(local_config_dir / "repositories");
std::list<FSEntry> repo_files;
for (std::list<FSEntry>::const_iterator dir(dirs.begin()), dir_end(dirs.end()) ;
@@ -237,7 +237,7 @@ DefaultConfig::DefaultConfig() :
/* keywords */
{
std::list<FSEntry> files;
- files.push_back(config_dir / "keywords.conf");
+ files.push_back(local_config_dir / "keywords.conf");
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
file != file_end ; ++file)
@@ -276,7 +276,7 @@ DefaultConfig::DefaultConfig() :
/* licenses */
{
std::list<FSEntry> files;
- files.push_back(config_dir / "licenses.conf");
+ files.push_back(local_config_dir / "licenses.conf");
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
file != file_end ; ++file)
@@ -315,7 +315,7 @@ DefaultConfig::DefaultConfig() :
/* user mask */
{
std::list<FSEntry> files;
- files.push_back(config_dir / "package_mask.conf");
+ files.push_back(local_config_dir / "package_mask.conf");
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
file != file_end ; ++file)
@@ -338,7 +338,7 @@ DefaultConfig::DefaultConfig() :
/* user unmask */
{
std::list<FSEntry> files;
- files.push_back(config_dir / "package_unmask.conf");
+ files.push_back(local_config_dir / "package_unmask.conf");
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
file != file_end ; ++file)
@@ -361,7 +361,7 @@ DefaultConfig::DefaultConfig() :
/* use */
{
std::list<FSEntry> files;
- files.push_back(config_dir / "use.conf");
+ files.push_back(local_config_dir / "use.conf");
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
file != file_end ; ++file)
@@ -449,7 +449,7 @@ DefaultConfig::DefaultConfig() :
/* mirrors */
{
std::list<FSEntry> files;
- files.push_back(config_dir / "mirrors.conf");
+ files.push_back(local_config_dir / "mirrors.conf");
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
file != file_end ; ++file)
@@ -474,7 +474,7 @@ DefaultConfig::DefaultConfig() :
}
}
- _imp->bashrc_files = stringify(config_dir / "bashrc");
+ _imp->bashrc_files = stringify(local_config_dir / "bashrc");
_imp->config_suffix_can_be_set = false;
}
diff --git a/paludis/default_environment.cc b/paludis/default_environment.cc
index a141c6f..3e3b61e 100644
--- a/paludis/default_environment.cc
+++ b/paludis/default_environment.cc
@@ -452,10 +452,10 @@ DefaultEnvironment::perform_hook(const Hook & hook) const
Context context("When triggering hook '" + hook.name() + "'");
Log::get_instance()->message(ll_debug, lc_no_context, "Starting hook '" + hook.name() + "'");
- const std::list<FSEntry> & hook_dirs(get_hook_dirs());
+ const std::list<FSEntry> & hook_dirs_ref(get_hook_dirs());
- for (std::list<FSEntry>::const_iterator h(hook_dirs.begin()),
- h_end(hook_dirs.end()) ; h != h_end ; ++h)
+ for (std::list<FSEntry>::const_iterator h(hook_dirs_ref.begin()),
+ h_end(hook_dirs_ref.end()) ; h != h_end ; ++h)
{
FSEntry hh(*h / hook.name());
if (! hh.is_directory())
@@ -471,8 +471,8 @@ DefaultEnvironment::perform_hook(const Hook & hook) const
std::string
DefaultEnvironment::hook_dirs() const
{
- const std::list<FSEntry> & hook_dirs(get_hook_dirs());
- return join(hook_dirs.begin(), hook_dirs.end(), " ");
+ const std::list<FSEntry> & hook_dirs_ref(get_hook_dirs());
+ return join(hook_dirs_ref.begin(), hook_dirs_ref.end(), " ");
}
CompositeDepAtom::Pointer
diff --git a/paludis/dep_atom.cc b/paludis/dep_atom.cc
index 5236eb4..384804d 100644
--- a/paludis/dep_atom.cc
+++ b/paludis/dep_atom.cc
@@ -95,9 +95,9 @@ AllDepAtom::AllDepAtom()
{
}
-UseDepAtom::UseDepAtom(const UseFlagName & flag, bool inverse) :
- _flag(flag),
- _inverse(inverse)
+UseDepAtom::UseDepAtom(const UseFlagName & our_flag, bool is_inverse) :
+ _flag(our_flag),
+ _inverse(is_inverse)
{
}
@@ -113,9 +113,9 @@ BlockDepAtom::BlockDepAtom(PackageDepAtom::ConstPointer a) :
{
}
-PackageDepAtom::PackageDepAtom(const QualifiedPackageName & package) :
- StringDepAtom(stringify(package)),
- _package(package),
+PackageDepAtom::PackageDepAtom(const QualifiedPackageName & our_package) :
+ StringDepAtom(stringify(our_package)),
+ _package(our_package),
_version_operator("="),
_version_spec(0),
_slot(0),
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index 2c8b543..ad15742 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -67,15 +67,15 @@ NoResolvableOptionError::NoResolvableOptionError(I_ i, I_ end) throw () :
{
}
-AllMaskedError::AllMaskedError(const std::string & query) throw () :
- DepListError("Error searching for '" + query + "': no available versions"),
- _query(query)
+AllMaskedError::AllMaskedError(const std::string & our_query) throw () :
+ DepListError("Error searching for '" + our_query + "': no available versions"),
+ _query(our_query)
{
}
-UseRequirementsNotMetError::UseRequirementsNotMetError(const std::string & query) throw () :
- DepListError("Error searching for '" + query + "': use requirements are not met"),
- _query(query)
+UseRequirementsNotMetError::UseRequirementsNotMetError(const std::string & our_query) throw () :
+ DepListError("Error searching for '" + our_query + "': use requirements are not met"),
+ _query(our_query)
{
}
@@ -493,9 +493,9 @@ DepList::visit(const PackageDepAtom * const p)
DepAtomFlattener f(_imp->environment, e.raw_pointer(), provide);
- for (DepAtomFlattener::Iterator p(f.begin()), p_end(f.end()) ; p != p_end ; ++p)
+ for (DepAtomFlattener::Iterator pr(f.begin()), pr_end(f.end()) ; pr != pr_end ; ++pr)
{
- PackageDepAtom pp(QualifiedPackageName((*p)->text()));
+ PackageDepAtom pp(QualifiedPackageName((*pr)->text()));
if (_imp->merge_list.end() != std::find_if(
_imp->merge_list.begin(), _imp->merge_list.end(),
DepListEntryMatcher(_imp->environment, pp)))
@@ -513,10 +513,10 @@ DepList::visit(const PackageDepAtom * const p)
p_metadata = _imp->environment->package_database()->fetch_repository(RepositoryName(
"virtuals"))->version_metadata(pp.package(), merge_entry->version);
}
- catch (const NoSuchPackageError & e)
+ catch (const NoSuchPackageError & err)
{
- Log::get_instance()->message(ll_warning, lc_context, "Error '" + stringify(e.message()) + "' ("
- + stringify(e.what()) + ") when looking for virtual '" + stringify(pp.package())
+ Log::get_instance()->message(ll_warning, lc_context, "Error '" + stringify(err.message()) + "' ("
+ + stringify(err.what()) + ") when looking for virtual '" + stringify(pp.package())
+ "' for merge entry '" + stringify(*merge_entry));
}
#endif
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 069cfdc..bd0ea03 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -80,10 +80,10 @@ namespace
&make_general_set_dep_tag);
}
-DepTagCategory::DepTagCategory(const std::string & id,
+DepTagCategory::DepTagCategory(const std::string & our_id,
const std::string & t, const std::string & pre,
const std::string & post) :
- _id(id),
+ _id(our_id),
_title(t),
_pre_text(pre),
_post_text(post)
@@ -103,9 +103,9 @@ DepTag::~DepTag()
{
}
-GLSADepTag::GLSADepTag(const std::string & id, const std::string & glsa_title) :
+GLSADepTag::GLSADepTag(const std::string & id, const std::string & our_glsa_title) :
_id(id),
- _glsa_title(glsa_title)
+ _glsa_title(our_glsa_title)
{
}
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index 3f218c5..17aa0d5 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -44,13 +44,13 @@ paludis::operator<< (std::ostream & s, const PackageDatabaseEntry & v)
return s;
}
-PackageDatabaseError::PackageDatabaseError(const std::string & message) throw () :
- Exception(message)
+PackageDatabaseError::PackageDatabaseError(const std::string & our_message) throw () :
+ Exception(our_message)
{
}
-PackageDatabaseLookupError::PackageDatabaseLookupError(const std::string & message) throw () :
- PackageDatabaseError(message)
+PackageDatabaseLookupError::PackageDatabaseLookupError(const std::string & our_message) throw () :
+ PackageDatabaseError(our_message)
{
}
@@ -59,9 +59,9 @@ DuplicateRepositoryError::DuplicateRepositoryError(const std::string & name) thr
{
}
-NoSuchPackageError::NoSuchPackageError(const std::string & name) throw () :
- PackageDatabaseLookupError("Could not find '" + name + "'"),
- _name(name)
+NoSuchPackageError::NoSuchPackageError(const std::string & our_name) throw () :
+ PackageDatabaseLookupError("Could not find '" + our_name + "'"),
+ _name(our_name)
{
}
@@ -85,13 +85,13 @@ struct AmbiguousPackageNameError::NameData
};
template <typename I_>
-AmbiguousPackageNameError::AmbiguousPackageNameError(const std::string & name,
+AmbiguousPackageNameError::AmbiguousPackageNameError(const std::string & our_name,
I_ begin, const I_ end) throw () :
- PackageDatabaseLookupError("Ambiguous package name '" + name + "' (candidates are " +
+ PackageDatabaseLookupError("Ambiguous package name '" + our_name + "' (candidates are " +
join(begin, end, ", ") + ")"),
_name_data(new NameData)
{
- _name_data->name = name;
+ _name_data->name = our_name;
std::transform(begin, end, std::back_inserter(_name_data->names),
&stringify<typename std::iterator_traits<I_>::value_type>);
}
@@ -186,13 +186,13 @@ PackageDatabase::fetch_unique_qualified_package_name(
r_end(_imp->repositories.end());
for ( ; r != r_end ; ++r)
{
- Context context("When looking in repository '" + stringify(r->name()) + "':");
+ Context local_context("When looking in repository '" + stringify(r->name()) + "':");
CategoryNamePartCollection::ConstPointer cats(r->category_names());
CategoryNamePartCollection::Iterator c(cats->begin()), c_end(cats->end());
for ( ; c != c_end ; ++c)
{
- Context context("When looking in category '" + stringify(*c) + "':");
+ Context very_local_context("When looking in category '" + stringify(*c) + "':");
if (r->has_package_named(*c + p))
result->insert(*c + p);
}
diff --git a/paludis/portage_dep_lexer.cc b/paludis/portage_dep_lexer.cc
index 9b1b277..0d24839 100644
--- a/paludis/portage_dep_lexer.cc
+++ b/paludis/portage_dep_lexer.cc
@@ -48,8 +48,8 @@ namespace paludis
}
DepStringLexError::DepStringLexError(const std::string & dep_string,
- const std::string & message) throw () :
- DepStringError(dep_string, "in lex phase: " + message)
+ const std::string & our_message) throw () :
+ DepStringError(dep_string, "in lex phase: " + our_message)
{
}
diff --git a/paludis/portage_dep_parser.cc b/paludis/portage_dep_parser.cc
index a235f7b..cb480d5 100644
--- a/paludis/portage_dep_parser.cc
+++ b/paludis/portage_dep_parser.cc
@@ -75,7 +75,7 @@ PortageDepParser::parse(const std::string & s, const PortageDepParserPolicyInter
for ( ; i != i_end ; ++i)
{
- Context context("When handling lexer token '" + i->second +
+ Context local_context("When handling lexer token '" + i->second +
"' (" + stringify(i->first) + "):");
do
{
diff --git a/paludis/qa/create_metadata_check.cc b/paludis/qa/create_metadata_check.cc
index d2845b3..4bd5627 100644
--- a/paludis/qa/create_metadata_check.cc
+++ b/paludis/qa/create_metadata_check.cc
@@ -49,10 +49,10 @@ CreateMetadataCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/dep_any_check.cc b/paludis/qa/dep_any_check.cc
index 99d57d0..fc49cf4 100644
--- a/paludis/qa/dep_any_check.cc
+++ b/paludis/qa/dep_any_check.cc
@@ -125,10 +125,10 @@ DepAnyCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/dep_flags_check.cc b/paludis/qa/dep_flags_check.cc
index 9266864..147b3be 100644
--- a/paludis/qa/dep_flags_check.cc
+++ b/paludis/qa/dep_flags_check.cc
@@ -156,10 +156,10 @@ DepFlagsCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/dep_packages_check.cc b/paludis/qa/dep_packages_check.cc
index ccccb3c..c629470 100644
--- a/paludis/qa/dep_packages_check.cc
+++ b/paludis/qa/dep_packages_check.cc
@@ -131,10 +131,10 @@ DepPackagesCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/deps_exist_check.cc b/paludis/qa/deps_exist_check.cc
index 55194d5..cfb8aa7 100644
--- a/paludis/qa/deps_exist_check.cc
+++ b/paludis/qa/deps_exist_check.cc
@@ -121,10 +121,10 @@ DepsExistCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/deps_visible_check.cc b/paludis/qa/deps_visible_check.cc
index 5adaa92..6869cef 100644
--- a/paludis/qa/deps_visible_check.cc
+++ b/paludis/qa/deps_visible_check.cc
@@ -124,10 +124,10 @@ DepsVisibleCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/description_check.cc b/paludis/qa/description_check.cc
index f3ae32e..74b311d 100644
--- a/paludis/qa/description_check.cc
+++ b/paludis/qa/description_check.cc
@@ -63,10 +63,10 @@ DescriptionCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/extract_check.cc b/paludis/qa/extract_check.cc
index f23bae5..5228616 100644
--- a/paludis/qa/extract_check.cc
+++ b/paludis/qa/extract_check.cc
@@ -108,10 +108,10 @@ ExtractCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/homepage_check.cc b/paludis/qa/homepage_check.cc
index 9f9e136..5638c79 100644
--- a/paludis/qa/homepage_check.cc
+++ b/paludis/qa/homepage_check.cc
@@ -55,10 +55,10 @@ HomepageCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/inherits_check.cc b/paludis/qa/inherits_check.cc
index 6719657..cd5f855 100644
--- a/paludis/qa/inherits_check.cc
+++ b/paludis/qa/inherits_check.cc
@@ -73,10 +73,10 @@ InheritsCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/iuse_check.cc b/paludis/qa/iuse_check.cc
index a9ea3c0..905e6ea 100644
--- a/paludis/qa/iuse_check.cc
+++ b/paludis/qa/iuse_check.cc
@@ -69,20 +69,20 @@ IuseCheck::operator() (const EbuildCheckData & e) const
result << Message(qal_minor, "Deprecated IUSEs '" + join(bad_iuse.begin(),
bad_iuse.end(), "', '") + "'");
}
- catch (const NameError & e)
+ catch (const NameError & err)
{
- result << Message(qal_fatal, "Bad IUSE entry name: " + e.message() + " ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Bad IUSE entry name: " + err.message() + " ("
+ + err.what() + ")");
}
}
catch (const InternalError &)
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/keywords_check.cc b/paludis/qa/keywords_check.cc
index cd0b2ac..aa87f7f 100644
--- a/paludis/qa/keywords_check.cc
+++ b/paludis/qa/keywords_check.cc
@@ -70,10 +70,10 @@ KeywordsCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/license_check.cc b/paludis/qa/license_check.cc
index 826f403..67f2603 100644
--- a/paludis/qa/license_check.cc
+++ b/paludis/qa/license_check.cc
@@ -111,10 +111,10 @@ LicenseCheck::operator() (const EbuildCheckData & e) const
Checker checker(result, e.environment);
license_parts->accept(&checker);
}
- catch (const DepStringError & e)
+ catch (const DepStringError & err)
{
- result << Message(qal_major, "Invalid LICENSE: '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_major, "Invalid LICENSE: '" + err.message() + "' ("
+ + err.what() + ")");
break;
}
} while (false);
@@ -123,10 +123,10 @@ LicenseCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/parse_deps_check.cc b/paludis/qa/parse_deps_check.cc
index 1530729..7713535 100644
--- a/paludis/qa/parse_deps_check.cc
+++ b/paludis/qa/parse_deps_check.cc
@@ -47,10 +47,10 @@ ParseDepsCheck::operator() (const EbuildCheckData & e) const
std::string depend(metadata->deps.build_depend_string);
PortageDepParser::parse(depend);
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
result << Message(qal_fatal, "Unparsable DEPEND: '" +
- e.message() + "' (" + e.what() + ")");
+ err.message() + "' (" + err.what() + ")");
}
try
@@ -58,10 +58,10 @@ ParseDepsCheck::operator() (const EbuildCheckData & e) const
std::string rdepend(metadata->deps.run_depend_string);
PortageDepParser::parse(rdepend);
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
result << Message(qal_fatal, "Unparsable RDEPEND: '" +
- e.message() + "' (" + e.what() + ")");
+ err.message() + "' (" + err.what() + ")");
}
try
@@ -69,20 +69,20 @@ ParseDepsCheck::operator() (const EbuildCheckData & e) const
std::string pdepend(metadata->deps.post_depend_string);
PortageDepParser::parse(pdepend);
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
result << Message(qal_fatal, "Unparsable PDEPEND: '" +
- e.message() + "' (" + e.what() + ")");
+ err.message() + "' (" + err.what() + ")");
}
}
catch (const InternalError &)
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/pdepend_overlap_check.cc b/paludis/qa/pdepend_overlap_check.cc
index 70fb03e..4cef581 100644
--- a/paludis/qa/pdepend_overlap_check.cc
+++ b/paludis/qa/pdepend_overlap_check.cc
@@ -125,10 +125,10 @@ PdependOverlapCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/qa_environment.cc b/paludis/qa/qa_environment.cc
index 8c89114..4f42b31 100644
--- a/paludis/qa/qa_environment.cc
+++ b/paludis/qa/qa_environment.cc
@@ -121,8 +121,8 @@ QAEnvironment::paludis_command() const
"'paludis_command called from within QAEnvironment'";
}
-ProfilesDescError::ProfilesDescError(const std::string & message) throw () :
- ConfigurationError("Bad profiles.desc: " + message)
+ProfilesDescError::ProfilesDescError(const std::string & our_message) throw () :
+ ConfigurationError("Bad profiles.desc: " + our_message)
{
}
diff --git a/paludis/qa/restrict_check.cc b/paludis/qa/restrict_check.cc
index e882bba..83d1609 100644
--- a/paludis/qa/restrict_check.cc
+++ b/paludis/qa/restrict_check.cc
@@ -77,10 +77,10 @@ RestrictCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/slot_check.cc b/paludis/qa/slot_check.cc
index 51fb6da..931ce83 100644
--- a/paludis/qa/slot_check.cc
+++ b/paludis/qa/slot_check.cc
@@ -54,10 +54,10 @@ SlotCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/qa/src_uri_check.cc b/paludis/qa/src_uri_check.cc
index 94dedf6..dd8b433 100644
--- a/paludis/qa/src_uri_check.cc
+++ b/paludis/qa/src_uri_check.cc
@@ -74,12 +74,12 @@ namespace
if (0 == a->text().compare(0, 9, "mirror://"))
{
std::string mirror_host(a->text().substr(9));
- std::string::size_type p(mirror_host.find('/'));
- if (std::string::npos == p)
+ std::string::size_type pos(mirror_host.find('/'));
+ if (std::string::npos == pos)
result << Message(qal_major, "Malformed SRC_URI component '" + a->text() + "'");
else
{
- mirror_host.erase(p);
+ mirror_host.erase(pos);
RepositoryMirrorsInterface * m(env->package_database()->fetch_repository(
env->package_database()->favourite_repository())->mirrors_interface);
if (! m)
@@ -163,10 +163,10 @@ SrcUriCheck::operator() (const EbuildCheckData & e) const
Checker checker(result, fetch_restrict, e.environment);
src_uri_parts->accept(&checker);
}
- catch (const DepStringError & e)
+ catch (const DepStringError & err)
{
- result << Message(qal_major, "Invalid SRC_URI: '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_major, "Invalid SRC_URI: '" + err.message() + "' ("
+ + err.what() + ")");
break;
}
} while (false);
@@ -175,10 +175,10 @@ SrcUriCheck::operator() (const EbuildCheckData & e) const
{
throw;
}
- catch (const Exception & e)
+ catch (const Exception & err)
{
- result << Message(qal_fatal, "Caught Exception '" + e.message() + "' ("
- + e.what() + ")");
+ result << Message(qal_fatal, "Caught Exception '" + err.message() + "' ("
+ + err.what() + ")");
}
return result;
diff --git a/paludis/repositories/cran/cran_dep_parser.cc b/paludis/repositories/cran/cran_dep_parser.cc
index acc9a74..456487e 100644
--- a/paludis/repositories/cran/cran_dep_parser.cc
+++ b/paludis/repositories/cran/cran_dep_parser.cc
@@ -22,7 +22,7 @@ CRANDepParser::parse(const std::string & s)
std::list<std::string>::const_iterator a(atoms.begin()), a_end(atoms.end());
for ( ; a != a_end ; ++a)
{
- Context context("When processing token '" + *a + "':");
+ Context local_context("When processing token '" + *a + "':");
std::string aa = strip_leading(strip_trailing(*a, ")"), " \t");
diff --git a/paludis/repositories/cran/cran_description.cc b/paludis/repositories/cran/cran_description.cc
index 29d88da..b831414 100644
--- a/paludis/repositories/cran/cran_description.cc
+++ b/paludis/repositories/cran/cran_description.cc
@@ -52,7 +52,7 @@ CRANDescription::CRANDescription(const std::string & n, const FSEntry & f) :
std::string key;
for ( ; l != l_end ; ++l)
{
- Context context("When parsing line '" + *l + "':");
+ Context local_context("When parsing line '" + *l + "':");
std::string line(strip_leading(strip_trailing(*l, " \t\r\n"), " \t\r\n")), value;
std::string::size_type pos(line.find(':'));
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index d099e2a..af2edf3 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -122,7 +122,7 @@ Implementation<CRANInstalledRepository>::load_entries() const
{
for (DirIterator d(location), d_end ; d != d_end ; ++d)
{
- Context context("When parsing directoryy '" + stringify(*d) + "'.");
+ Context local_context("When parsing directoryy '" + stringify(*d) + "'.");
if (! d->is_directory())
continue;
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index bf229c4..ff95a2a 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -311,7 +311,7 @@ CRANRepository::need_packages() const
bool skip_invalid_package = false;
for ( ; l != l_end ; ++l)
{
- Context context("When parsing line '" + *l + "':");
+ Context local_context("When parsing line '" + *l + "':");
std::string line(strip_leading(strip_trailing(*l, " \t"), " \t"));
if (line.empty())
@@ -426,7 +426,7 @@ CRANRepository::do_version_metadata(
Log::get_instance()->message(ll_warning, lc_no_context, "has_version failed for request for '" +
stringify(q) + "-" + stringify(v) + "' in repository '" +
stringify(name()) + "': File '" + n + ".DESCRIPTION' not present.");
- VersionMetadata::Pointer result(new VersionMetadata(CRANDepParser::parse));
+ result.assign(new VersionMetadata(CRANDepParser::parse));
result->eapi = "UNKNOWN";
}
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 34b077e..9afa130 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -21,8 +21,8 @@
using namespace paludis;
-FakeInstalledRepository::FakeInstalledRepository(const RepositoryName & name) :
- FakeRepositoryBase(name, RepositoryCapabilities::create()
+FakeInstalledRepository::FakeInstalledRepository(const RepositoryName & our_name) :
+ FakeRepositoryBase(our_name, RepositoryCapabilities::create()
.installable_interface(0)
.installed_interface(this)
.mask_interface(this)
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index fd81055..f573ef0 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -21,8 +21,8 @@
using namespace paludis;
-FakeRepository::FakeRepository(const RepositoryName & name) :
- FakeRepositoryBase(name, RepositoryCapabilities::create()
+FakeRepository::FakeRepository(const RepositoryName & our_name) :
+ FakeRepositoryBase(our_name, RepositoryCapabilities::create()
.installable_interface(this)
.installed_interface(0)
.mask_interface(this)
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index e2c2d19..5415eac 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -69,8 +69,8 @@ namespace paludis
}
}
-FakeRepositoryBase::FakeRepositoryBase(const RepositoryName & name, const RepositoryCapabilities & caps) :
- Repository(name, caps),
+FakeRepositoryBase::FakeRepositoryBase(const RepositoryName & our_name, const RepositoryCapabilities & caps) :
+ Repository(our_name, caps),
RepositoryMaskInterface(),
RepositoryUseInterface(),
PrivateImplementationPattern<FakeRepositoryBase>(new Implementation<FakeRepositoryBase>)
diff --git a/paludis/repositories/portage/portage_repository_ebin_entries.cc b/paludis/repositories/portage/portage_repository_ebin_entries.cc
index 99d05ef..5137c58 100644
--- a/paludis/repositories/portage/portage_repository_ebin_entries.cc
+++ b/paludis/repositories/portage/portage_repository_ebin_entries.cc
@@ -135,8 +135,8 @@ PortageRepositoryEbinEntries::install(const QualifiedPackageName & q, const Vers
for (DepAtomFlattener::Iterator ff(f.begin()), ff_end(f.end()) ; ff != ff_end ; ++ff)
{
- std::string::size_type p((*ff)->text().rfind('/'));
- if (std::string::npos == p)
+ std::string::size_type pos((*ff)->text().rfind('/'));
+ if (std::string::npos == pos)
{
if (already_in_binaries.end() == already_in_binaries.find((*ff)->text()))
{
@@ -146,10 +146,10 @@ PortageRepositoryEbinEntries::install(const QualifiedPackageName & q, const Vers
}
else
{
- if (already_in_binaries.end() == already_in_binaries.find((*ff)->text().substr(p + 1)))
+ if (already_in_binaries.end() == already_in_binaries.find((*ff)->text().substr(pos + 1)))
{
- binaries.append((*ff)->text().substr(p + 1));
- already_in_binaries.insert((*ff)->text().substr(p + 1));
+ binaries.append((*ff)->text().substr(pos + 1));
+ already_in_binaries.insert((*ff)->text().substr(pos + 1));
}
}
binaries.append(" ");
@@ -159,33 +159,33 @@ PortageRepositoryEbinEntries::install(const QualifiedPackageName & q, const Vers
m(_imp->params.environment->begin_mirrors("*")),
m_end(_imp->params.environment->end_mirrors("*")) ;
m != m_end ; ++m)
- flat_bin_uri.append(m->second + "/" + (*ff)->text().substr(p + 1) + " ");
+ flat_bin_uri.append(m->second + "/" + (*ff)->text().substr(pos + 1) + " ");
if (0 == (*ff)->text().compare(0, 9, "mirror://"))
{
std::string mirror((*ff)->text().substr(9));
- std::string::size_type q(mirror.find('/'));
+ std::string::size_type s_pos(mirror.find('/'));
- if (std::string::npos == q)
+ if (std::string::npos == s_pos)
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ stringify(v) + "' since SRC_URI is broken");
- if (! _imp->portage_repository->is_mirror(mirror.substr(0, q)))
- throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ if (! _imp->portage_repository->is_mirror(mirror.substr(0, s_pos)))
+ throw PackageInstallActionError("Can't install '" + stringify(s_pos) + "-"
+ stringify(v) + "' since SRC_URI references unknown mirror:// '" +
- mirror.substr(0, q) + "'");
+ mirror.substr(0, s_pos) + "'");
for (Environment::MirrorIterator
- m(_imp->params.environment->begin_mirrors(mirror.substr(0, q))),
- m_end(_imp->params.environment->end_mirrors(mirror.substr(0, q))) ;
+ m(_imp->params.environment->begin_mirrors(mirror.substr(0, s_pos))),
+ m_end(_imp->params.environment->end_mirrors(mirror.substr(0, s_pos))) ;
m != m_end ; ++m)
- flat_bin_uri.append(m->second + "/" + mirror.substr(q + 1) + " ");
+ flat_bin_uri.append(m->second + "/" + mirror.substr(s_pos + 1) + " ");
for (RepositoryMirrorsInterface::MirrorsIterator
- m(_imp->portage_repository->begin_mirrors(mirror.substr(0, q))),
- m_end(_imp->portage_repository->end_mirrors(mirror.substr(0, q))) ;
+ m(_imp->portage_repository->begin_mirrors(mirror.substr(0, s_pos))),
+ m_end(_imp->portage_repository->end_mirrors(mirror.substr(0, s_pos))) ;
m != m_end ; ++m)
- flat_bin_uri.append(m->second + "/" + mirror.substr(q + 1) + " ");
+ flat_bin_uri.append(m->second + "/" + mirror.substr(s_pos + 1) + " ");
}
else
flat_bin_uri.append((*ff)->text());
@@ -199,13 +199,13 @@ PortageRepositoryEbinEntries::install(const QualifiedPackageName & q, const Vers
m(_imp->params.environment->begin_mirrors(master_mirror)),
m_end(_imp->params.environment->end_mirrors(master_mirror)) ;
m != m_end ; ++m)
- flat_bin_uri.append(m->second + "/" + (*ff)->text().substr(p + 1) + " ");
+ flat_bin_uri.append(m->second + "/" + (*ff)->text().substr(pos + 1) + " ");
for (RepositoryMirrorsInterface::MirrorsIterator
m(_imp->portage_repository->begin_mirrors(master_mirror)),
m_end(_imp->portage_repository->end_mirrors(master_mirror)) ;
m != m_end ; ++m)
- flat_bin_uri.append(m->second + "/" + (*ff)->text().substr(p + 1) + " ");
+ flat_bin_uri.append(m->second + "/" + (*ff)->text().substr(pos + 1) + " ");
}
}
}
diff --git a/paludis/repositories/portage/portage_repository_ebuild_entries.cc b/paludis/repositories/portage/portage_repository_ebuild_entries.cc
index 3bb5a47..60d1628 100644
--- a/paludis/repositories/portage/portage_repository_ebuild_entries.cc
+++ b/paludis/repositories/portage/portage_repository_ebuild_entries.cc
@@ -280,8 +280,8 @@ PortageRepositoryEbuildEntries::install(const QualifiedPackageName & q, const Ve
for (DepAtomFlattener::Iterator ff(f.begin()), ff_end(f.end()) ; ff != ff_end ; ++ff)
{
- std::string::size_type p((*ff)->text().rfind('/'));
- if (std::string::npos == p)
+ std::string::size_type pos((*ff)->text().rfind('/'));
+ if (std::string::npos == pos)
{
if (already_in_archives.end() == already_in_archives.find((*ff)->text()))
{
@@ -291,10 +291,10 @@ PortageRepositoryEbuildEntries::install(const QualifiedPackageName & q, const Ve
}
else
{
- if (already_in_archives.end() == already_in_archives.find((*ff)->text().substr(p + 1)))
+ if (already_in_archives.end() == already_in_archives.find((*ff)->text().substr(pos + 1)))
{
- archives.append((*ff)->text().substr(p + 1));
- already_in_archives.insert((*ff)->text().substr(p + 1));
+ archives.append((*ff)->text().substr(pos + 1));
+ already_in_archives.insert((*ff)->text().substr(pos + 1));
}
}
archives.append(" ");
@@ -304,33 +304,33 @@ PortageRepositoryEbuildEntries::install(const QualifiedPackageName & q, const Ve
m(_imp->params.environment->begin_mirrors("*")),
m_end(_imp->params.environment->end_mirrors("*")) ;
m != m_end ; ++m)
- flat_src_uri.append(m->second + "/" + (*ff)->text().substr(p + 1) + " ");
+ flat_src_uri.append(m->second + "/" + (*ff)->text().substr(pos + 1) + " ");
if (0 == (*ff)->text().compare(0, 9, "mirror://"))
{
std::string mirror((*ff)->text().substr(9));
- std::string::size_type q(mirror.find('/'));
+ std::string::size_type spos(mirror.find('/'));
- if (std::string::npos == q)
+ if (std::string::npos == spos)
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ stringify(v) + "' since SRC_URI is broken");
- if (! _imp->portage_repository->is_mirror(mirror.substr(0, q)))
- throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ if (! _imp->portage_repository->is_mirror(mirror.substr(0, spos)))
+ throw PackageInstallActionError("Can't install '" + stringify(spos) + "-"
+ stringify(v) + "' since SRC_URI references unknown mirror:// '" +
- mirror.substr(0, q) + "'");
+ mirror.substr(0, spos) + "'");
for (Environment::MirrorIterator
- m(_imp->params.environment->begin_mirrors(mirror.substr(0, q))),
- m_end(_imp->params.environment->end_mirrors(mirror.substr(0, q))) ;
+ m(_imp->params.environment->begin_mirrors(mirror.substr(0, spos))),
+ m_end(_imp->params.environment->end_mirrors(mirror.substr(0, spos))) ;
m != m_end ; ++m)
- flat_src_uri.append(m->second + "/" + mirror.substr(q + 1) + " ");
+ flat_src_uri.append(m->second + "/" + mirror.substr(spos + 1) + " ");
for (RepositoryMirrorsInterface::MirrorsIterator
- m(_imp->portage_repository->begin_mirrors(mirror.substr(0, q))),
- m_end(_imp->portage_repository->end_mirrors(mirror.substr(0, q))) ;
+ m(_imp->portage_repository->begin_mirrors(mirror.substr(0, spos))),
+ m_end(_imp->portage_repository->end_mirrors(mirror.substr(0, spos))) ;
m != m_end ; ++m)
- flat_src_uri.append(m->second + "/" + mirror.substr(q + 1) + " ");
+ flat_src_uri.append(m->second + "/" + mirror.substr(spos + 1) + " ");
}
else
flat_src_uri.append((*ff)->text());
@@ -344,13 +344,13 @@ PortageRepositoryEbuildEntries::install(const QualifiedPackageName & q, const Ve
m(_imp->params.environment->begin_mirrors(master_mirror)),
m_end(_imp->params.environment->end_mirrors(master_mirror)) ;
m != m_end ; ++m)
- flat_src_uri.append(m->second + "/" + (*ff)->text().substr(p + 1) + " ");
+ flat_src_uri.append(m->second + "/" + (*ff)->text().substr(pos + 1) + " ");
for (RepositoryMirrorsInterface::MirrorsIterator
m(_imp->portage_repository->begin_mirrors(master_mirror)),
m_end(_imp->portage_repository->end_mirrors(master_mirror)) ;
m != m_end ; ++m)
- flat_src_uri.append(m->second + "/" + (*ff)->text().substr(p + 1) + " ");
+ flat_src_uri.append(m->second + "/" + (*ff)->text().substr(pos + 1) + " ");
}
}
@@ -363,8 +363,8 @@ PortageRepositoryEbuildEntries::install(const QualifiedPackageName & q, const Ve
for (AAFinder::Iterator gg(g.begin()), gg_end(g.end()) ; gg != gg_end ; ++gg)
{
- std::string::size_type p((*gg)->text().rfind('/'));
- if (std::string::npos == p)
+ std::string::size_type pos((*gg)->text().rfind('/'));
+ if (std::string::npos == pos)
{
if (already_in_all_archives.end() == already_in_all_archives.find((*gg)->text()))
{
@@ -374,10 +374,10 @@ PortageRepositoryEbuildEntries::install(const QualifiedPackageName & q, const Ve
}
else
{
- if (already_in_all_archives.end() == already_in_all_archives.find((*gg)->text().substr(p + 1)))
+ if (already_in_all_archives.end() == already_in_all_archives.find((*gg)->text().substr(pos + 1)))
{
- all_archives.append((*gg)->text().substr(p + 1));
- already_in_all_archives.insert((*gg)->text().substr(p + 1));
+ all_archives.append((*gg)->text().substr(pos + 1));
+ already_in_all_archives.insert((*gg)->text().substr(pos + 1));
}
}
all_archives.append(" ");
diff --git a/paludis/repositories/portage/portage_repository_news.cc b/paludis/repositories/portage/portage_repository_news.cc
index 369970d..8936219 100644
--- a/paludis/repositories/portage/portage_repository_news.cc
+++ b/paludis/repositories/portage/portage_repository_news.cc
@@ -212,8 +212,8 @@ namespace paludis
};
}
-NewsFile::NewsFile(const FSEntry & filename) :
- ConfigFile(filename),
+NewsFile::NewsFile(const FSEntry & our_filename) :
+ ConfigFile(our_filename),
PrivateImplementationPattern<NewsFile>(new Implementation<NewsFile>)
{
need_lines();
diff --git a/paludis/repositories/portage/portage_repository_sets.cc b/paludis/repositories/portage/portage_repository_sets.cc
index b2c92e8..4b4dce3 100644
--- a/paludis/repositories/portage/portage_repository_sets.cc
+++ b/paludis/repositories/portage/portage_repository_sets.cc
@@ -315,7 +315,7 @@ PortageRepositorySets::security_set(const PackageSetOptions & o) const
for ( ; f != f_end; ++f)
{
- Context c("When parsing security advisory '" + stringify(*f) + "':");
+ Context context("When parsing security advisory '" + stringify(*f) + "':");
try
{
@@ -327,7 +327,7 @@ PortageRepositorySets::security_set(const PackageSetOptions & o) const
AdvisoryFile::LineIterator a(advisory.begin_affected()), a_end(advisory.end_affected());
for ( ; a != a_end ; ++a)
{
- Context c("When parsing line 'Affected: " + *a + "':");
+ Context local_context("When parsing line 'Affected: " + *a + "':");
CompositeDepAtom::ConstPointer line(PortageDepParser::parse(*a));
AdvisoryVisitor atoms(_imp->environment, *line);
@@ -362,7 +362,7 @@ PortageRepositorySets::security_set(const PackageSetOptions & o) const
AdvisoryFile::LineIterator u(advisory.begin_unaffected()), u_end(advisory.end_unaffected());
for ( ; u != u_end ; ++u)
{
- Context c("When parsing line 'Unaffected: " + *u + "':");
+ Context local_c("When parsing line 'Unaffected: " + *u + "':");
CompositeDepAtom::ConstPointer line(PortageDepParser::parse(*u));
AdvisoryVisitor atoms(_imp->environment, *line);
@@ -391,9 +391,9 @@ PortageRepositorySets::security_set(const PackageSetOptions & o) const
{
unaffected.insert(*p);
std::set<std::pair<PackageDatabaseEntry, std::string> >::iterator
- a(affected.find(std::make_pair(*p, advisory_id)));
- if (a != affected.end())
- affected.erase(a);
+ aff(affected.find(std::make_pair(*p, advisory_id)));
+ if (aff != affected.end())
+ affected.erase(aff);
}
}
}
@@ -422,7 +422,7 @@ PortageRepositorySets::security_set(const PackageSetOptions & o) const
{
for ( ; i != i_end ; ++i)
{
- Context c("When creating adding vulnerable package '" + stringify(i->first) + "':");
+ Context context("When creating adding vulnerable package '" + stringify(i->first) + "':");
PackageDepAtom::Pointer p(make_atom(i->first));
p->set_tag(GLSADepTag::Pointer(new GLSADepTag(i->second, advisory_map[i->second])));
@@ -433,7 +433,7 @@ PortageRepositorySets::security_set(const PackageSetOptions & o) const
{
for ( ; i != i_end ; ++i)
{
- Context c("When finding best update for package '" + stringify(i->first) +
+ Context context("When finding best update for package '" + stringify(i->first) +
"', affected by '" + i->second + "':");
PackageDatabaseEntryCollection::Iterator best = find_best(unaffected, i->first);
diff --git a/paludis/repository.cc b/paludis/repository.cc
index b5441b7..54a2436 100644
--- a/paludis/repository.cc
+++ b/paludis/repository.cc
@@ -34,10 +34,10 @@ using namespace paludis;
#include <paludis/repository-sr.cc>
Repository::Repository(
- const RepositoryName & name,
+ const RepositoryName & our_name,
const RepositoryCapabilities & caps) :
RepositoryCapabilities(caps),
- _name(name),
+ _name(our_name),
_info(new RepositoryInfo)
{
}
@@ -117,10 +117,10 @@ RepositoryInfo::add_section(RepositoryInfoSection::ConstPointer s)
return *this;
}
-RepositoryInfoSection::RepositoryInfoSection(const std::string & heading) :
+RepositoryInfoSection::RepositoryInfoSection(const std::string & our_heading) :
PrivateImplementationPattern<RepositoryInfoSection>(new Implementation<RepositoryInfoSection>)
{
- _imp->heading = heading;
+ _imp->heading = our_heading;
}
RepositoryInfoSection::~RepositoryInfoSection()
diff --git a/paludis/selinux/security_context.hh b/paludis/selinux/security_context.hh
index 5255c60..b0323ee 100644
--- a/paludis/selinux/security_context.hh
+++ b/paludis/selinux/security_context.hh
@@ -47,9 +47,10 @@ namespace paludis {
{
public:
/// Constructor.
- SELinuxException(const std::string & message)
- : Exception(message)
- { }
+ SELinuxException(const std::string & our_message)
+ : Exception(our_message)
+ {
+ }
};
/**
diff --git a/paludis/tasks/uninstall_task.hh b/paludis/tasks/uninstall_task.hh
index 6acccb0..84d341e 100644
--- a/paludis/tasks/uninstall_task.hh
+++ b/paludis/tasks/uninstall_task.hh
@@ -37,10 +37,10 @@ namespace paludis
const PackageDatabaseEntryCollection::ConstPointer _p;
public:
- AmbiguousUnmergeTargetError(const std::string & target,
+ AmbiguousUnmergeTargetError(const std::string & our_target,
const PackageDatabaseEntryCollection::ConstPointer matches) throw () :
- Exception("Ambiguous unmerge target '" + target + "'"),
- _t(target),
+ Exception("Ambiguous unmerge target '" + our_target + "'"),
+ _t(our_target),
_p(matches)
{
}
diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc
index 25736d2..64caccb 100644
--- a/paludis/util/exception.cc
+++ b/paludis/util/exception.cc
@@ -64,8 +64,8 @@ struct Exception::ContextData :
{
};
-Exception::Exception(const std::string & message) throw () :
- _message(message),
+Exception::Exception(const std::string & our_message) throw () :
+ _message(our_message),
_context_data(new ContextData)
{
}
@@ -100,8 +100,8 @@ Exception::backtrace(const std::string & delim) const
return _context_data->backtrace(delim);
}
-InternalError::InternalError(const std::string & where, const std::string & message) throw () :
- Exception("Eek! Internal error at " + where + ": " + message)
+InternalError::InternalError(const std::string & where, const std::string & our_message) throw () :
+ Exception("Eek! Internal error at " + where + ": " + our_message)
{
}
diff --git a/paludis/util/fs_entry.cc b/paludis/util/fs_entry.cc
index d052392..117bddb 100644
--- a/paludis/util/fs_entry.cc
+++ b/paludis/util/fs_entry.cc
@@ -38,8 +38,8 @@
using namespace paludis;
-FSError::FSError(const std::string & message) throw () :
- Exception(message)
+FSError::FSError(const std::string & our_message) throw () :
+ Exception(our_message)
{
}
@@ -402,9 +402,9 @@ FSEntry::readlink() const
}
void
-FSEntry::chown(const uid_t owner, const gid_t group)
+FSEntry::chown(const uid_t new_owner, const gid_t new_group)
{
- if (0 != ::chown(_path.c_str(), owner, group))
+ if (0 != ::chown(_path.c_str(), new_owner, new_group))
throw FSError("chown '" + _path + "' failed: " + ::strerror(errno));
}
diff --git a/paludis/util/pstream.cc b/paludis/util/pstream.cc
index 069d432..8c4ef3a 100644
--- a/paludis/util/pstream.cc
+++ b/paludis/util/pstream.cc
@@ -34,8 +34,8 @@
using namespace paludis;
-PStreamError::PStreamError(const std::string & message) throw () :
- Exception(message)
+PStreamError::PStreamError(const std::string & our_message) throw () :
+ Exception(our_message)
{
}
diff --git a/paludis/util/system.cc b/paludis/util/system.cc
index e4b2952..706b11b 100644
--- a/paludis/util/system.cc
+++ b/paludis/util/system.cc
@@ -123,8 +123,8 @@ GetenvError::GetenvError(const std::string & key) throw () :
{
}
-RunCommandError::RunCommandError(const std::string & message) throw () :
- Exception(message)
+RunCommandError::RunCommandError(const std::string & our_message) throw () :
+ Exception(our_message)
{
}
diff --git a/src/paludis/install.cc b/src/paludis/install.cc
index f61f6c0..95ca214 100644
--- a/src/paludis/install.cc
+++ b/src/paludis/install.cc
@@ -700,15 +700,15 @@ do_install()
}
else if (mr_keyword == mm)
{
- VersionMetadata::ConstPointer m(DefaultEnvironment::get_instance()->
+ VersionMetadata::ConstPointer meta(DefaultEnvironment::get_instance()->
package_database()->fetch_repository(
pp->repository)->version_metadata(
pp->name, pp->version));
- if (m->get_ebuild_interface())
+ if (meta->get_ebuild_interface())
{
std::set<KeywordName> keywords;
WhitespaceTokeniser::get_instance()->tokenise(
- m->get_ebuild_interface()->keywords,
+ meta->get_ebuild_interface()->keywords,
create_inserter<KeywordName>(
std::inserter(keywords, keywords.end())));
diff --git a/test/test_framework.cc b/test/test_framework.cc
index fc03194..e34798e 100644
--- a/test/test_framework.cc
+++ b/test/test_framework.cc
@@ -137,8 +137,8 @@ namespace paludis
};
}
-TestCase::TestCase(const std::string & name) :
- paludis::PrivateImplementationPattern<TestCase>(new paludis::Implementation<TestCase>(name))
+TestCase::TestCase(const std::string & our_name) :
+ paludis::PrivateImplementationPattern<TestCase>(new paludis::Implementation<TestCase>(our_name))
{
TestCaseList::register_test_case(this);
}