cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...

CVS patchset: 5844
CVS date: 2003/12/05 15:54:56

1 files changed, 13 insertions, 14 deletions

diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index e7a06f65d..b232a1931 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -18,7 +18,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- *  $Id: xmlparser.c,v 1.11 2003/11/26 19:43:38 f1rmb Exp $
+ *  $Id: xmlparser.c,v 1.12 2003/12/05 15:55:05 f1rmb Exp $
  *
  */
 
@@ -209,7 +209,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  lprintf("info: node data : %s\n", current_node->data);
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -230,7 +230,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  lprintf("info: current node name \"%s\"\n", node_name);
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -296,7 +296,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  lprintf("info: current property name \"%s\"\n", property_name);
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -312,12 +312,12 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  if (strcmp(tok, root_name) == 0) {
 	    state = 4;
 	  } else {
-	    printf("xmlparser: error: xml struct, tok=%s, waited_tok=%s\n", tok, root_name);
+	    lprintf("xmlparser: error: xml struct, tok=%s, waited_tok=%s\n", tok, root_name);
 	    return -1;
 	  }
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -330,7 +330,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  return 0;
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -365,7 +365,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  state = 2;
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -394,7 +394,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 	  state = 2;
 	  break;
 	default:
-	  printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+	  lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
 	  return -1;
 	  break;
 	}
@@ -438,16 +438,16 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
 
 
       default:
-	printf("xmlparser: error: unknown parser state, state=%d\n", state);
+	lprintf("xmlparser: error: unknown parser state, state=%d\n", state);
 	return -1;
       }
     }
     /* lex error */
-    printf("xmlparser: error: lexer error\n");
+    lprintf("xmlparser: error: lexer error\n");
     return -1;
   } else {
     /* max recursion */
-    printf("xmlparser: error: max recursion\n");
+    lprintf("xmlparser: error: max recursion\n");
     return -1;
   }
 }
@@ -463,7 +463,7 @@ int xml_parser_build_tree(xml_node_t **root_node) {
     free_xml_node(tmp_node);
     res = 0;
   } else {
-    printf("xmlparser: error: xml struct\n");
+    lprintf("xmlparser: error: xml struct\n");
     xml_parser_free_tree(tmp_node);
     res = -1;
   }
@@ -573,4 +573,3 @@ static void xml_parser_dump_node (xml_node_t *node, int indent) {
 void xml_parser_dump_tree (xml_node_t *node) {
   xml_parser_dump_node (node, 0);
 }
-