Fix indentation to be consistent

svn path=/trunk/; revision=26194

1 files changed, 361 insertions, 361 deletions

diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 9ca0d0d645..ea8a0095be 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -217,13 +217,13 @@ dissect_xml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 static gboolean dissect_xml_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-    if ( (pref_heuristic_media || pref_heuristic_tcp || pref_heuristic_udp)
-		  && tvbparse_peek(tvbparse_init(tvb,0,-1,NULL,want_ignore), want_heur)) {
-        dissect_xml(tvb, pinfo, tree);
-        return TRUE;
-    } else {
-        return FALSE;
-    }
+	if ( (pref_heuristic_media || pref_heuristic_tcp || pref_heuristic_udp)
+	     && tvbparse_peek(tvbparse_init(tvb,0,-1,NULL,want_ignore), want_heur)) {
+		dissect_xml(tvb, pinfo, tree);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
 }
 
 static void after_token(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
@@ -304,68 +304,68 @@ static void after_xmlpi(void* tvbparse_data, const void* wanted_data _U_, tvbpar
 }
 
 static void before_tag(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
-    GPtrArray* stack = tvbparse_data;
-    xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
-    tvbparse_elem_t* name_tok = tok->sub->next;
-    gchar* root_name;
-    gchar* name = NULL;
-    xml_ns_t* ns;
-    xml_frame_t* new_frame;
-    proto_item* pi;
-    proto_tree* pt;
-
-    if (name_tok->sub->id == XML_SCOPED_NAME) {
-        tvbparse_elem_t* root_tok = name_tok->sub->sub;
-        tvbparse_elem_t* leaf_tok = name_tok->sub->sub->next->next;
-        xml_ns_t* nameroot_ns;
-
-        root_name = (gchar*)tvb_get_ephemeral_string(root_tok->tvb,root_tok->offset,root_tok->len);
-        name = (gchar*)tvb_get_ephemeral_string(leaf_tok->tvb,leaf_tok->offset,leaf_tok->len);
-
-        nameroot_ns = g_hash_table_lookup(xml_ns.elements,root_name);
-
-        if(nameroot_ns) {
-            ns = g_hash_table_lookup(nameroot_ns->elements,name);
-            if (!ns) {
-                ns = &unknown_ns;
-            }
-        } else {
-            ns = &unknown_ns;
-        }
-
-    } else {
-        name = tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
-        ascii_strdown_inplace(name);
-
-        if(current_frame->ns) {
-            ns = g_hash_table_lookup(current_frame->ns->elements,name);
-
-            if (!ns) {
-                if (! ( ns = g_hash_table_lookup(root_ns->elements,name) ) ) {
-                    ns = &unknown_ns;
-                }
-            }
-        } else {
-            ns = &unknown_ns;
-        }
-    }
-
-    pi = proto_tree_add_item(current_frame->tree,ns->hf_tag,tok->tvb,tok->offset,tok->len,FALSE);
-    proto_item_set_text(pi, "%s", tvb_format_text(tok->tvb,tok->offset,(name_tok->offset - tok->offset) + name_tok->len));
-
-    pt = proto_item_add_subtree(pi,ns->ett);
-
-    new_frame = ep_alloc(sizeof(xml_frame_t));
-    new_frame->type = XML_FRAME_TAG;
-    new_frame->name = name;
-    insert_xml_frame(current_frame, new_frame);
-    new_frame->item = pi;
-    new_frame->last_item = pi;
-    new_frame->tree = pt;
-    new_frame->start_offset = tok->offset;
-    new_frame->ns = ns;
-
-    g_ptr_array_add(stack,new_frame);
+	GPtrArray* stack = tvbparse_data;
+	xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
+	tvbparse_elem_t* name_tok = tok->sub->next;
+	gchar* root_name;
+	gchar* name = NULL;
+	xml_ns_t* ns;
+	xml_frame_t* new_frame;
+	proto_item* pi;
+	proto_tree* pt;
+
+	if (name_tok->sub->id == XML_SCOPED_NAME) {
+		tvbparse_elem_t* root_tok = name_tok->sub->sub;
+		tvbparse_elem_t* leaf_tok = name_tok->sub->sub->next->next;
+		xml_ns_t* nameroot_ns;
+
+		root_name = (gchar*)tvb_get_ephemeral_string(root_tok->tvb,root_tok->offset,root_tok->len);
+		name = (gchar*)tvb_get_ephemeral_string(leaf_tok->tvb,leaf_tok->offset,leaf_tok->len);
+
+		nameroot_ns = g_hash_table_lookup(xml_ns.elements,root_name);
+
+		if(nameroot_ns) {
+			ns = g_hash_table_lookup(nameroot_ns->elements,name);
+			if (!ns) {
+				ns = &unknown_ns;
+			}
+		} else {
+			ns = &unknown_ns;
+		}
+
+	} else {
+		name = tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
+		ascii_strdown_inplace(name);
+
+		if(current_frame->ns) {
+			ns = g_hash_table_lookup(current_frame->ns->elements,name);
+
+			if (!ns) {
+				if (! ( ns = g_hash_table_lookup(root_ns->elements,name) ) ) {
+					ns = &unknown_ns;
+				}
+			}
+		} else {
+			ns = &unknown_ns;
+		}
+	}
+
+	pi = proto_tree_add_item(current_frame->tree,ns->hf_tag,tok->tvb,tok->offset,tok->len,FALSE);
+	proto_item_set_text(pi, "%s", tvb_format_text(tok->tvb,tok->offset,(name_tok->offset - tok->offset) + name_tok->len));
+
+	pt = proto_item_add_subtree(pi,ns->ett);
+
+	new_frame = ep_alloc(sizeof(xml_frame_t));
+	new_frame->type = XML_FRAME_TAG;
+	new_frame->name = name;
+	insert_xml_frame(current_frame, new_frame);
+	new_frame->item = pi;
+	new_frame->last_item = pi;
+	new_frame->tree = pt;
+	new_frame->start_offset = tok->offset;
+	new_frame->ns = ns;
+
+	g_ptr_array_add(stack,new_frame);
 
 }
 
@@ -493,133 +493,133 @@ static void init_xml_parser(void) {
 	tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
 	tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
 
-    tvbparse_wanted_t* want_scoped_name = tvbparse_set_seq(XML_SCOPED_NAME, NULL, NULL, NULL,
-                                                           want_name,
-                                                           tvbparse_char(-1,":",NULL,NULL,NULL),
-                                                           want_name,
-                                                           NULL);
+	tvbparse_wanted_t* want_scoped_name = tvbparse_set_seq(XML_SCOPED_NAME, NULL, NULL, NULL,
+							       want_name,
+							       tvbparse_char(-1,":",NULL,NULL,NULL),
+							       want_name,
+							       NULL);
 
-    tvbparse_wanted_t* want_tag_name = tvbparse_set_oneof(0, NULL, NULL, NULL,
-                                                          want_scoped_name,
-                                                          want_name,
-                                                          NULL);
+	tvbparse_wanted_t* want_tag_name = tvbparse_set_oneof(0, NULL, NULL, NULL,
+							      want_scoped_name,
+							      want_name,
+							      NULL);
 
-    tvbparse_wanted_t* want_attrib_value = tvbparse_set_oneof(0, NULL, NULL, get_attrib_value,
-                                                              tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\"','\\'),
-                                                              tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\'','\\'),
-                                                              tvbparse_chars(-1,1,0,"0123456789",NULL,NULL,NULL),
-                                                              want_name,
-                                                              NULL);
+	tvbparse_wanted_t* want_attrib_value = tvbparse_set_oneof(0, NULL, NULL, get_attrib_value,
+								  tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\"','\\'),
+								  tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\'','\\'),
+								  tvbparse_chars(-1,1,0,"0123456789",NULL,NULL,NULL),
+								  want_name,
+								  NULL);
 
 	tvbparse_wanted_t* want_attributes = tvbparse_one_or_more(-1, NULL, NULL, NULL,
-															  tvbparse_set_seq(-1, NULL, NULL, after_attrib,
-                                                                               want_attr_name,
-																			   tvbparse_char(-1,"=",NULL,NULL,NULL),
-																			   want_attrib_value,
-																			   NULL));
+								  tvbparse_set_seq(-1, NULL, NULL, after_attrib,
+										   want_attr_name,
+										   tvbparse_char(-1,"=",NULL,NULL,NULL),
+										   want_attrib_value,
+										   NULL));
 
 	tvbparse_wanted_t* want_stoptag = tvbparse_set_oneof(-1,NULL,NULL,NULL,
-														 tvbparse_char(-1, ">", NULL, NULL, after_open_tag),
-														 tvbparse_string(-1, "/>", NULL, NULL, after_closed_tag),
-														 NULL);
+							     tvbparse_char(-1, ">", NULL, NULL, after_open_tag),
+							     tvbparse_string(-1, "/>", NULL, NULL, after_closed_tag),
+							     NULL);
 
 	tvbparse_wanted_t* want_stopxmlpi = tvbparse_string(-1,"?>",NULL,NULL,after_xmlpi);
 
-    tvbparse_wanted_t* want_comment = tvbparse_set_seq(hf_comment,NULL,NULL,after_token,
-                                                       tvbparse_string(-1,"<!--",NULL,NULL,NULL),
-                                                       tvbparse_until(-1,NULL,NULL,NULL,
-                                                                      tvbparse_string(-1,"-->",NULL,NULL,NULL),
-                                                                      TP_UNTIL_INCLUDE),
-                                                       NULL);
-
-    tvbparse_wanted_t* want_xmlpi = tvbparse_set_seq(hf_xmlpi,NULL,before_xmpli,NULL,
-                                                     tvbparse_string(-1,"<?",NULL,NULL,NULL),
-                                                     want_name,
-                                                     tvbparse_set_oneof(-1,NULL,NULL,NULL,
-                                                                        want_stopxmlpi,
-                                                                        tvbparse_set_seq(-1,NULL,NULL,NULL,
-                                                                                         want_attributes,
-                                                                                         want_stopxmlpi,
-                                                                                         NULL),
-                                                                        NULL),
-                                                     NULL);
-
-    tvbparse_wanted_t* want_closing_tag = tvbparse_set_seq(0,NULL,NULL,after_untag,
-                                                           tvbparse_char(-1, "<", NULL, NULL, NULL),
-                                                           tvbparse_char(-1, "/", NULL, NULL, NULL),
-                                                           want_tag_name,
-                                                           tvbparse_char(-1, ">", NULL, NULL, NULL),
-                                                           NULL);
-
-    tvbparse_wanted_t* want_doctype_start = tvbparse_set_seq(-1,NULL,before_dtd_doctype,NULL,
-                                                             tvbparse_char(-1,"<",NULL,NULL,NULL),
-                                                             tvbparse_char(-1,"!",NULL,NULL,NULL),
-                                                             tvbparse_casestring(-1,"DOCTYPE",NULL,NULL,NULL),
-                                                             tvbparse_set_oneof(-1,NULL,NULL,NULL,
-                                                                                tvbparse_set_seq(-1,NULL,NULL,NULL,
-                                                                                                 want_name,
-                                                                                                 tvbparse_char(-1,"[",NULL,NULL,NULL),
-                                                                                                 NULL),
-                                                                                tvbparse_set_seq(-1,NULL,NULL,pop_stack,
-                                                                                                 want_name,
-                                                                                                 tvbparse_set_oneof(-1,NULL,NULL,NULL,
-                                                                                                                    tvbparse_casestring(-1,"PUBLIC",NULL,NULL,NULL),
-                                                                                                                    tvbparse_casestring(-1,"SYSTEM",NULL,NULL,NULL),
-                                                                                                                    NULL),
-                                                                                                 tvbparse_until(-1,NULL,NULL,NULL,
-                                                                                                                tvbparse_char(-1,">",NULL,NULL,NULL),
-                                                                                                                TP_UNTIL_INCLUDE),
-                                                                                                 NULL),
-                                                                                NULL),
-                                                             NULL);
-
-    tvbparse_wanted_t* want_dtd_tag = tvbparse_set_seq(hf_dtd_tag,NULL,NULL,after_token,
-                                                       tvbparse_char(-1,"<",NULL,NULL,NULL),
-                                                       tvbparse_char(-1,"!",NULL,NULL,NULL),
-                                                       tvbparse_until(-1,NULL,NULL,NULL,
-                                                                      tvbparse_char(-1, ">", NULL, NULL, NULL),
-                                                                      TP_UNTIL_INCLUDE),
-                                                       NULL);
-
-    tvbparse_wanted_t* want_tag = tvbparse_set_seq(-1, NULL, before_tag, NULL,
-                                                   tvbparse_char(-1,"<",NULL,NULL,NULL),
-                                                   want_tag_name,
-                                                   tvbparse_set_oneof(-1,NULL,NULL,NULL,
-                                                                      tvbparse_set_seq(-1,NULL,NULL,NULL,
-                                                                                       want_attributes,
-                                                                                       want_stoptag,
-                                                                                       NULL),
-                                                                      want_stoptag,
-                                                                      NULL),
-                                                   NULL);
-
-    tvbparse_wanted_t* want_dtd_close = tvbparse_set_seq(-1,NULL,NULL,after_dtd_close,
-                                                         tvbparse_char(-1,"]",NULL,NULL,NULL),
-                                                         tvbparse_char(-1,">",NULL,NULL,NULL),
-                                                         NULL);
-
-    want_ignore = tvbparse_chars(-1,1,0," \t\r\n",NULL,NULL,NULL);
+	tvbparse_wanted_t* want_comment = tvbparse_set_seq(hf_comment,NULL,NULL,after_token,
+							   tvbparse_string(-1,"<!--",NULL,NULL,NULL),
+							   tvbparse_until(-1,NULL,NULL,NULL,
+									  tvbparse_string(-1,"-->",NULL,NULL,NULL),
+									  TP_UNTIL_INCLUDE),
+							   NULL);
+
+	tvbparse_wanted_t* want_xmlpi = tvbparse_set_seq(hf_xmlpi,NULL,before_xmpli,NULL,
+							 tvbparse_string(-1,"<?",NULL,NULL,NULL),
+							 want_name,
+							 tvbparse_set_oneof(-1,NULL,NULL,NULL,
+									    want_stopxmlpi,
+									    tvbparse_set_seq(-1,NULL,NULL,NULL,
+											     want_attributes,
+											     want_stopxmlpi,
+											     NULL),
+									    NULL),
+							 NULL);
+
+	tvbparse_wanted_t* want_closing_tag = tvbparse_set_seq(0,NULL,NULL,after_untag,
+							       tvbparse_char(-1, "<", NULL, NULL, NULL),
+							       tvbparse_char(-1, "/", NULL, NULL, NULL),
+							       want_tag_name,
+							       tvbparse_char(-1, ">", NULL, NULL, NULL),
+							       NULL);
+
+	tvbparse_wanted_t* want_doctype_start = tvbparse_set_seq(-1,NULL,before_dtd_doctype,NULL,
+								 tvbparse_char(-1,"<",NULL,NULL,NULL),
+								 tvbparse_char(-1,"!",NULL,NULL,NULL),
+								 tvbparse_casestring(-1,"DOCTYPE",NULL,NULL,NULL),
+								 tvbparse_set_oneof(-1,NULL,NULL,NULL,
+										    tvbparse_set_seq(-1,NULL,NULL,NULL,
+												     want_name,
+												     tvbparse_char(-1,"[",NULL,NULL,NULL),
+												     NULL),
+										    tvbparse_set_seq(-1,NULL,NULL,pop_stack,
+												     want_name,
+												     tvbparse_set_oneof(-1,NULL,NULL,NULL,
+															tvbparse_casestring(-1,"PUBLIC",NULL,NULL,NULL),
+															tvbparse_casestring(-1,"SYSTEM",NULL,NULL,NULL),
+															NULL),
+												     tvbparse_until(-1,NULL,NULL,NULL,
+														    tvbparse_char(-1,">",NULL,NULL,NULL),
+														    TP_UNTIL_INCLUDE),
+												     NULL),
+										    NULL),
+								 NULL);
+
+	tvbparse_wanted_t* want_dtd_tag = tvbparse_set_seq(hf_dtd_tag,NULL,NULL,after_token,
+							   tvbparse_char(-1,"<",NULL,NULL,NULL),
+							   tvbparse_char(-1,"!",NULL,NULL,NULL),
+							   tvbparse_until(-1,NULL,NULL,NULL,
+									  tvbparse_char(-1, ">", NULL, NULL, NULL),
+									  TP_UNTIL_INCLUDE),
+							   NULL);
+
+	tvbparse_wanted_t* want_tag = tvbparse_set_seq(-1, NULL, before_tag, NULL,
+						       tvbparse_char(-1,"<",NULL,NULL,NULL),
+						       want_tag_name,
+						       tvbparse_set_oneof(-1,NULL,NULL,NULL,
+									  tvbparse_set_seq(-1,NULL,NULL,NULL,
+											   want_attributes,
+											   want_stoptag,
+											   NULL),
+									  want_stoptag,
+									  NULL),
+						       NULL);
+
+	tvbparse_wanted_t* want_dtd_close = tvbparse_set_seq(-1,NULL,NULL,after_dtd_close,
+							     tvbparse_char(-1,"]",NULL,NULL,NULL),
+							     tvbparse_char(-1,">",NULL,NULL,NULL),
+							     NULL);
+
+	want_ignore = tvbparse_chars(-1,1,0," \t\r\n",NULL,NULL,NULL);
 
 
 	want = tvbparse_set_oneof(-1, NULL, NULL, NULL,
-							  want_comment,
-							  want_xmlpi,
-							  want_closing_tag,
-							  want_doctype_start,
-							  want_dtd_close,
-							  want_dtd_tag,
-							  want_tag,
-							  tvbparse_not_chars(XML_CDATA,1,0,"<",NULL,NULL,after_token),
-							  tvbparse_not_chars(-1,1,0," \t\r\n",NULL,NULL,unrecognized_token),
-							  NULL);
-
-    want_heur = tvbparse_set_oneof(-1, NULL, NULL, NULL,
-                                   want_comment,
-                                   want_xmlpi,
-                                   want_doctype_start,
-                                   want_dtd_tag,
-                                   want_tag,
-                                   NULL);
+				  want_comment,
+				  want_xmlpi,
+				  want_closing_tag,
+				  want_doctype_start,
+				  want_dtd_close,
+				  want_dtd_tag,
+				  want_tag,
+				  tvbparse_not_chars(XML_CDATA,1,0,"<",NULL,NULL,after_token),
+				  tvbparse_not_chars(-1,1,0," \t\r\n",NULL,NULL,unrecognized_token),
+				  NULL);
+
+	want_heur = tvbparse_set_oneof(-1, NULL, NULL, NULL,
+				       want_comment,
+				       want_xmlpi,
+				       want_doctype_start,
+				       want_dtd_tag,
+				       want_tag,
+				       NULL);
 
 }
 
@@ -704,7 +704,7 @@ static void destroy_dtd_data(dtd_build_data_t* dtd_data) {
 	if(dtd_data->description) g_free(dtd_data->description);
 	if(dtd_data->proto_root) g_free(dtd_data->proto_root);
 
-    g_string_free(dtd_data->error,TRUE);
+	g_string_free(dtd_data->error,TRUE);
 
 
 	while(dtd_data->elements->len) {
@@ -785,46 +785,46 @@ static gchar* fully_qualified_name(GPtrArray* hier, gchar* name, gchar* proto_na
 
 
 static xml_ns_t* make_xml_hier(gchar* elem_name,
-								  xml_ns_t* root,
-								  GHashTable* elements,
-								  GPtrArray* hier,
-								  GString* error,
-								  GArray* hfs,
-								  GArray* etts,
-								  char* proto_name) {
+			       xml_ns_t* root,
+			       GHashTable* elements,
+			       GPtrArray* hier,
+			       GString* error,
+			       GArray* hfs,
+			       GArray* etts,
+			       char* proto_name) {
 	xml_ns_t* new;
 	xml_ns_t* orig;
 	gchar* fqn;
 	gint* ett_p;
 	struct _attr_reg_data d;
-    gboolean recurred = FALSE;
-    guint i;
+	gboolean recurred = FALSE;
+	guint i;
 
-    if ( g_str_equal(elem_name,root->name) ) {
-        return NULL;
-    }
+	if ( g_str_equal(elem_name,root->name) ) {
+		return NULL;
+	}
 
 	if (! ( orig = g_hash_table_lookup(elements,elem_name) )) {
 		g_string_append_printf(error,"element '%s' is not defined\n", elem_name);
 		return NULL;
 	}
 
-    for (i = 0; i < hier->len; i++) {
-        if( strcmp(elem_name,(gchar*) g_ptr_array_index(hier,i) ) == 0 ) {
-            recurred = TRUE;
-        }
-    }
+	for (i = 0; i < hier->len; i++) {
+		if( strcmp(elem_name,(gchar*) g_ptr_array_index(hier,i) ) == 0 ) {
+			recurred = TRUE;
+		}
+	}
 
-    if (recurred) {
-        return NULL;
-    }
+	if (recurred) {
+		return NULL;
+	}
 
 	fqn = fully_qualified_name(hier,elem_name,proto_name);
 
 	new = duplicate_element(orig);
 	new->fqn = fqn;
 
-    add_xml_field(hfs, &(new->hf_tag), g_strdup(elem_name), fqn);
+	add_xml_field(hfs, &(new->hf_tag), g_strdup(elem_name), fqn);
 	add_xml_field(hfs, &(new->hf_cdata), g_strdup(elem_name), fqn);
 
 	ett_p = &new->ett;
@@ -839,14 +839,14 @@ static xml_ns_t* make_xml_hier(gchar* elem_name,
 		gchar* child_name = g_ptr_array_remove_index(new->element_names,0);
 		xml_ns_t* child_element = NULL;
 
-        g_ptr_array_add(hier,elem_name);
-        child_element = make_xml_hier(child_name, root, elements, hier,error,hfs,etts,proto_name);
-        g_ptr_array_remove_index_fast(hier,hier->len - 1);
+		g_ptr_array_add(hier,elem_name);
+		child_element = make_xml_hier(child_name, root, elements, hier,error,hfs,etts,proto_name);
+		g_ptr_array_remove_index_fast(hier,hier->len - 1);
 
 		if (child_element) {
 			g_hash_table_insert(new->elements,child_element->name,child_element);
 		}
-    }
+	}
 
 	g_ptr_array_free(new->element_names,TRUE);
 	new->element_names = NULL;
@@ -854,26 +854,26 @@ static xml_ns_t* make_xml_hier(gchar* elem_name,
 }
 
 static gboolean free_both(gpointer k, gpointer v, gpointer p _U_) {
-    g_free(k);
-    g_free(v);
-    return TRUE;
+	g_free(k);
+	g_free(v);
+	return TRUE;
 }
 
 static gboolean free_elements(gpointer k _U_, gpointer v, gpointer p _U_) {
-    xml_ns_t* e = v;
-    g_free(e->name);
-    g_hash_table_foreach_remove(e->attributes,free_both,NULL);
-    g_hash_table_destroy(e->attributes);
-    g_hash_table_destroy(e->elements);
-
-    while (e->element_names->len) {
-        g_free(g_ptr_array_remove_index(e->element_names,0));
-    }
+	xml_ns_t* e = v;
+	g_free(e->name);
+	g_hash_table_foreach_remove(e->attributes,free_both,NULL);
+	g_hash_table_destroy(e->attributes);
+	g_hash_table_destroy(e->elements);
+
+	while (e->element_names->len) {
+		g_free(g_ptr_array_remove_index(e->element_names,0));
+	}
 
-    g_ptr_array_free(e->element_names,TRUE);
-    g_free(e);
+	g_ptr_array_free(e->element_names,TRUE);
+	g_free(e);
 
-    return TRUE;
+	return TRUE;
 }
 
 static void register_dtd(dtd_build_data_t* dtd_data, GString* errors) {
@@ -884,16 +884,16 @@ static void register_dtd(dtd_build_data_t* dtd_data, GString* errors) {
 	GArray* etts;
 	GPtrArray* hier;
 	gchar* curr_name;
-    GPtrArray* element_names = g_ptr_array_new();
+	GPtrArray* element_names = g_ptr_array_new();
 
-    /* we first populate elements with the those coming from the parser */
+	/* we first populate elements with the those coming from the parser */
 	while(dtd_data->elements->len) {
 		dtd_named_list_t* nl = g_ptr_array_remove_index(dtd_data->elements,0);
 		xml_ns_t* element = g_malloc(sizeof(xml_ns_t));
 
 		/* we will use the first element found as root in case no other one was given. */
 		if (root_name == NULL)
-            root_name = g_strdup(nl->name);
+			root_name = g_strdup(nl->name);
 
 		element->name = nl->name;
 		element->element_names = nl->list;
@@ -903,12 +903,12 @@ static void register_dtd(dtd_build_data_t* dtd_data, GString* errors) {
 		element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
 		element->elements = g_hash_table_new(g_str_hash,g_str_equal);
 
-        if( g_hash_table_lookup(elements,element->name) ) {
-            g_string_append_printf(errors,"element %s defined more than once\n", element->name);
-            free_elements(NULL,element,NULL);
-        } else {
-            g_hash_table_insert(elements,element->name,element);
-            g_ptr_array_add(element_names,g_strdup(element->name));
+		if( g_hash_table_lookup(elements,element->name) ) {
+			g_string_append_printf(errors,"element %s defined more than once\n", element->name);
+			free_elements(NULL,element,NULL);
+		} else {
+			g_hash_table_insert(elements,element->name,element);
+			g_ptr_array_add(element_names,g_strdup(element->name));
 		}
 
 		g_free(nl);
@@ -922,7 +922,7 @@ static void register_dtd(dtd_build_data_t* dtd_data, GString* errors) {
 		if (!element) {
 			g_string_append_printf(errors,"element %s is not defined\n", nl->name);
 
-            goto next_attribute;
+			goto next_attribute;
 		}
 
 		while(nl->list->len) {
@@ -939,136 +939,136 @@ next_attribute:
 		g_free(nl);
 	}
 
-    /* if a proto_root is defined in the dtd we'll use that as root */
+	/* if a proto_root is defined in the dtd we'll use that as root */
 	if( dtd_data->proto_root ) {
-        if(root_name)
-            g_free(root_name);
-        root_name = g_strdup(dtd_data->proto_root);
+		if(root_name)
+			g_free(root_name);
+		root_name = g_strdup(dtd_data->proto_root);
 	}
 
-    /* we use a stack with the names to avoid recurring infinitelly */
+	/* we use a stack with the names to avoid recurring infinitelly */
 	hier = g_ptr_array_new();
 
-    /*
-     * if a proto name was given in the dtd the dtd will be used as a protocol
-     * or else the dtd will be loaded as a branch of the xml namespace
-     */
+	/*
+	 * if a proto name was given in the dtd the dtd will be used as a protocol
+	 * or else the dtd will be loaded as a branch of the xml namespace
+	 */
 	if( ! dtd_data->proto_name ) {
 		hfs = hf_arr;
 		etts = ett_arr;
 		g_ptr_array_add(hier,g_strdup("xml"));
 		root_element = &xml_ns;
 	} else {
-        /*
-         * if we were given a proto_name the namespace will be registered
-         * as an indipendent protocol with its own hf and ett arrays.
-         */
-	    hfs = g_array_new(FALSE,FALSE,sizeof(hf_register_info));
-	    etts = g_array_new(FALSE,FALSE,sizeof(gint*));
+		/*
+		 * if we were given a proto_name the namespace will be registered
+		 * as an indipendent protocol with its own hf and ett arrays.
+		 */
+		hfs = g_array_new(FALSE,FALSE,sizeof(hf_register_info));
+		etts = g_array_new(FALSE,FALSE,sizeof(gint*));
 	}
 
-    /* the root element of the dtd's namespace */
+	/* the root element of the dtd's namespace */
 	root_element = g_malloc(sizeof(xml_ns_t));
-    root_element->name = g_strdup(root_name);
-    root_element->fqn = dtd_data->proto_name ? g_strdup(dtd_data->proto_name) : root_element->name;
-    root_element->hf_tag = -1;
-    root_element->hf_cdata = -1;
-    root_element->ett = -1;
-    root_element->elements = g_hash_table_new(g_str_hash,g_str_equal);
-    root_element->element_names = element_names;
+	root_element->name = g_strdup(root_name);
+	root_element->fqn = dtd_data->proto_name ? g_strdup(dtd_data->proto_name) : root_element->name;
+	root_element->hf_tag = -1;
+	root_element->hf_cdata = -1;
+	root_element->ett = -1;
+	root_element->elements = g_hash_table_new(g_str_hash,g_str_equal);
+	root_element->element_names = element_names;
 
-    /*
-     * we can either create a namespace as a flat namespace
-     * in which all the elements are at the root level
-     * or we can create a recursive namespace
-     */
-    if (dtd_data->recursion) {
-        xml_ns_t* orig_root;
+	/*
+	 * we can either create a namespace as a flat namespace
+	 * in which all the elements are at the root level
+	 * or we can create a recursive namespace
+	 */
+	if (dtd_data->recursion) {
+		xml_ns_t* orig_root;
 
-        make_xml_hier(root_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
+		make_xml_hier(root_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
 
-        g_hash_table_insert(root_element->elements,root_element->name,root_element);
+		g_hash_table_insert(root_element->elements,root_element->name,root_element);
 
-        orig_root = g_hash_table_lookup(elements,root_name);
+		orig_root = g_hash_table_lookup(elements,root_name);
 
-        /* if the root element was defined copy its attrlist to the child */
-        if(orig_root) {
-            struct _attr_reg_data d;
+		/* if the root element was defined copy its attrlist to the child */
+		if(orig_root) {
+			struct _attr_reg_data d;
 
-            d.basename = dtd_data->proto_name;
-            d.hf = hfs;
+			d.basename = dtd_data->proto_name;
+			d.hf = hfs;
 
-            root_element->attributes = copy_attributes_hash(orig_root->attributes);
-            g_hash_table_foreach(root_element->attributes,add_xml_attribute_names,&d);
-        } else {
-            root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
-        }
+			root_element->attributes = copy_attributes_hash(orig_root->attributes);
+			g_hash_table_foreach(root_element->attributes,add_xml_attribute_names,&d);
+		} else {
+			root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
+		}
 
-        /* we then create all the sub hierachies to catch the recurred cases */
-        g_ptr_array_add(hier,root_name);
+		/* we then create all the sub hierachies to catch the recurred cases */
+		g_ptr_array_add(hier,root_name);
 
-        while(root_element->element_names->len) {
-            curr_name = g_ptr_array_remove_index(root_element->element_names,0);
+		while(root_element->element_names->len) {
+			curr_name = g_ptr_array_remove_index(root_element->element_names,0);
 
-            if( ! g_hash_table_lookup(root_element->elements,curr_name) ) {
-                xml_ns_t* new = make_xml_hier(curr_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
-                g_hash_table_insert(root_element->elements,new->name,new);
-            }
+			if( ! g_hash_table_lookup(root_element->elements,curr_name) ) {
+				xml_ns_t* new = make_xml_hier(curr_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
+				g_hash_table_insert(root_element->elements,new->name,new);
+			}
 
-            g_free(curr_name);
-        }
+			g_free(curr_name);
+		}
 
-    } else {
-        /* a flat namespace */
-        g_ptr_array_add(hier,root_name);
+	} else {
+		/* a flat namespace */
+		g_ptr_array_add(hier,root_name);
 
-        root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
+		root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
 
-        while(root_element->element_names->len) {
-            xml_ns_t* new;
-            gint* ett_p;
-            struct _attr_reg_data d;
+		while(root_element->element_names->len) {
+			xml_ns_t* new;
+			gint* ett_p;
+			struct _attr_reg_data d;
 
-            curr_name = g_ptr_array_remove_index(root_element->element_names,0);
-            new = duplicate_element(g_hash_table_lookup(elements,curr_name));
-            new->fqn = fully_qualified_name(hier, curr_name, root_name);
+			curr_name = g_ptr_array_remove_index(root_element->element_names,0);
+			new = duplicate_element(g_hash_table_lookup(elements,curr_name));
+			new->fqn = fully_qualified_name(hier, curr_name, root_name);
 
-            add_xml_field(hfs, &(new->hf_tag), curr_name, new->fqn);
-            add_xml_field(hfs, &(new->hf_cdata), curr_name, new->fqn);
+			add_xml_field(hfs, &(new->hf_tag), curr_name, new->fqn);
+			add_xml_field(hfs, &(new->hf_cdata), curr_name, new->fqn);
 
-            d.basename = new->fqn;
-            d.hf = hfs;
+			d.basename = new->fqn;
+			d.hf = hfs;
 
-            g_hash_table_foreach(new->attributes,add_xml_attribute_names,&d);
+			g_hash_table_foreach(new->attributes,add_xml_attribute_names,&d);
 
-            ett_p = &new->ett;
-            g_array_append_val(etts,ett_p);
+			ett_p = &new->ett;
+			g_array_append_val(etts,ett_p);
 
-            g_ptr_array_free(new->element_names,TRUE);
+			g_ptr_array_free(new->element_names,TRUE);
 
-            g_hash_table_insert(root_element->elements,new->name,new);
-        }
-    }
+			g_hash_table_insert(root_element->elements,new->name,new);
+		}
+	}
 
-    g_ptr_array_free(element_names,TRUE);
+	g_ptr_array_free(element_names,TRUE);
 
 	g_ptr_array_free(hier,TRUE);
 
-    /*
-     * if we were given a proto_name the namespace will be registered
-     * as an indipendent protocol.
-     */
+	/*
+	 * if we were given a proto_name the namespace will be registered
+	 * as an indipendent protocol.
+	 */
 	if( dtd_data->proto_name ) {
-        gint* ett_p;
+		gint* ett_p;
 
 		if ( ! dtd_data->description) {
 			dtd_data->description = g_strdup(root_name);
 		}
 
-        ett_p = &root_element->ett;
-        g_array_append_val(etts,ett_p);
+		ett_p = &root_element->ett;
+		g_array_append_val(etts,ett_p);
 
-        add_xml_field(hfs, &root_element->hf_cdata, root_element->name, root_element->fqn);
+		add_xml_field(hfs, &root_element->hf_cdata, root_element->name, root_element->fqn);
 
 		root_element->hf_tag = proto_register_protocol(dtd_data->description, dtd_data->proto_name, dtd_data->proto_name);
 		proto_register_field_array(root_element->hf_tag, (hf_register_info*)g_array_data(hfs), hfs->len);
@@ -1085,15 +1085,15 @@ next_attribute:
 		g_array_free(etts,TRUE);
 	}
 
-    g_hash_table_insert(xml_ns.elements,root_element->name,root_element);
+	g_hash_table_insert(xml_ns.elements,root_element->name,root_element);
 
-    g_hash_table_foreach_remove(elements,free_elements,NULL);
-    g_hash_table_destroy(elements);
+	g_hash_table_foreach_remove(elements,free_elements,NULL);
+	g_hash_table_destroy(elements);
 
 	destroy_dtd_data(dtd_data);
 
-    if (root_name)
-        g_free(root_name);
+	if (root_name)
+		g_free(root_name);
 }
 
 #  define DIRECTORY_T GDir
@@ -1136,44 +1136,44 @@ static void init_xml_names(void) {
 
 	if (test_for_directory(dirname) == EISDIR) {
 
-	    if ((dir = OPENDIR_OP(dirname)) != NULL) {
-	        while ((file = DIRGETNEXT_OP(dir)) != NULL) {
-	            guint namelen;
-	            filename = GETFNAME_OP(file);
+		if ((dir = OPENDIR_OP(dirname)) != NULL) {
+			while ((file = DIRGETNEXT_OP(dir)) != NULL) {
+				guint namelen;
+				filename = GETFNAME_OP(file);
 
-	            namelen = strlen(filename);
-	            if ( namelen > 4 && ( g_ascii_strcasecmp(filename+(namelen-4),".dtd")  == 0 ) ) {
-	                GString* errors = g_string_new("");
-	                GString* preparsed = dtd_preparse(dirname, filename, errors);
-	                dtd_build_data_t* dtd_data;
+				namelen = strlen(filename);
+				if ( namelen > 4 && ( g_ascii_strcasecmp(filename+(namelen-4),".dtd")  == 0 ) ) {
+					GString* errors = g_string_new("");
+					GString* preparsed = dtd_preparse(dirname, filename, errors);
+					dtd_build_data_t* dtd_data;
 
-	                if (errors->len) {
-	                    report_failure("Dtd Preparser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
-	                    continue;
-	                }
+					if (errors->len) {
+						report_failure("Dtd Preparser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
+						continue;
+					}
 
-	                dtd_data = dtd_parse(preparsed);
+					dtd_data = dtd_parse(preparsed);
 
-	                g_string_free(preparsed,TRUE);
+					g_string_free(preparsed,TRUE);
 
-	                if (dtd_data->error->len) {
-	                    report_failure("Dtd Parser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,dtd_data->error->str);
-	                    destroy_dtd_data(dtd_data);
-	                    continue;
-	                }
+					if (dtd_data->error->len) {
+						report_failure("Dtd Parser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,dtd_data->error->str);
+						destroy_dtd_data(dtd_data);
+						continue;
+					}
 
-	                register_dtd(dtd_data,errors);
+					register_dtd(dtd_data,errors);
 
-	                if (errors->len) {
-	                    report_failure("Dtd Registration in file: %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
-	                    g_string_free(errors,TRUE);
-	                    continue;
-	                }
-	            }
-	        }
+					if (errors->len) {
+						report_failure("Dtd Registration in file: %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
+						g_string_free(errors,TRUE);
+						continue;
+					}
+				}
+			}
 
-	        CLOSEDIR_OP(dir);
-	    }
+			CLOSEDIR_OP(dir);
+		}
 	}
 
 	g_free(dirname);
@@ -1212,7 +1212,7 @@ static void apply_prefs(void) {
 		}
 	}
 	
-    if (pref_heuristic_tcp_save != pref_heuristic_tcp ) {
+	if (pref_heuristic_tcp_save != pref_heuristic_tcp ) {
 		if (pref_heuristic_tcp) {
 			heur_dissector_add("tcp", dissect_xml_heur, xml_ns.hf_tag);
 			pref_heuristic_tcp_save = TRUE;
@@ -1222,7 +1222,7 @@ static void apply_prefs(void) {
 		}
 	}
 	
-    if (pref_heuristic_udp_save != pref_heuristic_udp ) {
+	if (pref_heuristic_udp_save != pref_heuristic_udp ) {
 		if (pref_heuristic_udp) {
 			heur_dissector_add("udp", dissect_xml_heur, xml_ns.hf_tag);
 			pref_heuristic_udp_save = TRUE;
@@ -1273,21 +1273,21 @@ proto_register_xml(void) {
 	proto_register_subtree_array((gint**)g_array_data(ett_arr), ett_arr->len);
 
 	xml_module = prefs_register_protocol(xml_ns.hf_tag,apply_prefs);
-    prefs_register_bool_preference(xml_module, "heuristic", "Use Heuristics for media types",
+	prefs_register_bool_preference(xml_module, "heuristic", "Use Heuristics for media types",
                                    "Try to recognize XML for unknown media types",
                                    &pref_heuristic_media);
-    prefs_register_bool_preference(xml_module, "heuristic_tcp", "Use Heuristics for tcp",
+	prefs_register_bool_preference(xml_module, "heuristic_tcp", "Use Heuristics for tcp",
                                    "Try to recognize XML for unknown TCP ports",
                                    &pref_heuristic_tcp);
 	prefs_register_range_preference(xml_module, "tcp.port", "TCP Ports",
 									"TCP Ports range",
 									&global_xml_tcp_range, 65535);
-    prefs_register_bool_preference(xml_module, "heuristic_udp", "Use Heuristics for UDP",
+	prefs_register_bool_preference(xml_module, "heuristic_udp", "Use Heuristics for UDP",
                                    "Try to recognize XML for unknown UDP ports",
                                    &pref_heuristic_udp);
 	
-    g_array_free(hf_arr,FALSE);
-    g_array_free(ett_arr,TRUE);
+	g_array_free(hf_arr,FALSE);
+	g_array_free(ett_arr,TRUE);
 
 	register_dissector("xml", dissect_xml, xml_ns.hf_tag);