[aravis/dom] gc: remove commented out parsing code.

[Emmanuel Pacaud <emmanuel src gnome org>]

commit 9b331ed404587c59ac3a1c7f2d3a5e41bd1dde85
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Fri Mar 2 11:40:27 2012 +0100

    gc: remove commented out parsing code.
    
    It's now in DomParser.

 src/arvgc.c |  246 -----------------------------------------------------------
 src/arvgc.h |    2 +-
 2 files changed, 1 insertions(+), 247 deletions(-)
---
diff --git a/src/arvgc.c b/src/arvgc.c
index 19aa621..a26efca 100644
--- a/src/arvgc.c
+++ b/src/arvgc.c
@@ -388,249 +388,3 @@ arv_gc_class_init (ArvGcClass *node_class)
 }
 
 G_DEFINE_TYPE (ArvGc, arv_gc, ARV_TYPE_DOM_DOCUMENT)
-#if 0
-static ArvGcFeatureNode *
-arv_gc_create_node (ArvGc *genicam, const char *type)
-{
-	ArvGcFeatureNode *node = NULL;
-
-	g_return_val_if_fail (type != NULL, NULL);
-
-	if (strcmp (type, "Category") == 0)
-		node = arv_gc_category_new ();
-	else if (strcmp (type, "Command") == 0)
-		node = arv_gc_command_new ();
-	else if (strcmp (type, "Converter") == 0)
-		node = arv_gc_converter_new ();
-	else if (strcmp (type, "IntConverter") == 0)
-		node = arv_gc_converter_new_integer ();
-	else if (strcmp (type, "IntReg") == 0)
-		node = arv_gc_register_new_integer ();
-	else if (strcmp (type, "MaskedIntReg") == 0)
-		node = arv_gc_register_new_masked_integer ();
-	else if (strcmp (type, "FloatReg") == 0)
-		node = arv_gc_register_new_float ();
-	else if (strcmp (type, "StringReg") == 0)
-		node = arv_gc_register_new_string ();
-	else if (strcmp (type, "Integer") == 0)
-		node = arv_gc_integer_node_new ();
-	else if (strcmp (type, "Float") == 0)
-		node = arv_gc_float_node_new ();
-	else if (strcmp (type, "Boolean") == 0)
-		node = arv_gc_boolean_new ();
-	else if (strcmp (type, "Enumeration") == 0)
-		node = arv_gc_enumeration_new ();
-	else if (strcmp (type, "EnumEntry") == 0)
-		node = arv_gc_enum_entry_new ();
-	else if (strcmp (type, "SwissKnife") == 0)
-		node = arv_gc_swiss_knife_new ();
-	else if (strcmp (type, "IntSwissKnife") == 0)
-		node = arv_gc_swiss_knife_new_integer ();
-	else if (strcmp (type, "Port") == 0)
-		node = arv_gc_port_new ();
-
-	if (node != NULL) {
-		arv_gc_feature_node_set_genicam (node, genicam);
-		arv_log_genicam ("[Gc::create_node] Node '%s' created", type);
-	}
-
-	return node;
-}
-
-typedef struct {
-	int level;
-	ArvGc *genicam;
-	ArvGcFeatureNode *level_2_node;
-	ArvGcFeatureNode *level_3_node;
-
-	const char *current_element;
-	char **current_attrs;
-	GString *current_content;
-} ArvGcParserState;
-
-static void
-arv_gc_parser_start_document (void *user_data)
-{
-	ArvGcParserState *state = user_data;
-
-	state->level = 0;
-	state->level_2_node = NULL;
-	state->level_3_node = NULL;
-	state->current_element = NULL;
-	state->current_attrs = NULL;
-	state->current_content = g_string_new ("");
-}
-
-static void
-arv_gc_parser_end_document (void *user_data)
-{
-	ArvGcParserState *state = user_data;
-
-	g_string_free (state->current_content, TRUE);
-	g_strfreev (state->current_attrs);
-}
-
-static void
-arv_gc_parser_start_element(void *user_data,
-			    const xmlChar *name,
-			    const xmlChar **attrs)
-{
-	ArvGcParserState *state = user_data;
-	ArvGcFeatureNode *node;
-
-	/* Just ignore Group elements */
-	if (g_strcmp0 ((char *) name, "Group") == 0)
-		return;
-
-	state->level++;
-
-	node = arv_gc_create_node (state->genicam, (char *) name);
-	if (node != NULL) {
-		int i;
-		for (i = 0; attrs[i] != NULL && attrs[i+1] != NULL; i += 2)
-			arv_gc_feature_node_set_attribute (node, (char *) attrs[i], (char *) attrs[i+1]);
-	}
-
-	if (state->level == 2) {
-		state->level_2_node = node;
-		if (node != NULL)
-			g_object_ref (node);
-	} else if (state->level > 2 && state->level_2_node != NULL) {
-		if (state->level == 3 && node != NULL) {
-			state->level_3_node = node;
-			g_object_ref (node);
-		} else {
-			int n_elements, i;
-			state->current_element = (const char *) name;
-
-			g_strfreev (state->current_attrs);
-
-			if (attrs != NULL) {
-				for (n_elements = 0; attrs[n_elements] != NULL; n_elements++);
-				n_elements++;
-
-				state->current_attrs = g_new (char *, n_elements);
-				for (i = 0; i < n_elements; i++)
-					state->current_attrs[i] = g_strdup ((char *) attrs[i]);
-			} else {
-				state->current_attrs = g_new (char *, 1);
-				state->current_attrs[0] = NULL;
-			}
-
-			g_string_erase (state->current_content, 0, -1);
-		}
-	}
-
-	if (node != NULL)
-		g_object_unref (node);
-}
-
-static void
-arv_gc_parser_insert_node (ArvGcParserState *state, ArvGcFeatureNode *node)
-{
-	const char *node_name;
-
-	node_name = arv_gc_feature_node_get_name (node);
-	if (node_name != NULL) {
-		g_hash_table_insert (state->genicam->nodes, (char *) node_name, node);
-		arv_log_genicam ("[GcParser::end_element] Insert node '%s'", node_name);
-	} else
-		g_object_unref (node);
-}
-
-static void
-arv_gc_parser_end_element (void *user_data,
-			   const xmlChar *name)
-{
-	ArvGcParserState *state = user_data;
-
-	/* Just ignore Group elements */
-	if (g_strcmp0 ((char *) name, "Group") == 0)
-		return;
-
-	if (state->level == 2) {
-		if (state->level_2_node != NULL) {
-			arv_gc_parser_insert_node (state, state->level_2_node);
-			state->level_2_node = NULL;
-		}
-	} else if (state->level > 2) {
-		if (state->level == 3 && state->level_3_node != NULL) {
-			if (state->level_2_node != NULL &&
-			    arv_gc_feature_node_can_add_child (state->level_2_node, state->level_3_node))
-				arv_gc_feature_node_add_child (state->level_2_node, state->level_3_node);
-			else
-				g_object_unref (state->level_3_node);
-			state->level_3_node = NULL;
-		} else if (state->level == 3 && state->level_2_node != NULL) {
-			arv_gc_feature_node_add_element (state->level_2_node, state->current_element,
-						 state->current_content->str, (const char **) state->current_attrs);
-		} else if (state->level == 4 && state->level_3_node != NULL) {
-			arv_gc_feature_node_add_element (state->level_3_node, state->current_element,
-						 state->current_content->str, (const char **) state->current_attrs);
-		}
-	}
-
-	state->level--;
-}
-
-static void
-arv_gc_parser_characters (void *user_data,
-			  const xmlChar *text,
-			  int length)
-{
-	ArvGcParserState *state = user_data;
-
-	g_string_append_len (state->current_content, (char *) text, length);
-}
-
-static void
-arv_gc_parser_warning (void *user_data, const char *msg, ...)
-{
-	va_list args;
-
-	va_start(args, msg);
-	g_logv("GcParser", G_LOG_LEVEL_WARNING, msg, args);
-	va_end(args);
-}
-
-static void
-arv_gc_parser_error (void *user_data, const char *msg, ...)
-{
-	va_list args;
-
-	va_start(args, msg);
-	g_logv("GcParser", G_LOG_LEVEL_CRITICAL, msg, args);
-	va_end(args);
-}
-
-static void
-arv_gc_parser_fatal_error (void *user_data, const char *msg, ...)
-{
-	va_list args;
-
-	va_start(args, msg);
-	g_logv("GcParser", G_LOG_LEVEL_ERROR, msg, args);
-	va_end(args);
-}
-
-static xmlSAXHandler sax_handler = {
-	.warning = arv_gc_parser_warning,
-	.error = arv_gc_parser_error,
-	.fatalError = arv_gc_parser_fatal_error,
-	.startDocument = arv_gc_parser_start_document,
-	.endDocument = arv_gc_parser_end_document,
-	.startElement = arv_gc_parser_start_element,
-	.endElement = arv_gc_parser_end_element,
-	.characters = arv_gc_parser_characters
-};
-
-static void
-arv_gc_parse_xml (ArvGc *genicam, const char *xml, size_t size)
-{
-	static ArvGcParserState state;
-
-	state.genicam = genicam;
-
-	xmlSAXUserParseMemory (&sax_handler, &state, xml, size);
-}
-#endif
diff --git a/src/arvgc.h b/src/arvgc.h
index 2b34bb9..67c7722 100644
--- a/src/arvgc.h
+++ b/src/arvgc.h
@@ -1,6 +1,6 @@
 /* Aravis - Digital camera library
  *
- * Copyright  2009-2010 Emmanuel Pacaud
+ * Copyright  2009-2012 Emmanuel Pacaud
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public