From 1ab1daa61b24807fea8f1cda6eb7e8708532e527 Mon Sep 17 00:00:00 2001 From: Petr Stefan Date: Thu, 24 May 2018 23:14:59 +0200 Subject: [PATCH] Fix clang warnings --- recodex-worker.spec | 4 ++-- src/config/worker_config.cpp | 2 +- src/connection_proxy.h | 2 +- src/helpers/zmq_socket.cpp | 2 +- src/job/job.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recodex-worker.spec b/recodex-worker.spec index 0c40b7aa..f640ca4a 100644 --- a/recodex-worker.spec +++ b/recodex-worker.spec @@ -1,8 +1,8 @@ %define name recodex-worker %define short_name worker %define version 1.4.1 -%define unmangled_version 72f6cb41b5d37b4093e3181b2e37209a6a3087f5 -%define release 1 +%define unmangled_version 1d19a029d0758fbefb28164063384f0a1a03ef77 +%define release 2 %define spdlog_name spdlog %define spdlog_version 0.13.0 diff --git a/src/config/worker_config.cpp b/src/config/worker_config.cpp index 037d270a..24cd92a6 100644 --- a/src/config/worker_config.cpp +++ b/src/config/worker_config.cpp @@ -153,7 +153,7 @@ worker_config::worker_config(const YAML::Node &config) try { auto bound_dirs = helpers::get_bind_dirs(limits); limits_.add_bound_dirs(bound_dirs); - } catch (helpers::config_exception e) { + } catch (helpers::config_exception &e) { throw config_error(e.what()); } diff --git a/src/connection_proxy.h b/src/connection_proxy.h index 912bca31..3dd1c9bd 100644 --- a/src/connection_proxy.h +++ b/src/connection_proxy.h @@ -92,7 +92,7 @@ class connection_proxy auto time_after_poll = std::chrono::system_clock::now(); elapsed_time = std::chrono::duration_cast(time_after_poll - time_before_poll); - } catch (zmq::error_t) { + } catch (zmq::error_t &) { terminate = true; return; } diff --git a/src/helpers/zmq_socket.cpp b/src/helpers/zmq_socket.cpp index d723f354..a4a4a785 100644 --- a/src/helpers/zmq_socket.cpp +++ b/src/helpers/zmq_socket.cpp @@ -23,7 +23,7 @@ bool helpers::recv_from_socket(zmq::socket_t &socket, std::vector & try { retval = socket.recv(&msg); - } catch (zmq::error_t) { + } catch (zmq::error_t &) { if (terminate != nullptr) { *terminate = true; } diff --git a/src/job/job.cpp b/src/job/job.cpp index 92b736fa..611f4d85 100644 --- a/src/job/job.cpp +++ b/src/job/job.cpp @@ -300,7 +300,7 @@ void job::connect_tasks( auto ptr = unconn_tasks.at(depend.at(i)); ptr->add_children(elem.second); elem.second->add_parent(ptr); - } catch (std::out_of_range) { + } catch (std::out_of_range &) { throw job_exception("Non existing task-id (" + depend.at(i) + ") in dependency list"); } } @@ -408,7 +408,7 @@ void job::init_logger() file_logger->info(" Job system log"); file_logger->info("------------------------------"); logger_ = file_logger; - } catch (spdlog::spdlog_ex) { + } catch (spdlog::spdlog_ex &) { // Suppose not happen. But in case, create only empty logger. logger_ = helpers::create_null_logger(); }