Skip to content

Commit 735d8dd

Browse files
ritchiecarrollritchiecarroll
committed
Cleaned up remaining size_t to integer type conversions and suppressed PVS false warnings
1 parent 6070f84 commit 735d8dd

6 files changed

Lines changed: 17 additions & 15 deletions

File tree

‎src/lib/ThreadSafeQueue.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ namespace sttp
130130
uint32_t ThreadSafeQueue<T>::Size()
131131
{
132132
ScopeLock lock(m_mutex);
133-
return m_queue.size();
133+
return ConvertUInt32(m_queue.size());
134134
}
135135

136136
// Waits for data to be inserted into the queue.

‎src/lib/data/DataTable.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace data
6464

6565
const DataColumnPtr& operator[](const std::string& columnName) const;
6666

67-
const DataColumnPtr& operator[](int32_t index) const;
67+
const DataColumnPtr& operator[](int32_t index) const; //-V302
6868

6969
DataColumnPtr CreateColumn(const std::string& name, DataType type, std::string expression = std::string{});
7070

‎src/lib/filterexpressions/ExpressionTree.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ ExpressionValueType ExpressionTree::DeriveArithmeticOperationValueType(const Exp
10161016
return ExpressionValueType::Double;
10171017
case ExpressionValueType::String:
10181018
if (operationType == ExpressionOperatorType::Add)
1019-
return ExpressionValueType::String;
1019+
return ExpressionValueType::String; //-V796
10201020
case ExpressionValueType::Guid:
10211021
case ExpressionValueType::DateTime:
10221022
throw ExpressionTreeException("Cannot perform \"" + string(EnumName(operationType)) + "\" operation on \"Boolean\" and \"" + string(EnumName(rightValueType)) + "\"");
@@ -1037,7 +1037,7 @@ ExpressionValueType ExpressionTree::DeriveArithmeticOperationValueType(const Exp
10371037
return ExpressionValueType::Double;
10381038
case ExpressionValueType::String:
10391039
if (operationType == ExpressionOperatorType::Add)
1040-
return ExpressionValueType::String;
1040+
return ExpressionValueType::String; //-V796
10411041
case ExpressionValueType::Guid:
10421042
case ExpressionValueType::DateTime:
10431043
throw ExpressionTreeException("Cannot perform \"" + string(EnumName(operationType)) + "\" operation on \"Int32\" and \"" + string(EnumName(rightValueType)) + "\"");
@@ -1057,7 +1057,7 @@ ExpressionValueType ExpressionTree::DeriveArithmeticOperationValueType(const Exp
10571057
return ExpressionValueType::Double;
10581058
case ExpressionValueType::String:
10591059
if (operationType == ExpressionOperatorType::Add)
1060-
return ExpressionValueType::String;
1060+
return ExpressionValueType::String; //-V796
10611061
case ExpressionValueType::Guid:
10621062
case ExpressionValueType::DateTime:
10631063
throw ExpressionTreeException("Cannot perform \"" + string(EnumName(operationType)) + "\" operation on \"Int64\" and \"" + string(EnumName(rightValueType)) + "\"");
@@ -1076,7 +1076,7 @@ ExpressionValueType ExpressionTree::DeriveArithmeticOperationValueType(const Exp
10761076
return ExpressionValueType::Double;
10771077
case ExpressionValueType::String:
10781078
if (operationType == ExpressionOperatorType::Add)
1079-
return ExpressionValueType::String;
1079+
return ExpressionValueType::String; //-V796
10801080
case ExpressionValueType::Guid:
10811081
case ExpressionValueType::DateTime:
10821082
throw ExpressionTreeException("Cannot perform \"" + string(EnumName(operationType)) + "\" operation on \"Decimal\" and \"" + string(EnumName(rightValueType)) + "\"");
@@ -1094,7 +1094,7 @@ ExpressionValueType ExpressionTree::DeriveArithmeticOperationValueType(const Exp
10941094
return ExpressionValueType::Double;
10951095
case ExpressionValueType::String:
10961096
if (operationType == ExpressionOperatorType::Add)
1097-
return ExpressionValueType::String;
1097+
return ExpressionValueType::String; //-V796
10981098
case ExpressionValueType::Guid:
10991099
case ExpressionValueType::DateTime:
11001100
throw ExpressionTreeException("Cannot perform \"" + string(EnumName(operationType)) + "\" operation on \"Double\" and \"" + string(EnumName(rightValueType)) + "\"");
@@ -1103,7 +1103,7 @@ ExpressionValueType ExpressionTree::DeriveArithmeticOperationValueType(const Exp
11031103
}
11041104
case ExpressionValueType::String:
11051105
if (operationType == ExpressionOperatorType::Add)
1106-
return ExpressionValueType::String;
1106+
return ExpressionValueType::String; //-V796
11071107
case ExpressionValueType::Guid:
11081108
case ExpressionValueType::DateTime:
11091109
throw ExpressionTreeException("Cannot perform \"" + string(EnumName(operationType)) + "\" operation on \"" + string(EnumName(leftValueType)) + "\" and \"" + string(EnumName(rightValueType)) + "\"");

‎src/lib/transport/DataPublisher.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ void DataPublisher::DispatchUserCommand(SubscriberConnection* connection, uint32
249249
userCommandData->connection = connection;
250250
userCommandData->command = command;
251251

252-
for (size_t i = 0; i < length; i++)
252+
for (uint32_t i = 0; i < length; i++)
253253
userCommandData->data.push_back(data[i]);
254254

255255
Dispatch(&UserCommandDispatcher, reinterpret_cast<uint8_t*>(&userCommandData), 0, sizeof(UserCommandData**));
@@ -289,7 +289,7 @@ void DataPublisher::ClientConnectedDispatcher(DataPublisher* source, const vecto
289289
if (connectionPtr != nullptr)
290290
{
291291
const SubscriberConnectionCallback clientConnectedCallback = source->m_clientConnectedCallback;
292-
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr);
292+
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr); //-V821
293293

294294
if (clientConnectedCallback != nullptr)
295295
clientConnectedCallback(source, connectionRef);
@@ -325,7 +325,7 @@ void DataPublisher::ProcessingIntervalChangeRequestedDispatcher(DataPublisher* s
325325
if (connectionPtr != nullptr)
326326
{
327327
const SubscriberConnectionCallback temporalProcessingIntervalChangeRequestedCallback = source->m_processingIntervalChangeRequestedCallback;
328-
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr);
328+
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr); //-V821
329329

330330
if (temporalProcessingIntervalChangeRequestedCallback != nullptr)
331331
temporalProcessingIntervalChangeRequestedCallback(source, connectionRef);
@@ -342,7 +342,7 @@ void DataPublisher::TemporalSubscriptionRequestedDispatcher(DataPublisher* sourc
342342
if (connectionPtr != nullptr)
343343
{
344344
const SubscriberConnectionCallback temporalSubscriptionRequestedCallback = source->m_temporalSubscriptionRequestedCallback;
345-
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr);
345+
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr); //-V821
346346

347347
if (temporalSubscriptionRequestedCallback != nullptr)
348348
temporalSubscriptionRequestedCallback(source, connectionRef);
@@ -359,7 +359,7 @@ void DataPublisher::TemporalSubscriptionCanceledDispatcher(DataPublisher* source
359359
if (connectionPtr != nullptr)
360360
{
361361
const SubscriberConnectionCallback temporalSubscriptionCanceledCallback = source->m_temporalSubscriptionCanceledCallback;
362-
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr);
362+
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(connectionPtr); //-V821
363363

364364
if (temporalSubscriptionCanceledCallback != nullptr)
365365
temporalSubscriptionCanceledCallback(source, connectionRef);
@@ -376,7 +376,7 @@ void DataPublisher::UserCommandDispatcher(DataPublisher* source, const std::vect
376376
if (userCommandData != nullptr && userCommandData->connection != nullptr)
377377
{
378378
const UserCommandCallback userCommandCallback = source->m_userCommandCallback;
379-
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(userCommandData->connection);
379+
const SubscriberConnectionPtr connectionRef = source->ReleaseDispatchReference(userCommandData->connection); //-V821
380380

381381
if (userCommandCallback != nullptr)
382382
userCommandCallback(source, connectionRef, userCommandData->command, userCommandData->data);

‎src/lib/transport/DataSubscriber.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ void DataSubscriber::ProcessingCompleteDispatcher(DataSubscriber* source, const
10361036
{
10371037
stringstream messageStream;
10381038

1039-
for (uint32_t i = 0; i < buffer.size(); ++i)
1039+
for (uint32_t i = 0; i < ConvertUInt32(buffer.size()); ++i)
10401040
messageStream << buffer[i];
10411041

10421042
processingCompleteCallback(source, messageStream.str());

‎src/lib/transport/TransportTypes.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ Measurement::Measurement() :
6464
Measurement::Measurement(const SimpleMeasurement& source) :
6565
SignalID(source.SignalID),
6666
Value(source.Value),
67+
Adder(0.0),
68+
Multiplier(1.0),
6769
Timestamp(source.Timestamp),
6870
Flags(source.Flags),
6971
ID(0LL)

0 commit comments

Comments
 (0)