From Sebastien Tandel:

(Fixing warnings)

stripped away some unused variables/parameters
+ in prefs.c
    suggestion of parentheses makes gcc happy

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21156 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 853e6b9dbfed95ed61d5204cecd4f3c1b320c443..239cce15208607265fbda9d38334946c03d9a082 100644 (file)
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -113,7 +113,6 @@ static int hf_uma_urr_gci                           = -1;
 static int hf_uma_urr_tura                             = -1;
 static int hf_uma_urr_gc                               = -1;
 static int hf_uma_urr_uc                               = -1;
-static int hf_uma_urr_tlra                             = -1;
 static int hf_uma_urr_rrs                              = -1;
 static int hf_uma_urr_IP_Address_type  = -1;
 static int hf_uma_urr_FQDN                             = -1;

diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c
index 36fa3219419bc33e7092f167fe28539c1aa8c731..e5e229233c9b8ecd442c6e5d8e59659de73e3df8 100644 (file)
--- a/epan/dissectors/packet-windows-common.c
+++ b/epan/dissectors/packet-windows-common.c
@@ -1864,7 +1864,7 @@ static const true_false_string tfs_ace_flags_failed_access = {
 
 
 static int
-dissect_nt_ace_object(tvbuff_t *tvb, int offset, proto_tree *parent_tree, packet_info *pinfo, guint8 *drep)
+dissect_nt_ace_object(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 {
        proto_item *item = NULL;
        proto_tree *tree = NULL;
@@ -2035,7 +2035,7 @@ dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo,
                case ACE_TYPE_ACCESS_DENIED_OBJECT:
                case ACE_TYPE_SYSTEM_AUDIT_OBJECT:
                case ACE_TYPE_SYSTEM_ALARM_OBJECT:
-                       offset=dissect_nt_ace_object(tvb, offset, tree, pinfo, drep);
+                       offset=dissect_nt_ace_object(tvb, offset, tree);
                }
 
                /* SID */

diff --git a/epan/prefs.c b/epan/prefs.c
index 2dd47070a161ebc4547ca9ed78e5b2203dffea81..5386c9366b957785d3ff08a15e0d435bf6407cc0 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -168,7 +168,7 @@ prefs_register_module_or_subtree(module_t *parent, const char *name,
        guchar c;
 
        /* this module may have been created as a subtree item previously */
-       if(module = find_subtree(parent, title)) {
+       if((module = find_subtree(parent, title))) {
          /* the module is currently a subtree */
          module->name = name;
          module->apply_cb = apply_cb;

diff --git a/gtk/gtkvumeter.c b/gtk/gtkvumeter.c
index d4704c52c93f4f6c33f6b7c5d990a950321ff458..f2c13cc25fd69919df8b721a0aef57a1a0aa579b 100644 (file)
--- a/gtk/gtkvumeter.c
+++ b/gtk/gtkvumeter.c
@@ -201,7 +201,6 @@ static void gtk_vumeter_size_calculate (GtkWidget *widget, GtkRequisition *requi
         /* iterate through scale items to get the highest scale item */
         for (current = vumeter->scale_items; current != NULL; current = g_list_next(current)) {
             GtkVUMeterScaleItem * item = current->data;
-            int scale_level = gtk_vumeter_sound_level_to_draw_level (vumeter, item->level);
 
             pitches++;