Update of /cvsroot/xine/xine-lib/src/xine-utils
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12630/src/xine-utils
Modified Files:
xmllexer.c xmllexer.h xmlparser.c xmlparser.h
Log Message:
- commit documentation, and header changes for the relicensing of the
xine-lib XML parser to GNU LGPL
Index: xmllexer.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xmllexer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xmllexer.c 20 Jun 2006 00:35:08 -0000 1.12
+++ xmllexer.c 4 Mar 2007 16:19:12 -0000 1.13
@@ -1,21 +1,22 @@
/*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2003,2007 the xine project
*
* This file is part of xine, a free video player.
*
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The xine-lib XML parser is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * The xine-lib XML parser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*
* $Id$
*
@@ -27,11 +28,17 @@
#define LOG
*/
+#ifdef XINE_COMPILE
#include "xineutils.h"
+#else
+#define lprintf(...)
+#define xine_xmalloc malloc
+#endif
#include "xmllexer.h"
#include <stdio.h>
#include <ctype.h>
#include <string.h>
+#include <stdlib.h>
/* private constants*/
#define NORMAL 0 /* normal lex mode */
Index: xmllexer.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xmllexer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmllexer.h 26 Sep 2006 05:19:49 -0000 1.7
+++ xmllexer.h 4 Mar 2007 16:19:12 -0000 1.8
@@ -1,21 +1,22 @@
/*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2003,2007 the xine project
*
* This file is part of xine, a free video player.
*
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * The xine-lib XML parser is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The xine-lib XML parser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*
* $Id$
*
@@ -25,6 +26,10 @@
#ifndef XML_LEXER_H
#define XML_LEXER_H
+#ifndef XINE_PROTECTED
+#define XINE_PROTECTED
+#endif
+
/* public constants */
#define T_ERROR -1 /* lexer error */
#define T_EOF 0 /* end of file */
Index: xmlparser.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xmlparser.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xmlparser.c 14 Feb 2006 02:25:01 -0000 1.15
+++ xmlparser.c 4 Mar 2007 16:19:12 -0000 1.16
@@ -1,22 +1,22 @@
/*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2003,2007 the xine project
*
* This file is part of xine, a free video player.
- * This file is part of gxine, a free video player.
*
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The xine-lib XML parser is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
*
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The xine-lib XML parser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*
* $Id$
*
@@ -35,7 +35,12 @@
#define LOG
*/
+#ifdef XINE_COMPILE
#include "xineutils.h"
+#else
+#define lprintf(...)
+#define xine_xmalloc malloc
+#endif
#include "xmllexer.h"
#include "xmlparser.h"
@@ -466,7 +471,7 @@
return res;
}
-char *xml_parser_get_property (const xml_node_t *node, const char *name) {
+const char *xml_parser_get_property (const xml_node_t *node, const char *name)
{
xml_property_t *prop;
@@ -489,8 +494,8 @@
int xml_parser_get_property_int (const xml_node_t *node, const char *name,
int def_value) {
- char *v;
- int ret;
+ const char *v;
+ int ret;
v = xml_parser_get_property (node, name);
@@ -506,7 +511,7 @@
int xml_parser_get_property_bool (const xml_node_t *node, const char *name,
int def_value) {
- char *v;
+ const char *v;
v = xml_parser_get_property (node, name);
Index: xmlparser.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xmlparser.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmlparser.h 26 Sep 2006 05:19:49 -0000 1.5
+++ xmlparser.h 4 Mar 2007 16:19:12 -0000 1.6
@@ -1,28 +1,34 @@
/*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2003,2007 the xine project
*
* This file is part of xine, a free video player.
*
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * The xine-lib XML parser is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The xine-lib XML parser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*
* $Id$
*
*/
+
#ifndef XML_PARSER_H
#define XML_PARSER_H
+#ifndef XINE_PROTECTED
+#define XINE_PROTECTED
+#endif
+
/* parser modes */
#define XML_PARSER_CASE_INSENSITIVE 0
#define XML_PARSER_CASE_SENSITIVE 1
@@ -54,7 +60,7 @@
void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED;
-char *xml_parser_get_property (const xml_node_t *node, const char *name)
XINE_PROTECTED;
+const char *xml_parser_get_property (const xml_node_t *node, const char *name)
XINE_PROTECTED;
int xml_parser_get_property_int (const xml_node_t *node, const char *name,
int def_value) XINE_PROTECTED;
int xml_parser_get_property_bool (const xml_node_t *node, const char *name,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
