diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-05-03 14:54:39 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-05-03 14:54:39 +0000 |
| commit | ce537f6b9434dfb817cfa9ae2cd2a3a131dccce5 (patch) | |
| tree | ad8896509ce9d9d36f68b0de7b585698a1cfc624 /epan/dissectors/packet-gsm_bssmap_le.c | |
| parent | 2602490a2d0d81a3f37c65aae5973a9aae21dd21 (diff) | |
Remove static packet_info *gpinfo and just use the packet_info provided by the function.
svn path=/trunk/; revision=49145
Diffstat (limited to 'epan/dissectors/packet-gsm_bssmap_le.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_bssmap_le.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index 0879c0c198..90b557e7f6 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -222,7 +222,6 @@ static gint ett_bssmap_le_msg = -1; static dissector_handle_t gsm_bsslap_handle = NULL; -static packet_info *g_pinfo; static proto_tree *g_tree; #define NUM_GSM_BSSMAP_LE_ELEM (sizeof(gsm_bssmap_le_elem_strings)/sizeof(value_string)) @@ -233,7 +232,7 @@ gint ett_gsm_bssmap_le_elem[NUM_GSM_BSSMAP_LE_ELEM]; */ static guint16 -de_bmaple_apdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +de_bmaple_apdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; guint8 apdu_protocol_id; @@ -262,7 +261,7 @@ de_bmaple_apdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 */ APDU_tvb = tvb_new_subset(tvb, curr_offset+2, len-1, len-1); if(gsm_bsslap_handle) - call_dissector(gsm_bsslap_handle, APDU_tvb, g_pinfo, g_tree); + call_dissector(gsm_bsslap_handle, APDU_tvb, pinfo, g_tree); break; case 2: /* LLP @@ -559,7 +558,7 @@ de_bmaple_lcs_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * 10.20 Positioning Data */ static guint16 -de_bmaple_pos_dta(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +de_bmaple_pos_dta(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { tvbuff_t *data_tvb; guint32 curr_offset; @@ -567,7 +566,7 @@ de_bmaple_pos_dta(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_offset = offset; data_tvb = tvb_new_subset(tvb, curr_offset, len, len); - dissect_geographical_description(data_tvb, g_pinfo, tree); + dissect_geographical_description(data_tvb, pinfo, tree); return(len); } @@ -937,7 +936,6 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; saved_offset = offset; - g_pinfo = pinfo; g_tree = tree; len = tvb_length(tvb); |