File: C:/Redmine-4.x/redmine-4.2.9/files/150220163204_0001-Fix-signed-unsigned-comparisons.patch
From: Anders Larsen <al@alarsen.net>
Date: Fri, 20 Feb 2015 16:29:38 +0100
Subject: [PATCH] Fix signed/unsigned comparisons
Compare int against "-1" instead of "0xffffffff", which would only work
on 32 bit systems anyway.
(Constants of the form "0x..." are always unsigned)
Signed-off-by: Anders Larsen <al@alarsen.net>
---
OpenOpcUaCoreServer/source/UAEventNotificationList.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/OpenOpcUaCoreServer/source/UAEventNotificationList.cpp b/OpenOpcUaCoreServer/source/UAEventNotificationList.cpp
index eaa5756..7caba5b 100644
--- a/OpenOpcUaCoreServer/source/UAEventNotificationList.cpp
+++ b/OpenOpcUaCoreServer/source/UAEventNotificationList.cpp
@@ -211,11 +211,11 @@ OpcUa_StatusCode CUAEventNotificationList::UpdateInternalAckedState(OpcUa_Boolea
}
// We will update both AckedState and AckedStateId
// AckedState
- if (m_FastEventFieldIndex.iAckedState != 0xffffffff)
+ if (m_FastEventFieldIndex.iAckedState != -1)
OpcUa_LocalizedText_CopyTo(&AckedState,
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iAckedState].Value.LocalizedText);
// AckedStateId
- if (m_FastEventFieldIndex.iAckedStateId != 0xffffffff)
+ if (m_FastEventFieldIndex.iAckedStateId != -1)
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iAckedStateId].Value.Boolean = bNewState;
OpcUa_LocalizedText_Clear(&AckedState);
return uStatus;
@@ -244,12 +244,12 @@ OpcUa_StatusCode CUAEventNotificationList::UpdateInternalConfirmedState(OpcUa_Bo
}
// We will update both ConfirmedState and ConfirmedStateId
// ConfirmedState
- if (m_FastEventFieldIndex.iConfirmedState != 0xffffffff)
+ if (m_FastEventFieldIndex.iConfirmedState != -1)
OpcUa_LocalizedText_CopyTo(&ConfirmedState,
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iConfirmedState].Value.LocalizedText);
// ConfirmedStateId
- if (m_FastEventFieldIndex.iConfirmedStateId != 0xffffffff)
+ if (m_FastEventFieldIndex.iConfirmedStateId != -1)
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iConfirmedStateId].Value.Boolean = bNewState;
OpcUa_LocalizedText_Clear(&ConfirmedState);
return uStatus;
@@ -272,15 +272,15 @@ OpcUa_StatusCode CUAEventNotificationList::UpdateInternalActiveState(OpcUa_Boole
}
// We will update both ActiveState and ActiveStateId
// ActiveState
- if (m_FastEventFieldIndex.iActiveState != 0xffffffff)
+ if (m_FastEventFieldIndex.iActiveState != -1)
OpcUa_LocalizedText_CopyTo(&ActiveState,
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iActiveState].Value.LocalizedText);
// ActiveState EffectiveDisplayName
- if (m_FastEventFieldIndex.iActiveStateEffectiveDisplayName != 0xffffffff)
+ if (m_FastEventFieldIndex.iActiveStateEffectiveDisplayName != -1)
OpcUa_LocalizedText_CopyTo(&ActiveState,
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iActiveStateEffectiveDisplayName].Value.LocalizedText);
// ActiveStateId
- if (m_FastEventFieldIndex.iActiveStateId != 0xffffffff)
+ if (m_FastEventFieldIndex.iActiveStateId != -1)
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iActiveStateId].Value.Boolean = bNewState;
OpcUa_LocalizedText_Clear(&ActiveState);
return uStatus;
@@ -319,8 +319,8 @@ void CUAEventNotificationList::Terminate()
OpcUa_StatusCode CUAEventNotificationList::AddComment(const OpcUa_LocalizedText comment)
{
OpcUa_StatusCode uStatus = OpcUa_Good;
- if (m_FastEventFieldIndex.iComment != 0xffffffff)
+ if (m_FastEventFieldIndex.iComment != -1)
OpcUa_LocalizedText_CopyTo(&comment,
m_pInternalEventNotificationList->Events[0].EventFields[m_FastEventFieldIndex.iComment].Value.LocalizedText);
return uStatus;
-}
\ No newline at end of file
+}
--
2.3.0