diff options
author | Roger Leigh <rleigh@debian.org> | 2013-04-28 19:38:50 +0100 |
---|---|---|
committer | Roger Leigh <rleigh@debian.org> | 2013-05-04 17:17:17 +0100 |
commit | 1951bfce584a87b695da7d7c06fefed95b00feb5 (patch) | |
tree | d1ce5a17f58d429c7af35b8c61a33125b00ad4ef /lib | |
parent | 7927b09e97ccfe31240ecdc172a23b7e759451b0 (diff) | |
download | schroot-1951bfce584a87b695da7d7c06fefed95b00feb5.tar.gz |
Reindent all sources
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bin-common/options.cc | 24 | ||||
-rw-r--r-- | lib/sbuild/chroot/facet/directory.cc | 6 | ||||
-rw-r--r-- | lib/sbuild/chroot/facet/session.cc | 2 | ||||
-rw-r--r-- | lib/sbuild/session.cc | 6 | ||||
-rw-r--r-- | lib/schroot-common/options.cc | 40 | ||||
-rw-r--r-- | lib/test/testmain.cc | 4 |
6 files changed, 41 insertions, 41 deletions
diff --git a/lib/bin-common/options.cc b/lib/bin-common/options.cc index 6b462fd6..1e77e00a 100644 --- a/lib/bin-common/options.cc +++ b/lib/bin-common/options.cc @@ -108,27 +108,27 @@ options::add_option_groups () #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!actions.options().empty()) #else - if (!actions.primary_keys().empty()) + if (!actions.primary_keys().empty()) #endif - { - visible.add(actions); - global.add(actions); - } + { + visible.add(actions); + global.add(actions); + } #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!general.options().empty()) #else - if (!general.primary_keys().empty()) + if (!general.primary_keys().empty()) #endif - { - visible.add(general); - global.add(general); - } + { + visible.add(general); + global.add(general); + } #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!hidden.options().empty()) #else - if (!hidden.primary_keys().empty()) + if (!hidden.primary_keys().empty()) #endif - global.add(hidden); + global.add(hidden); } void diff --git a/lib/sbuild/chroot/facet/directory.cc b/lib/sbuild/chroot/facet/directory.cc index 81dc297a..40597919 100644 --- a/lib/sbuild/chroot/facet/directory.cc +++ b/lib/sbuild/chroot/facet/directory.cc @@ -67,8 +67,8 @@ namespace sbuild { directory_base::set_chroot(chroot); #ifdef SBUILD_FEATURE_UNION - if (!owner->get_facet<fsunion>()) - owner->add_facet(fsunion::create()); + if (!owner->get_facet<fsunion>()) + owner->add_facet(fsunion::create()); #endif // SBUILD_FEATURE_UNION } @@ -92,7 +92,7 @@ namespace sbuild { return ptr(new directory(rhs)); } - #endif // SBUILD_FEATURE_BTRFSSNAP +#endif // SBUILD_FEATURE_BTRFSSNAP facet::ptr directory::clone () const diff --git a/lib/sbuild/chroot/facet/session.cc b/lib/sbuild/chroot/facet/session.cc index 71b3caac..2ebe37b9 100644 --- a/lib/sbuild/chroot/facet/session.cc +++ b/lib/sbuild/chroot/facet/session.cc @@ -132,7 +132,7 @@ namespace sbuild catch (lock::error const& e) { throw error(file, chroot::FILE_LOCK, e); - } + } keyfile details; owner->get_keyfile(details); diff --git a/lib/sbuild/session.cc b/lib/sbuild/session.cc index bd9c2b46..67eac134 100644 --- a/lib/sbuild/session.cc +++ b/lib/sbuild/session.cc @@ -627,7 +627,7 @@ session::run_impl () if (ch->get_session_flags() & chroot::chroot::SESSION_CREATE && (this->session_operation != OPERATION_AUTOMATIC && this->session_operation != OPERATION_BEGIN)) - throw error(chrootent.alias, CHROOT_NOTFOUND); + throw error(chrootent.alias, CHROOT_NOTFOUND); // For now, use a copy of the chroot; if we create a session // later, we will replace it. @@ -951,8 +951,8 @@ session::get_login_command (chroot::chroot::ptr& session_chroot, session_chroot->get_preserve_environment()) && session_chroot->get_command_prefix().empty(); - // Not keeping environment and can setup argv correctly; login shell - if (login_shell) + // Not keeping environment and can setup argv correctly; login shell + if (login_shell) { std::string shellbase = basename(shell); std::string loginshell = "-" + shellbase; diff --git a/lib/schroot-common/options.cc b/lib/schroot-common/options.cc index c1b9d4e9..077bcbc4 100644 --- a/lib/schroot-common/options.cc +++ b/lib/schroot-common/options.cc @@ -118,40 +118,40 @@ options::add_option_groups () #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!chroot.options().empty()) #else - if (!chroot.primary_keys().empty()) + if (!chroot.primary_keys().empty()) #endif - { - visible.add(chroot); - global.add(chroot); - } + { + visible.add(chroot); + global.add(chroot); + } #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!chrootenv.options().empty()) #else - if (!chrootenv.primary_keys().empty()) + if (!chrootenv.primary_keys().empty()) #endif - { - visible.add(chrootenv); - global.add(chrootenv); - } + { + visible.add(chrootenv); + global.add(chrootenv); + } #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!session_actions.options().empty()) #else - if (!session_actions.primary_keys().empty()) + if (!session_actions.primary_keys().empty()) #endif - { - visible.add(session_actions); - global.add(session_actions); - } + { + visible.add(session_actions); + global.add(session_actions); + } #ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD if (!session_options.options().empty()) #else - if (!session_options.primary_keys().empty()) + if (!session_options.primary_keys().empty()) #endif - { - visible.add(session_options); - global.add(session_options); - } + { + visible.add(session_options); + global.add(session_options); + } } void diff --git a/lib/test/testmain.cc b/lib/test/testmain.cc index 9f8ff5e1..97dd7b1f 100644 --- a/lib/test/testmain.cc +++ b/lib/test/testmain.cc @@ -31,9 +31,9 @@ int main() { #ifdef SBUILD_DEBUG - sbuild::debug_log_level = sbuild::DEBUG_NOTICE; + sbuild::debug_log_level = sbuild::DEBUG_NOTICE; #else - sbuild::debug_log_level = sbuild::DEBUG_NONE; + sbuild::debug_log_level = sbuild::DEBUG_NONE; #endif TextUi::TestRunner runner; |