aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-10-18 22:22:25 +0000
committerBill Meier <wmeier@newsguy.com>2012-10-18 22:22:25 +0000
commit8e9db0319767d35fba0dbdfd613b86b8f8cee75c (patch)
tree7e9743577302543f3ffcddd478c5118aae5853ac
parent97f5e101d99c1b6e7fdb2a4320e83ce7d20a3d7f (diff)
Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN done a while back; [The incorrect use of ENC_BIG_ENDIAN was benign since ENC_BIG_ENDIAN is currently defined as 0x0000000]; svn path=/trunk/; revision=45651
-rw-r--r--epan/dissectors/packet-arcnet.c2
-rw-r--r--epan/dissectors/packet-bootp.c4
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c2
-rw-r--r--epan/dissectors/packet-msrp.c14
4 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index 4ecc0c4b8b..348833b25c 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -264,7 +264,7 @@ dissect_arcnet (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
static void
dissect_arcnet_linux (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
{
- dissect_arcnet_common (tvb, pinfo, tree, TRUE, ENC_BIG_ENDIAN);
+ dissect_arcnet_common (tvb, pinfo, tree, TRUE, FALSE);
}
static const value_string arcnet_prot_id_vals[] = {
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 7673a6ecd2..5082c25214 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -1685,7 +1685,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff,
(tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_CM_CAP20,
(int)strlen(PACKETCABLE_CM_CAP20)) == 0 ))
{
- dissect_docsis_cm_cap(v_tree, tvb, optoff, optlen, ENC_BIG_ENDIAN);
+ dissect_docsis_cm_cap(v_tree, tvb, optoff, optlen, FALSE);
} else
if (tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_CM_CAP30,
(int)strlen(PACKETCABLE_CM_CAP30)) == 0 )
@@ -6503,7 +6503,7 @@ proto_register_bootp(void)
"The PacketCable CCC protocol version",
&pkt_ccc_protocol_version,
pkt_ccc_protocol_versions,
- ENC_BIG_ENDIAN);
+ FALSE);
prefs_register_uint_preference(bootp_module, "pkt.ccc.option",
"PacketCable CCC option",
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 27cccd83e9..faa1a7e400 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -1667,7 +1667,7 @@ be_cell_id_aux(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32
if (disc != 0x0b)
curr_offset = dissect_e212_mcc_mnc(tvb, g_pinfo, tree, curr_offset, TRUE);
else
- curr_offset = dissect_e212_mcc_mnc(tvb, g_pinfo, tree, curr_offset, ENC_BIG_ENDIAN);
+ curr_offset = dissect_e212_mcc_mnc(tvb, g_pinfo, tree, curr_offset, FALSE);
/* FALLTHRU */
case 0x01:
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 9ceaceeb0d..2fdde23c1a 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -303,7 +303,7 @@ tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree)
while (tvb_offset_exists(tvb, offset)) {
/* 'desegment' is FALSE so will set next_offset to beyond the end of
the buffer if no line ending is found */
- tvb_find_line_end(tvb, offset, -1, &next_offset, ENC_BIG_ENDIAN);
+ tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
linelen = next_offset - offset;
if(tree) {
proto_tree_add_text(tree, tvb, offset, linelen,
@@ -355,7 +355,7 @@ check_msrp_header(tvbuff_t *tvb)
return FALSE;
}
- linelen = tvb_find_line_end(tvb, 0, -1, &next_offset, ENC_BIG_ENDIAN);
+ linelen = tvb_find_line_end(tvb, 0, -1, &next_offset, FALSE);
/* Find the first SP */
space_offset = tvb_find_guint8(tvb, 0, linelen, ' ');
@@ -403,7 +403,7 @@ find_end_line(tvbuff_t *tvb, gint start)
while (tvb_length_remaining(tvb, offset) > 0) {
/* 'desegment' is FALSE so will set next_offset to beyond the end of
the buffer if no line ending is found */
- linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, ENC_BIG_ENDIAN);
+ linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
if (linelen == -1) {
return -1;
}
@@ -490,7 +490,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
* "tvb_get_ptr()" calls below won't throw exceptions. *
*/
offset = 0;
- linelen = tvb_find_line_end(tvb, 0, -1, &next_offset, ENC_BIG_ENDIAN);
+ linelen = tvb_find_line_end(tvb, 0, -1, &next_offset, FALSE);
/* Find the first SP and skip the first token */
token_2_start = tvb_find_guint8(tvb, 0, linelen, ' ') + 1;
@@ -556,7 +556,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
offset = next_offset;
end_line_offset = find_end_line(tvb,offset);
/* TODO if -1 (No end line found, is returned do something) */
- end_line_len = tvb_find_line_end(tvb, end_line_offset, -1, &next_offset, ENC_BIG_ENDIAN);
+ end_line_len = tvb_find_line_end(tvb, end_line_offset, -1, &next_offset, FALSE);
message_end_offset = end_line_offset + end_line_len + 2;
@@ -594,7 +594,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
while (tvb_reported_length_remaining(tvb, offset) > 0 && offset < end_line_offset ) {
/* 'desegment' is FALSE so will set next_offset to beyond the end of
the buffer if no line ending is found */
- linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, ENC_BIG_ENDIAN);
+ linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
if (linelen == 0) {
/*
* This is a blank line separating the
@@ -706,7 +706,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
{
offset = 0;
while (tvb_offset_exists(next_tvb, offset)) {
- tvb_find_line_end(next_tvb, offset, -1, &next_offset, ENC_BIG_ENDIAN);
+ tvb_find_line_end(next_tvb, offset, -1, &next_offset, FALSE);
linelen = next_offset - offset;
proto_tree_add_text(msrp_data_tree, next_tvb, offset, linelen,
"%s", tvb_format_text(next_tvb, offset, linelen));