Fix some [-Wunused-but-set-variable] warnings

 (in some cases by changing proto_tree_add_item() to use
  what appears to be the correct 'tree' arg);
Do whitespace cleanup.

svn path=/trunk/; revision=39772

1 files changed, 112 insertions, 112 deletions

diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c
index 23775fb7ba..849da3a0ee 100644
--- a/epan/dissectors/packet-vxlan.c
+++ b/epan/dissectors/packet-vxlan.c
@@ -60,18 +60,18 @@ static dissector_handle_t eth_handle;
 static void
 dissect_vxlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_tree *vxlan_tree, *flg_tree;
-	proto_item *ti, *flg_item;
-	tvbuff_t *next_tvb;
-	int offset = 0;
+    proto_tree *vxlan_tree, *flg_tree;
+    proto_item *ti, *flg_item;
+    tvbuff_t *next_tvb;
+    int offset = 0;
 
-	/* Make entry in Protocol column on summary display */
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "VxLAN");
+    /* Make entry in Protocol column on summary display */
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "VxLAN");
 
-	col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
-	ti = proto_tree_add_item(tree, proto_vxlan, tvb, offset, -1, ENC_NA);
-	vxlan_tree = proto_item_add_subtree(ti, ett_vxlan);
+    ti = proto_tree_add_item(tree, proto_vxlan, tvb, offset, -1, ENC_NA);
+    vxlan_tree = proto_item_add_subtree(ti, ett_vxlan);
 
 /*
               0                   1                   2                   3
@@ -83,36 +83,36 @@ dissect_vxlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            |                VXLAN Network Identifier (VNI) |   Reserved    |
            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
-	/* Flags (8 bits) where the I flag MUST be set  to 1 for a valid
+    /* Flags (8 bits) where the I flag MUST be set  to 1 for a valid
      *    VXLAN Network ID (VNI).  The remaining 7 bits (designated "R") are
      *    reserved fields and MUST be set to zero.
-	 */
-	flg_item = proto_tree_add_item(vxlan_tree, hf_vxlan_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
-	flg_tree = proto_item_add_subtree(ti, ett_vxlan_flgs);
+     */
+    flg_item = proto_tree_add_item(vxlan_tree, hf_vxlan_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
+    flg_tree = proto_item_add_subtree(flg_item, ett_vxlan_flgs);
 
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b7, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b6, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b5, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b4, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b7, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b6, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b5, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b4, tvb, offset, 1, ENC_BIG_ENDIAN);
 
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_i, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b2, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b1, tvb, offset, 1, ENC_BIG_ENDIAN);
-	proto_tree_add_item(flg_tree, hf_vxlan_flag_b0, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset++;
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_i,  tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(flg_tree, hf_vxlan_flag_b0, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset++;
 
-	proto_tree_add_item(vxlan_tree, hf_vxlan_reserved_24, tvb, offset, 3, ENC_BIG_ENDIAN);
-	offset+=3;
+    proto_tree_add_item(vxlan_tree, hf_vxlan_reserved_24, tvb, offset, 3, ENC_BIG_ENDIAN);
+    offset+=3;
 
-	proto_tree_add_item(vxlan_tree, hf_vxlan_vni, tvb, offset, 3, ENC_BIG_ENDIAN);
-	offset+=3;
+    proto_tree_add_item(vxlan_tree, hf_vxlan_vni, tvb, offset, 3, ENC_BIG_ENDIAN);
+    offset+=3;
 
-	
-	proto_tree_add_item(vxlan_tree, hf_vxlan_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset++;
 
-	next_tvb = tvb_new_subset_remaining(tvb, offset);
-	call_dissector(eth_handle, next_tvb, pinfo, tree);
+    proto_tree_add_item(vxlan_tree, hf_vxlan_reserved_8, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset++;
+
+    next_tvb = tvb_new_subset_remaining(tvb, offset);
+    call_dissector(eth_handle, next_tvb, pinfo, tree);
 
 }
 
@@ -121,94 +121,94 @@ dissect_vxlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 void
 proto_register_vxlan(void)
 {
-	static hf_register_info hf[] = {
-		{ &hf_vxlan_flags,
-			{ "Flags", "vxlan.flags",
-				FT_UINT8, BASE_HEX, NULL, 0x00, 
-				NULL, HFILL 
-			},
-		},
-		{ &hf_vxlan_flag_b7,
-			{ "Reserved(R)", "vxlan.flag_b7",
+    static hf_register_info hf[] = {
+        { &hf_vxlan_flags,
+          { "Flags", "vxlan.flags",
+            FT_UINT8, BASE_HEX, NULL, 0x00,
+            NULL, HFILL
+          },
+        },
+        { &hf_vxlan_flag_b7,
+          { "Reserved(R)", "vxlan.flag_b7",
             FT_BOOLEAN, 8, NULL, 0x80,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_b6,
-			{ "Reserved(R)", "vxlan.flag_b6",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_b6,
+          { "Reserved(R)", "vxlan.flag_b6",
             FT_BOOLEAN, 8, NULL, 0x40,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_b5,
-			{ "Reserved(R)", "vxlan.flag_b5",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_b5,
+          { "Reserved(R)", "vxlan.flag_b5",
             FT_BOOLEAN, 8, NULL, 0x20,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_b4,
-			{ "Reserved(R)", "vxlan.flag_b4",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_b4,
+          { "Reserved(R)", "vxlan.flag_b4",
             FT_BOOLEAN, 8, NULL, 0x10,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_i,
-			{ "VXLAN Network ID(VNI)", "vxlan.flag_i",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_i,
+          { "VXLAN Network ID(VNI)", "vxlan.flag_i",
             FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x08,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_b2,
-			{ "Reserved(R)", "vxlan.flag_b2",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_b2,
+          { "Reserved(R)", "vxlan.flag_b2",
             FT_BOOLEAN, 8, NULL, 0x10,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_b1,
-			{ "Reserved(R)", "vxlan.flag_b1",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_b1,
+          { "Reserved(R)", "vxlan.flag_b1",
             FT_BOOLEAN, 8, NULL, 0x10,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_flag_b0,
-			{ "Reserved(R)", "vxlan.flag_b0",
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_flag_b0,
+          { "Reserved(R)", "vxlan.flag_b0",
             FT_BOOLEAN, 8, NULL, 0x10,
-			 NULL, HFILL,
-			},
-		},
-		{ &hf_vxlan_reserved_24,
-			{ "Reserved", "vxlan.reserved24",
-				FT_UINT24, BASE_HEX, NULL, 0x00, 
-				NULL, HFILL 
-			},
-		},
-		{ &hf_vxlan_vni,
-			{ "VXLAN Network Identifier (VNI)", "vxlan.vni",
-				FT_UINT24, BASE_DEC, NULL, 0x00, 
-				NULL, HFILL 
-			},
-		},
-		{ &hf_vxlan_reserved_8,
-			{ "Reserved", "vxlan.reserved8",
-				FT_UINT8, BASE_DEC, NULL, 0x00, 
-				NULL, HFILL 
-			},
-		},
-	};
-
-	/* Setup protocol subtree array */
-	static gint *ett[] = {
-		&ett_vxlan,
-		&ett_vxlan_flgs,
-	};
-
-		/* Register the protocol name and description */
-	proto_vxlan = proto_register_protocol("Virtual eXtensible Local Area Network",
-			"VXLAN", "vxlan");
-
-	/* Required function calls to register the header fields and subtrees used */
-	proto_register_field_array(proto_vxlan, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+            NULL, HFILL,
+          },
+        },
+        { &hf_vxlan_reserved_24,
+          { "Reserved", "vxlan.reserved24",
+            FT_UINT24, BASE_HEX, NULL, 0x00,
+            NULL, HFILL
+          },
+        },
+        { &hf_vxlan_vni,
+          { "VXLAN Network Identifier (VNI)", "vxlan.vni",
+            FT_UINT24, BASE_DEC, NULL, 0x00,
+            NULL, HFILL
+          },
+        },
+        { &hf_vxlan_reserved_8,
+          { "Reserved", "vxlan.reserved8",
+            FT_UINT8, BASE_DEC, NULL, 0x00,
+            NULL, HFILL
+          },
+        },
+    };
+
+    /* Setup protocol subtree array */
+    static gint *ett[] = {
+        &ett_vxlan,
+        &ett_vxlan_flgs,
+    };
+
+    /* Register the protocol name and description */
+    proto_vxlan = proto_register_protocol("Virtual eXtensible Local Area Network",
+                                          "VXLAN", "vxlan");
+
+    /* Required function calls to register the header fields and subtrees used */
+    proto_register_field_array(proto_vxlan, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
 
 
 }
@@ -218,7 +218,7 @@ proto_reg_handoff_vxlan(void)
 {
     dissector_handle_t vxlan_handle;
 
-	eth_handle = find_dissector("eth");
+    eth_handle = find_dissector("eth");
 
     vxlan_handle = create_dissector_handle(dissect_vxlan, proto_vxlan);
     dissector_add_handle("udp.port", vxlan_handle);  /* For 'Decode As' */