From 876d4150aa3da531ddd687b48afada6e43f79146 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 2 Mar 2020 15:25:13 -0800 Subject: uhd: Apply clang-format against all .cpp and .hpp files in host/ Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of files that clang-format gets applied against. --- host/lib/utils/load_modules.cpp | 65 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 33 deletions(-) (limited to 'host/lib/utils/load_modules.cpp') diff --git a/host/lib/utils/load_modules.cpp b/host/lib/utils/load_modules.cpp index c862a0abd..cac678975 100644 --- a/host/lib/utils/load_modules.cpp +++ b/host/lib/utils/load_modules.cpp @@ -5,11 +5,11 @@ // SPDX-License-Identifier: GPL-3.0-or-later // +#include #include #include -#include -#include #include +#include #include #include #include @@ -20,34 +20,34 @@ namespace fs = boost::filesystem; * Module Load Function **********************************************************************/ #ifdef HAVE_DLOPEN -#include -static void load_module(const std::string &file_name){ - if (dlopen(file_name.c_str(), RTLD_LAZY) == NULL){ - throw uhd::os_error(str( - boost::format("dlopen failed to load \"%s\"") % file_name - )); +# include +static void load_module(const std::string& file_name) +{ + if (dlopen(file_name.c_str(), RTLD_LAZY) == NULL) { + throw uhd::os_error( + str(boost::format("dlopen failed to load \"%s\"") % file_name)); } } #endif /* HAVE_DLOPEN */ #ifdef HAVE_LOAD_LIBRARY -#include -static void load_module(const std::string &file_name){ - if (LoadLibrary(file_name.c_str()) == NULL){ - throw uhd::os_error(str( - boost::format("LoadLibrary failed to load \"%s\"") % file_name - )); +# include +static void load_module(const std::string& file_name) +{ + if (LoadLibrary(file_name.c_str()) == NULL) { + throw uhd::os_error( + str(boost::format("LoadLibrary failed to load \"%s\"") % file_name)); } } #endif /* HAVE_LOAD_LIBRARY */ #ifdef HAVE_LOAD_MODULES_DUMMY -static void load_module(const std::string &file_name){ +static void load_module(const std::string& file_name) +{ throw uhd::not_implemented_error(str( - boost::format("Module loading not supported: Cannot load \"%s\"") % file_name - )); + boost::format("Module loading not supported: Cannot load \"%s\"") % file_name)); } #endif /* HAVE_LOAD_MODULES_DUMMY */ @@ -60,29 +60,27 @@ static void load_module(const std::string &file_name){ * Does not throw, prints to std error. * \param path the filesystem path */ -static void load_module_path(const fs::path &path){ - if (not fs::exists(path)){ - //std::cerr << boost::format("Module path \"%s\" not found.") % path.string() << std::endl; +static void load_module_path(const fs::path& path) +{ + if (not fs::exists(path)) { + // std::cerr << boost::format("Module path \"%s\" not found.") % path.string() << + // std::endl; return; } - //try to load the files in this path - if (fs::is_directory(path)){ - for( - fs::directory_iterator dir_itr(path); - dir_itr != fs::directory_iterator(); - ++dir_itr - ){ + // try to load the files in this path + if (fs::is_directory(path)) { + for (fs::directory_iterator dir_itr(path); dir_itr != fs::directory_iterator(); + ++dir_itr) { load_module_path(dir_itr->path()); } return; } - //its not a directory, try to load it - try{ + // its not a directory, try to load it + try { load_module(path.string()); - } - catch(const std::exception &err){ + } catch (const std::exception& err) { std::cerr << boost::format("Error: %s") % err.what() << std::endl; } } @@ -90,8 +88,9 @@ static void load_module_path(const fs::path &path){ /*! * Load all the modules given in the module paths. */ -UHD_STATIC_BLOCK(load_modules){ - for(const fs::path &path: uhd::get_module_paths()){ +UHD_STATIC_BLOCK(load_modules) +{ + for (const fs::path& path : uhd::get_module_paths()) { load_module_path(path); } } -- cgit v1.2.3