diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-02-07 09:06:44 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-02-07 09:06:44 +0000 |
| commit | b7673b2f419d269490f2d64fb27a04a742d6d638 (patch) | |
| tree | f4f90ad8be699d4e42f2f499a0be2a0acf0b63d3 | |
| parent | 6d7438714f91d6154089e2cea20a12684ca30d71 (diff) | |
packet-gsm_sim.c was the wrong file to check in.
I meant ui/gtk/voip_calls_dlg.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40915 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-gsm_sim.c | 9 | ||||
| -rw-r--r-- | ui/gtk/voip_calls_dlg.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 9e605b8392..a8ac4a4b3f 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -2,7 +2,7 @@ * Routines for packet dissection of GSM SIM APDUs (GSM TS 11.11) * * GSM TS 11.11 / 3GPP TS 51.011 - * 3GPP TS 31.102 + * 3GPP TS 31.102 * Copyright 2010-2011 by Harald Welte <laforge@gnumonks.org> * * $Id$ @@ -785,7 +785,6 @@ dissect_bertlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* FIXME: properly follow BER coding rules */ tag = tvb_get_guint8(tvb, pos++); -/* FIXME: what happens if len = 0? */ len = tvb_get_guint8(tvb, pos++); subtvb = tvb_new_subset(tvb, pos, len, len); @@ -800,9 +799,9 @@ dissect_bertlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } -#define P1_OFFS 0 -#define P2_OFFS 1 -#define P3_OFFS 2 +#define P1_OFFS 0 +#define P2_OFFS 1 +#define P3_OFFS 2 #define DATA_OFFS 3 static int diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 93340f8a72..75b941b3cc 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -763,11 +763,11 @@ voip_calls_dlg_create(void) void voip_calls_dlg_update(GList *listx) { - GtkTreeView *list_view; + /* GtkTreeView *list_view; */ GtkTreeSortable *sortable; gchar label_text[256]; - list_view = GTK_TREE_VIEW(list); + /* list_view = GTK_TREE_VIEW(list); */ sortable = GTK_TREE_SORTABLE(list_store); if (voip_calls_dlg != NULL) { calls_nb = 0; |