diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index 3da0c03ac..d89d901b6 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -324,22 +324,21 @@ void SpreaderOrder::_report_state () bts::api::orderman::OrderStatus SpreaderOrder::_get_order_status () { SpreaderState curr_state = _state_worker == nullptr ? SpreaderState::START : _state_worker->state(); - bts::api::orderman::OrderStatus rv; switch (curr_state) { case SpreaderState::WORKING: - rv = bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; - break; + return bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; case SpreaderState::WAITING_FOR_CANCEL_ALL: - rv = bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; - break; + return bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; case SpreaderState::END: - rv = _cancelled ? bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED : bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - break; + return _cancelled ? + bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED : + bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; case SpreaderState::START: - rv = bts::api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; - break; + return bts::api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; + default: + bts_assert(false); + return bts::api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } - return rv; } }}