Skip to content

Commit

Permalink
Change c-style casts of size_t to static_cast (#929)
Browse files Browse the repository at this point in the history 
Signed-off-by: Piet Gömpel <[email protected]>
  • Loading branch information
@Pietfried
Pietfried authored Jan 6, 2025
1 parent e333c07 commit 83b3aa0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions lib/ocpp/v16/charge_point_impl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ void ChargePointImpl::init_state_machine(const std::map<int, ChargePointStatus>&
}
this->status->reset(_connector_status_map);
} else {
if ((size_t)this->configuration->getNumberOfConnectors() + 1 != connector_status_map.size()) {
if (static_cast<size_t>(this->configuration->getNumberOfConnectors()) + 1 != connector_status_map.size()) {
throw std::runtime_error(
"Number of configured connectors doesn't match number of connectors in the database.");
}
Expand Down Expand Up @@ -3768,7 +3768,7 @@ void ChargePointImpl::handle_data_transfer_pnc_certificate_signed(Call<DataTrans
"V2GCertificate";
EVLOG_warning << tech_info;
} else if (this->configuration->getCertificateSignedMaxChainSize().has_value() and
(size_t) this->configuration->getCertificateSignedMaxChainSize().value() <
static_cast<size_t>(this->configuration->getCertificateSignedMaxChainSize().value()) <
req.certificateChain.get().size()) {
tech_info = "Received DataTransfer.req containing CertificateSigned.req where chain size is greater "
"than configured CertificateSignedMaxChainSize";
Expand Down
12 changes: 6 additions & 6 deletions lib/ocpp/v16/charge_point_state_machine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ void ChargePointStates::submit_event(const int connector_id, FSMEvent event, con
const std::lock_guard<std::mutex> lck(state_machines_mutex);
if (connector_id == 0) {
this->state_machine_connector_zero->handle_event(event, timestamp, info);
} else if (connector_id > 0 && (size_t)connector_id <= this->state_machines.size()) {
} else if (connector_id > 0 && static_cast<size_t>(connector_id) <= this->state_machines.size()) {
this->state_machines.at(connector_id - 1).handle_event(event, timestamp, info);
}
}
Expand All @@ -318,7 +318,7 @@ void ChargePointStates::submit_error(const int connector_id, const ErrorInfo& er
const std::lock_guard<std::mutex> lck(state_machines_mutex);
if (connector_id == 0) {
this->state_machine_connector_zero->handle_error(error_info);
} else if (connector_id > 0 && (size_t)connector_id <= state_machines.size()) {
} else if (connector_id > 0 && static_cast<size_t>(connector_id) <= state_machines.size()) {
state_machines.at(connector_id - 1).handle_error(error_info);
}
}
Expand All @@ -327,7 +327,7 @@ void ChargePointStates::submit_error_cleared(const int connector_id, const std::
const std::lock_guard<std::mutex> lck(state_machines_mutex);
if (connector_id == 0) {
this->state_machine_connector_zero->handle_error_cleared(uuid);
} else if (connector_id > 0 && (size_t)connector_id <= state_machines.size()) {
} else if (connector_id > 0 && static_cast<size_t>(connector_id) <= state_machines.size()) {
state_machines.at(connector_id - 1).handle_error_cleared(uuid);
}
}
Expand All @@ -336,7 +336,7 @@ void ChargePointStates::submit_all_errors_cleared(const int32_t connector_id) {
const std::lock_guard<std::mutex> lck(state_machines_mutex);
if (connector_id == 0) {
this->state_machine_connector_zero->handle_all_errors_cleared();
} else if (connector_id > 0 && (size_t)connector_id <= state_machines.size()) {
} else if (connector_id > 0 && static_cast<size_t>(connector_id) <= state_machines.size()) {
state_machines.at(connector_id - 1).handle_all_errors_cleared();
}
}
Expand All @@ -360,7 +360,7 @@ void ChargePointStates::trigger_status_notifications() {

ChargePointStatus ChargePointStates::get_state(int connector_id) {
const std::lock_guard<std::mutex> lck(state_machines_mutex);
if (connector_id > 0 && (size_t)connector_id <= this->state_machines.size()) {
if (connector_id > 0 && static_cast<size_t>(connector_id) <= this->state_machines.size()) {
return state_machines.at(connector_id - 1).get_state();
} else if (connector_id == 0) {
return state_machine_connector_zero->get_state();
Expand All @@ -372,7 +372,7 @@ ChargePointStatus ChargePointStates::get_state(int connector_id) {

std::optional<ErrorInfo> ChargePointStates::get_latest_error(int connector_id) {
const std::lock_guard<std::mutex> lck(state_machines_mutex);
if (connector_id > 0 && (size_t)connector_id <= this->state_machines.size()) {
if (connector_id > 0 && static_cast<size_t>(connector_id) <= this->state_machines.size()) {
return state_machines.at(connector_id - 1).get_latest_error();
} else {
return state_machine_connector_zero->get_latest_error();
Expand Down
4 changes: 2 additions & 2 deletions lib/ocpp/v16/smart_charging.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace v16 {
bool validate_schedule(const ChargingSchedule& schedule, const int charging_schedule_max_periods,
const std::vector<ChargingRateUnit>& charging_schedule_allowed_charging_rate_units) {

if (schedule.chargingSchedulePeriod.size() > (size_t)charging_schedule_max_periods) {
if (schedule.chargingSchedulePeriod.size() > static_cast<size_t>(charging_schedule_max_periods)) {
EVLOG_warning << "INVALID SCHEDULE - Number of chargingSchedulePeriod(s) is greater than configured "
"ChargingScheduleMaxPeriods of "
<< charging_schedule_max_periods;
Expand Down Expand Up @@ -166,7 +166,7 @@ bool SmartChargingHandler::validate_profile(
ChargingProfile& profile, const int connector_id, bool ignore_no_transaction, const int profile_max_stack_level,
const int max_charging_profiles_installed, const int charging_schedule_max_periods,
const std::vector<ChargingRateUnit>& charging_schedule_allowed_charging_rate_units) {
if ((size_t)connector_id >= this->connectors.size() or connector_id < 0 or profile.stackLevel < 0 or
if (static_cast<size_t>(connector_id) >= this->connectors.size() or connector_id < 0 or profile.stackLevel < 0 or
profile.stackLevel > profile_max_stack_level) {
EVLOG_warning << "INVALID PROFILE - connector_id invalid or invalid stack level";
return false;
Expand Down

0 comments on commit 83b3aa0

Please sign in to comment.