[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: merged in libxmlj

Kaffe CVS cvs-commits at kaffe.org
Wed Jan 5 15:00:43 PST 2005


PatchSet 5774 
Date: 2005/01/05 22:56:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: merged in libxmlj

Members: 
	ChangeLog:1.3318->1.3319 
	libraries/clib/libxmlj/xmlj_dom.c:1.6->1.7 
	libraries/clib/libxmlj/xmlj_dom.h:1.5->1.6 
	libraries/clib/libxmlj/xmlj_error.c:1.5->1.6 
	libraries/clib/libxmlj/xmlj_error.h:1.3->1.4 
	libraries/clib/libxmlj/xmlj_io.c:1.7->1.8 
	libraries/clib/libxmlj/xmlj_io.h:1.5->1.6 
	libraries/clib/libxmlj/xmlj_node.c:1.5->1.6 
	libraries/clib/libxmlj/xmlj_node.h:1.1->1.2 
	libraries/clib/libxmlj/xmlj_sax.c:1.7->1.8 
	libraries/clib/libxmlj/xmlj_sax.h:1.2->1.3 
	libraries/clib/libxmlj/xmlj_transform.c:1.7->1.8 
	libraries/clib/libxmlj/xmlj_util.c:1.7->1.8 
	libraries/clib/libxmlj/xmlj_util.h:1.5->1.6 
	libraries/clib/libxmlj/xmlj_xpath.c:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3318 kaffe/ChangeLog:1.3319
--- kaffe/ChangeLog:1.3318	Wed Jan  5 22:40:55 2005
+++ kaffe/ChangeLog	Wed Jan  5 22:56:08 2005
@@ -1,5 +1,13 @@
 2005-01-05  Dalibor Topic  <robilad at kaffe.org>
 
+	Resynced with GNU Classpath.
+	
+	2004-12-29  Mark Wielaard  <mark at klomp.org>
+
+	* native/jni/xmlj/*: New files.
+
+2005-01-05  Dalibor Topic  <robilad at kaffe.org>
+	
 	* libraries/javalib/java/util/zip/ZipFile.java (ZipFile):
 	Synchronize on file name before calling native method, in order to
 	avoid races between threads trying to load the same file and
Index: kaffe/libraries/clib/libxmlj/xmlj_dom.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.6 kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.7
--- kaffe/libraries/clib/libxmlj/xmlj_dom.c:1.6	Sat Dec  4 21:12:19 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_dom.c	Wed Jan  5 22:56:14 2005
@@ -1,29 +1,40 @@
-/*
- * xmlj_dom.c
- * Copyright (C) 2004 The Free Software Foundation
- * 
- * This file is part of GNU JAXP, a library.
- * 
- * GNU JAXP 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.
- * 
- * GNU JAXP 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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
- */
+/* xmlj_dom.c - 
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
 #include "xmlj_dom.h"
 #include "xmlj_error.h"
 #include "xmlj_io.h"
@@ -243,7 +254,9 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeDocument_free (JNIEnv * env,
-                                             jobject self, jobject id)
+                                             jobject self
+					     __attribute__ ((__unused__)),
+					     jobject id)
 {
   xmlDocPtr doc;
 
@@ -701,10 +714,14 @@
 
 JNIEXPORT jobject JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeDocument_renameNode (JNIEnv * env,
-                                                   jobject self,
-                                                   jobject n,
-                                                   jstring namespaceURI,
-                                                   jstring qName)
+                                                   jobject self
+						   __attribute__ ((__unused__)),
+                                                   jobject n
+ 						   __attribute__ ((__unused__)),
+                                                   jstring namespaceURI
+						   __attribute__ ((__unused__)),
+                                                   jstring qName
+						   __attribute__ ((__unused__)))
 {
   xmlNodePtr node;
   xmlNsPtr ns;
@@ -933,7 +950,8 @@
 
 JNIEXPORT jstring JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeDocumentType_getInternalSubset (JNIEnv * env,
-                                                              jobject self)
+                                                             jobject self
+							     __attribute__ ((__unused__)))
 {
   /* TODO */
   xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
@@ -1033,7 +1051,8 @@
 
 JNIEXPORT jobject JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeElement_removeAttributeNode (JNIEnv * env,
-                                                           jobject self,
+                                                           jobject self
+							   __attribute__ ((__unused__)),
                                                            jobject oldAttr)
 {
   xmlNodePtr attr;
@@ -1240,7 +1259,8 @@
 
 JNIEXPORT jstring JNICALL
 Java_gnu_xml_libxmlj_dom_GnomeEntity_getNotationName (JNIEnv * env,
-                                                      jobject self)
+                                                      jobject self
+						      __attribute__ ((__unused__)))
 {
   /* TODO */
   xmljThrowDOMException (env, 9, NULL); /* NOT_SUPPORTED_ERR */
@@ -2506,11 +2526,16 @@
 }
 
 JNIEXPORT jboolean JNICALL 
-Java_gnu_xml_libxmlj_dom_GnomeTypeInfo_isDerivedFrom (JNIEnv *env,
-                                                      jobject self,
-                                                      jstring typeNS,
-                                                      jstring typeName,
-                                                      jint method)
+Java_gnu_xml_libxmlj_dom_GnomeTypeInfo_isDerivedFrom (JNIEnv *env
+						      __attribute__ ((__unused__)),
+                                                      jobject self
+						      __attribute__ ((__unused__)),
+                                                      jstring typeNS
+						      __attribute__ ((__unused__)),
+                                                      jstring typeName
+						      __attribute__ ((__unused__)),
+                                                      jint method
+						      __attribute__ ((__unused__)))
 {
   /* TODO when XML Schema support is available */
   return 0;
Index: kaffe/libraries/clib/libxmlj/xmlj_dom.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.5 kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_dom.h:1.5	Sat Dec  4 21:12:19 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_dom.h	Wed Jan  5 22:56:14 2005
@@ -1,29 +1,40 @@
-/*
- * xmlj_dom.h
- * Copyright (C) 2004 The Free Software Foundation
- * 
- * This file is part of GNU JAXP, a library.
- * 
- * GNU JAXP 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.
- * 
- * GNU JAXP 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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
- */
+/* xmlj_dom.h -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
 #ifndef XMLJ_DOM_H
 #define XMLJ_DOM_H
 
Index: kaffe/libraries/clib/libxmlj/xmlj_error.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_error.c:1.5 kaffe/libraries/clib/libxmlj/xmlj_error.c:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_error.c:1.5	Sun Oct 10 18:43:13 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_error.c	Wed Jan  5 22:56:15 2005
@@ -1,40 +1,39 @@
-/* 
- * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Classpathx/jaxp.
- * 
- * GNU Classpath 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, or (at your option)
- * any later version.
- *  
- * GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- * 
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library.  Thus, the terms and
- * conditions of the GNU General Public License cover the whole
- * combination.
- * 
- * As a special exception, the copyright holders of this library give you
- * permission to link this library with independent modules to produce an
- * executable, regardless of the license terms of these independent
- * modules, and to copy and distribute the resulting executable under
- * terms of your choice, provided that you also meet, for each linked
- * independent module, the terms and conditions of the license of that
- * module.  An independent module is a module which is not derived from
- * or based on this library.  If you modify this library, you may extend
- * this exception to your version of the library, but you are not
- * obligated to do so.  If you do not wish to do so, delete this
- * exception statement from your version.
- */
+/* xmlj_error.c -
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #include "xmlj_error.h"
 #include "xmlj_io.h"
Index: kaffe/libraries/clib/libxmlj/xmlj_error.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_error.h:1.3 kaffe/libraries/clib/libxmlj/xmlj_error.h:1.4
--- kaffe/libraries/clib/libxmlj/xmlj_error.h:1.3	Thu Jun  3 18:56:07 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_error.h	Wed Jan  5 22:56:15 2005
@@ -1,40 +1,39 @@
-/* 
- * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Classpathx/jaxp.
- * 
- * GNU Classpath 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, or (at your option)
- * any later version.
- *  
- * GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- * 
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library.  Thus, the terms and
- * conditions of the GNU General Public License cover the whole
- * combination.
- * 
- * As a special exception, the copyright holders of this library give you
- * permission to link this library with independent modules to produce an
- * executable, regardless of the license terms of these independent
- * modules, and to copy and distribute the resulting executable under
- * terms of your choice, provided that you also meet, for each linked
- * independent module, the terms and conditions of the license of that
- * module.  An independent module is a module which is not derived from
- * or based on this library.  If you modify this library, you may extend
- * this exception to your version of the library, but you are not
- * obligated to do so.  If you do not wish to do so, delete this
- * exception statement from your version.
- */
+/* xmlj_error.h -
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #ifndef XMLJ_ERROR_H
 #define XMLJ_ERROR_H
Index: kaffe/libraries/clib/libxmlj/xmlj_io.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_io.c:1.7 kaffe/libraries/clib/libxmlj/xmlj_io.c:1.8
--- kaffe/libraries/clib/libxmlj/xmlj_io.c:1.7	Sat Dec  4 21:12:19 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_io.c	Wed Jan  5 22:56:16 2005
@@ -1,40 +1,39 @@
-/* 
- * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Classpathx/jaxp.
- * 
- * GNU Classpath 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, or (at your option)
- * any later version.
- *  
- * GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- * 
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library.  Thus, the terms and
- * conditions of the GNU General Public License cover the whole
- * combination.
- * 
- * As a special exception, the copyright holders of this library give you
- * permission to link this library with independent modules to produce an
- * executable, regardless of the license terms of these independent
- * modules, and to copy and distribute the resulting executable under
- * terms of your choice, provided that you also meet, for each linked
- * independent module, the terms and conditions of the license of that
- * module.  An independent module is a module which is not derived from
- * or based on this library.  If you modify this library, you may extend
- * this exception to your version of the library, but you are not
- * obligated to do so.  If you do not wish to do so, delete this
- * exception statement from your version.
- */
+/* xmlj_io.c -
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #include "xmlj_io.h"
 #include "xmlj_error.h"
Index: kaffe/libraries/clib/libxmlj/xmlj_io.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_io.h:1.5 kaffe/libraries/clib/libxmlj/xmlj_io.h:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_io.h:1.5	Mon Aug 16 02:43:43 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_io.h	Wed Jan  5 22:56:16 2005
@@ -1,40 +1,39 @@
-/* 
- * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Classpathx/jaxp.
- * 
- * GNU Classpath 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, or (at your option)
- * any later version.
- *  
- * GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- * 
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library.  Thus, the terms and
- * conditions of the GNU General Public License cover the whole
- * combination.
- * 
- * As a special exception, the copyright holders of this library give you
- * permission to link this library with independent modules to produce an
- * executable, regardless of the license terms of these independent
- * modules, and to copy and distribute the resulting executable under
- * terms of your choice, provided that you also meet, for each linked
- * independent module, the terms and conditions of the license of that
- * module.  An independent module is a module which is not derived from
- * or based on this library.  If you modify this library, you may extend
- * this exception to your version of the library, but you are not
- * obligated to do so.  If you do not wish to do so, delete this
- * exception statement from your version.
- */
+/* xmlj_io.h -
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #ifndef XMLJ_IO_H
 #define XMLJ_IO_H
Index: kaffe/libraries/clib/libxmlj/xmlj_node.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_node.c:1.5 kaffe/libraries/clib/libxmlj/xmlj_node.c:1.6
--- kaffe/libraries/clib/libxmlj/xmlj_node.c:1.5	Sat Dec  4 21:12:19 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_node.c	Wed Jan  5 22:56:16 2005
@@ -1,29 +1,40 @@
-/*
- * xmlj_node.c
- * Copyright (C) 2004 The Free Software Foundation
- * 
- * This file is part of GNU JAXP, a library.
- * 
- * GNU JAXP 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.
- * 
- * GNU JAXP 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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
- */
+/* xmlj_node.c -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
 #include "xmlj_error.h"
 #include "xmlj_node.h"
 #include "xmlj_util.h"
Index: kaffe/libraries/clib/libxmlj/xmlj_node.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_node.h:1.1 kaffe/libraries/clib/libxmlj/xmlj_node.h:1.2
--- kaffe/libraries/clib/libxmlj/xmlj_node.h:1.1	Wed May 19 17:27:46 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_node.h	Wed Jan  5 22:56:16 2005
@@ -1,29 +1,40 @@
-/*
- * xmlj_node.h
- * Copyright (C) 2004 The Free Software Foundation
- * 
- * This file is part of GNU JAXP, a library.
- * 
- * GNU JAXP 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.
- * 
- * GNU JAXP 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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
- */
+/* xmlj_node.h -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
 #ifndef XMLJ_NODE_H
 #define XMLJ_NODE_H
 
Index: kaffe/libraries/clib/libxmlj/xmlj_sax.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_sax.c:1.7 kaffe/libraries/clib/libxmlj/xmlj_sax.c:1.8
--- kaffe/libraries/clib/libxmlj/xmlj_sax.c:1.7	Sat Dec  4 21:12:19 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_sax.c	Wed Jan  5 22:56:16 2005
@@ -1,29 +1,39 @@
-/*
- * xmlj_sax.c
- * Copyright (C) 2004 The Free Software Foundation
- * 
- * This file is part of GNU JAXP, a library.
- * 
- * GNU JAXP 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.
- * 
- * GNU JAXP 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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
- */
+/* xmlj_sax.c -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #include "xmlj_sax.h"
 #include "xmlj_io.h"
@@ -46,7 +56,8 @@
 
 JNIEXPORT jstring JNICALL
 Java_gnu_xml_libxmlj_sax_GnomeLocator_publicId (JNIEnv * env,
-                                                jobject self,
+                                                jobject self
+						__attribute__((__unused__)),
                                                 jobject j_ctx,
                                                 jobject j_loc)
 {
@@ -63,7 +74,8 @@
 
 JNIEXPORT jstring JNICALL
 Java_gnu_xml_libxmlj_sax_GnomeLocator_systemId (JNIEnv * env,
-                                                jobject self,
+                                                jobject self
+						__attribute__((__unused__)),
                                                 jobject j_ctx,
                                                 jobject j_loc)
 {
@@ -80,7 +92,8 @@
 
 JNIEXPORT jint JNICALL
 Java_gnu_xml_libxmlj_sax_GnomeLocator_lineNumber (JNIEnv * env,
-                                                  jobject self,
+                                                  jobject self
+						  __attribute__((__unused__)),
                                                   jobject j_ctx,
                                                   jobject j_loc)
 {
@@ -98,7 +111,8 @@
 
 JNIEXPORT jint JNICALL
 Java_gnu_xml_libxmlj_sax_GnomeLocator_columnNumber (JNIEnv * env,
-                                                    jobject self,
+                                                    jobject self
+						    __attribute__((__unused__)),
                                                     jobject j_ctx,
                                                     jobject j_loc)
 {
@@ -387,7 +401,7 @@
 }
 
 xmlEntityPtr
-xmljSAXGetEntity (void *vctx, const xmlChar * name)
+xmljSAXGetEntity (void *vctx __attribute__((__unused__)), const xmlChar * name)
 {
   xmlEntityPtr ret;
   
Index: kaffe/libraries/clib/libxmlj/xmlj_sax.h
diff -u kaffe/libraries/clib/libxmlj/xmlj_sax.h:1.2 kaffe/libraries/clib/libxmlj/xmlj_sax.h:1.3
--- kaffe/libraries/clib/libxmlj/xmlj_sax.h:1.2	Mon Jul 26 02:40:57 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_sax.h	Wed Jan  5 22:56:16 2005
@@ -1,29 +1,39 @@
-/*
- * xmlj_sax.h
- * Copyright (C) 2004 The Free Software Foundation
- * 
- * This file is part of GNU JAXP, a library.
- * 
- * GNU JAXP 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.
- * 
- * GNU JAXP 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 library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * As a special exception, if you link this library with other files to
- * produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * This exception does not however invalidate any other reasons why the
- * executable file might be covered by the GNU General Public License.
- */
+/* xmlj_sax.h -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 #ifndef XMLJ_SAX_H
 #define XMLJ_SAX_H
Index: kaffe/libraries/clib/libxmlj/xmlj_transform.c
diff -u kaffe/libraries/clib/libxmlj/xmlj_transform.c:1.7 kaffe/libraries/clib/libxmlj/xmlj_transform.c:1.8
--- kaffe/libraries/clib/libxmlj/xmlj_transform.c:1.7	Mon Nov  1 15:37:57 2004
+++ kaffe/libraries/clib/libxmlj/xmlj_transform.c	Wed Jan  5 22:56:16 2005
@@ -1,40 +1,39 @@
-/* 
- * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Classpathx/jaxp.
- * 
- * GNU Classpath 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, or (at your option)
- * any later version.
- *  
- * GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- * 
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library.  Thus, the terms and
- * conditions of the GNU General Public License cover the whole
- * combination.
- * 
- * As a special exception, the copyright holders of this library give you
- * permission to link this library with independent modules to produce an
- * executable, regardless of the license terms of these independent
- * modules, and to copy and distribute the resulting executable under
- * terms of your choice, provided that you also meet, for each linked
- * independent module, the terms and conditions of the license of that
- * module.  An independent module is a module which is not derived from
- * or based on this library.  If you modify this library, you may extend
- * this exception to your version of the library, but you are not
- * obligated to do so.  If you do not wish to do so, delete this
- * exception statement from your version.
- */
+/* xmlj_transform.c -
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
+any later version.
+ 
+GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */

*** Patch too long, truncated ***




More information about the kaffe mailing list