aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/ess/packet-ess-template.c2
-rw-r--r--asn1/ranap/packet-ranap-template.c6
-rw-r--r--asn1/rrc/rrc.cnf16
-rw-r--r--asn1/sv/packet-sv-template.c42
-rw-r--r--epan/dissectors/packet-ess.c2
-rw-r--r--epan/dissectors/packet-ranap.c6
-rw-r--r--epan/dissectors/packet-rrc.c16
-rw-r--r--epan/dissectors/packet-sv.c42
8 files changed, 66 insertions, 66 deletions
diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index 23a6854c8f..b9c20eb7c1 100644
--- a/asn1/ess/packet-ess-template.c
+++ b/asn1/ess/packet-ess-template.c
@@ -126,7 +126,7 @@ ess_dissect_attribute_flags (tvbuff_t *tvb, asn1_ctx_t *actx)
if ((strcmp (u->oid, object_identifier_id) == 0) &&
((u->lacv / 8) < tvb_captured_length (tvb)) &&
- (value[u->lacv / 8] & (1 << (7 - (u->lacv % 8)))))
+ (value[u->lacv / 8] & (1U << (7 - (u->lacv % 8)))))
{
proto_tree_add_string_format (tree, hf_ess_Category_attribute, tvb,
u->lacv / 8, 1, u->name,
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index e20cc7b967..446fd8374c 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -104,9 +104,9 @@ static gboolean glbl_dissect_container = FALSE;
*
* Only these two needed currently
*/
-#define IMSG (1<<16)
-#define SOUT (2<<16)
-#define SPECIAL (4<<16)
+#define IMSG (1U<<16)
+#define SOUT (2U<<16)
+#define SPECIAL (4U<<16)
int pdu_type = 0; /* 0 means wildcard */
diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf
index 35059a634b..bf164f486e 100644
--- a/asn1/rrc/rrc.cnf
+++ b/asn1/rrc/rrc.cnf
@@ -737,8 +737,8 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
/*Here we try to figure out which HS-DSCH channels are multiplexed*/
#.FN_BODY DL-TransportChannelType-r5 VAL_PTR = &type
- gint *flowd_p;
- gint *cur_val=NULL;
+ guint *flowd_p;
+ guint *cur_val=NULL;
struct rrc_info *rrcinf;
%(DEFAULT_BODY)s
@@ -757,11 +757,11 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
- *flowd_p = (1<<flowd); /*Set the bit to mark it as true*/
+ *flowd_p = (1U<<flowd); /*Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
}else{
- *cur_val = (1<<flowd) | *cur_val;
+ *cur_val = (1U<<flowd) | *cur_val;
}
}
@@ -772,8 +772,8 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
/*Here we try to figure out which HS-DSCH channels are multiplexed*/
#.FN_BODY DL-TransportChannelType-r7 VAL_PTR = &type
- gint *flowd_p;
- gint *cur_val=NULL;
+ guint *flowd_p;
+ guint *cur_val=NULL;
struct rrc_info *rrcinf;
%(DEFAULT_BODY)s
@@ -793,11 +793,11 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
- *flowd_p = (1<<flowd); /* Set the bit to mark it as true*/
+ *flowd_p = (1U<<flowd); /* Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
}else{
- *cur_val = (1<<flowd) | *cur_val;
+ *cur_val = (1U<<flowd) | *cur_val;
}
}
diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index eb428b5020..3a13b50aef 100644
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -40,29 +40,29 @@
#define PFNAME "sv"
/* see IEC61850-8-1 8.2 */
-#define Q_VALIDITY_GOOD (0x0 << 0)
-#define Q_VALIDITY_INVALID (0x1 << 0)
-#define Q_VALIDITY_QUESTIONABLE (0x3 << 0)
-#define Q_VALIDITY_MASK (0x3 << 0)
-
-#define Q_OVERFLOW (1 << 2)
-#define Q_OUTOFRANGE (1 << 3)
-#define Q_BADREFERENCE (1 << 4)
-#define Q_OSCILLATORY (1 << 5)
-#define Q_FAILURE (1 << 6)
-#define Q_OLDDATA (1 << 7)
-#define Q_INCONSISTENT (1 << 8)
-#define Q_INACCURATE (1 << 9)
-
-#define Q_SOURCE_PROCESS (0 << 10)
-#define Q_SOURCE_SUBSTITUTED (1 << 10)
-#define Q_SOURCE_MASK (1 << 10)
-
-#define Q_TEST (1 << 11)
-#define Q_OPERATORBLOCKED (1 << 12)
+#define Q_VALIDITY_GOOD (0x0U << 0)
+#define Q_VALIDITY_INVALID (0x1U << 0)
+#define Q_VALIDITY_QUESTIONABLE (0x3U << 0)
+#define Q_VALIDITY_MASK (0x3U << 0)
+
+#define Q_OVERFLOW (1U << 2)
+#define Q_OUTOFRANGE (1U << 3)
+#define Q_BADREFERENCE (1U << 4)
+#define Q_OSCILLATORY (1U << 5)
+#define Q_FAILURE (1U << 6)
+#define Q_OLDDATA (1U << 7)
+#define Q_INCONSISTENT (1U << 8)
+#define Q_INACCURATE (1U << 9)
+
+#define Q_SOURCE_PROCESS (0U << 10)
+#define Q_SOURCE_SUBSTITUTED (1U << 10)
+#define Q_SOURCE_MASK (1U << 10)
+
+#define Q_TEST (1U << 11)
+#define Q_OPERATORBLOCKED (1U << 12)
/* see UCA Implementation Guideline for IEC 61850-9-2 */
-#define Q_DERIVED (1 << 13)
+#define Q_DERIVED (1U << 13)
void proto_register_sv(void);
void proto_reg_handoff_sv(void);
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 4eb663c3b5..c5aee8ed7d 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -267,7 +267,7 @@ ess_dissect_attribute_flags (tvbuff_t *tvb, asn1_ctx_t *actx)
if ((strcmp (u->oid, object_identifier_id) == 0) &&
((u->lacv / 8) < tvb_captured_length (tvb)) &&
- (value[u->lacv / 8] & (1 << (7 - (u->lacv % 8)))))
+ (value[u->lacv / 8] & (1U << (7 - (u->lacv % 8)))))
{
proto_tree_add_string_format (tree, hf_ess_Category_attribute, tvb,
u->lacv / 8, 1, u->name,
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index c96009a119..308c3f16dc 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -1507,9 +1507,9 @@ static gboolean glbl_dissect_container = FALSE;
*
* Only these two needed currently
*/
-#define IMSG (1<<16)
-#define SOUT (2<<16)
-#define SPECIAL (4<<16)
+#define IMSG (1U<<16)
+#define SOUT (2U<<16)
+#define SPECIAL (4U<<16)
int pdu_type = 0; /* 0 means wildcard */
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 1c130cc447..f2ed45aaeb 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -41428,8 +41428,8 @@ static int
dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 739 "../../asn1/rrc/rrc.cnf"
- gint *flowd_p;
- gint *cur_val=NULL;
+ guint *flowd_p;
+ guint *cur_val=NULL;
struct rrc_info *rrcinf;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -41451,11 +41451,11 @@ dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_c
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
- *flowd_p = (1<<flowd); /*Set the bit to mark it as true*/
+ *flowd_p = (1U<<flowd); /*Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
}else{
- *cur_val = (1<<flowd) | *cur_val;
+ *cur_val = (1U<<flowd) | *cur_val;
}
}
@@ -44902,8 +44902,8 @@ static int
dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 774 "../../asn1/rrc/rrc.cnf"
- gint *flowd_p;
- gint *cur_val=NULL;
+ guint *flowd_p;
+ guint *cur_val=NULL;
struct rrc_info *rrcinf;
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -44926,11 +44926,11 @@ dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_c
if( (cur_val=(gint *)g_tree_lookup(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]))) == NULL ){
flowd_p = (guint*)g_malloc0(sizeof(gint));
- *flowd_p = (1<<flowd); /* Set the bit to mark it as true*/
+ *flowd_p = (1U<<flowd); /* Set the bit to mark it as true*/
g_tree_insert(hsdsch_muxed_flows, GUINT_TO_POINTER((guint)rrcinf->hrnti[actx->pinfo->fd->subnum]), flowd_p);
}else{
- *cur_val = (1<<flowd) | *cur_val;
+ *cur_val = (1U<<flowd) | *cur_val;
}
}
diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index 1752230a90..6652a75387 100644
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -48,29 +48,29 @@
#define PFNAME "sv"
/* see IEC61850-8-1 8.2 */
-#define Q_VALIDITY_GOOD (0x0 << 0)
-#define Q_VALIDITY_INVALID (0x1 << 0)
-#define Q_VALIDITY_QUESTIONABLE (0x3 << 0)
-#define Q_VALIDITY_MASK (0x3 << 0)
-
-#define Q_OVERFLOW (1 << 2)
-#define Q_OUTOFRANGE (1 << 3)
-#define Q_BADREFERENCE (1 << 4)
-#define Q_OSCILLATORY (1 << 5)
-#define Q_FAILURE (1 << 6)
-#define Q_OLDDATA (1 << 7)
-#define Q_INCONSISTENT (1 << 8)
-#define Q_INACCURATE (1 << 9)
-
-#define Q_SOURCE_PROCESS (0 << 10)
-#define Q_SOURCE_SUBSTITUTED (1 << 10)
-#define Q_SOURCE_MASK (1 << 10)
-
-#define Q_TEST (1 << 11)
-#define Q_OPERATORBLOCKED (1 << 12)
+#define Q_VALIDITY_GOOD (0x0U << 0)
+#define Q_VALIDITY_INVALID (0x1U << 0)
+#define Q_VALIDITY_QUESTIONABLE (0x3U << 0)
+#define Q_VALIDITY_MASK (0x3U << 0)
+
+#define Q_OVERFLOW (1U << 2)
+#define Q_OUTOFRANGE (1U << 3)
+#define Q_BADREFERENCE (1U << 4)
+#define Q_OSCILLATORY (1U << 5)
+#define Q_FAILURE (1U << 6)
+#define Q_OLDDATA (1U << 7)
+#define Q_INCONSISTENT (1U << 8)
+#define Q_INACCURATE (1U << 9)
+
+#define Q_SOURCE_PROCESS (0U << 10)
+#define Q_SOURCE_SUBSTITUTED (1U << 10)
+#define Q_SOURCE_MASK (1U << 10)
+
+#define Q_TEST (1U << 11)
+#define Q_OPERATORBLOCKED (1U << 12)
/* see UCA Implementation Guideline for IEC 61850-9-2 */
-#define Q_DERIVED (1 << 13)
+#define Q_DERIVED (1U << 13)
void proto_register_sv(void);
void proto_reg_handoff_sv(void);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 09:54:36 +0000