[kaffe] CVS kaffe (robilad): removed native adler32 and crc32 code

Kaffe CVS cvs-commits at kaffe.org
Fri Feb 1 17:11:30 PST 2008


PatchSet 7724 
Date: 2008/02/02 01:08:36
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed native adler32 and crc32 code

2008-02-02  Dalibor Topic  <robilad at kaffe.org>

* libraries/clib/zip/Adler32.c,
libraries/clib/zip/CRC32.c,
libraries/javalib/zlib-zip/java/util/zip/Adler32.java,
libraries/javalib/zlib-zip/java/util/zip/CRC32.java: Removed.

* libraries/clib/zip/Makefile.am (libzip_la_SOURCES):
Removed Adler32.c and CRC32.c.

* libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA):
Removed java/util/zip/Adler32.java and java/util/zip/CRC32.java.

Members: 
	ChangeLog:1.5225->1.5226 
	libraries/clib/zip/Adler32.c:1.10->1.11(DEAD) 
	libraries/clib/zip/CRC32.c:1.8->1.9(DEAD) 
	libraries/clib/zip/Makefile.am:1.20->1.21 
	libraries/clib/zip/Makefile.in:1.205->1.206 
	libraries/javalib/zlib-zip/Makefile.am:1.8->1.9 
	libraries/javalib/zlib-zip/Makefile.in:1.28->1.29 
	libraries/javalib/zlib-zip/java/util/zip/Adler32.java:1.1->1.2(DEAD) 
	libraries/javalib/zlib-zip/java/util/zip/CRC32.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5225 kaffe/ChangeLog:1.5226
--- kaffe/ChangeLog:1.5225	Thu Jan 31 20:49:45 2008
+++ kaffe/ChangeLog	Sat Feb  2 01:08:36 2008
@@ -1,3 +1,16 @@
+2008-02-02  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/clib/zip/Adler32.c, 
+	libraries/clib/zip/CRC32.c, 
+	libraries/javalib/zlib-zip/java/util/zip/Adler32.java,
+	libraries/javalib/zlib-zip/java/util/zip/CRC32.java: Removed.
+
+	* libraries/clib/zip/Makefile.am (libzip_la_SOURCES): 
+	Removed Adler32.c and CRC32.c.
+
+	* libraries/javalib/zlib-zip/Makefile.am (dist_zlib_JAVA): 
+	Removed java/util/zip/Adler32.java and java/util/zip/CRC32.java.
+
 2008-01-31  Dalibor Topic  <robilad at kaffe.org>
 
 	* TODO: Updated.
===================================================================
Checking out kaffe/libraries/clib/zip/Adler32.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/zip/Attic/Adler32.c,v
VERS: 1.10
***************
--- kaffe/libraries/clib/zip/Adler32.c	Sat Feb  2 01:11:29 2008
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,41 +0,0 @@
-/*
- * java.util.zip.Adler32.c
- *
- * Copyright (c) 1996, 1997
- *	Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#include "config.h"
-#include "config-std.h"
-#include "config-mem.h"
-#include <native.h>
-#include "java_util_zip_Adler32.h"
-#include "gtypes.h"
-
-#include <zlib.h>
-
-void
-java_util_zip_Adler32_update(struct Hjava_util_zip_Adler32* this, HArrayOfByte* buf, jint from, jint len)
-{
-	// XXX What happens if out of bounds ? 
-	if (from >= 0 && len > 0 && from + len <= obj_length(buf)) {
-		unhand(this)->adler = adler32((uLong)unhand(this)->adler, 
-					      (const Bytef *)&unhand_array(buf)->body[from], 
-					      (uInt)len);
-	}
-}
-
-void
-java_util_zip_Adler32_update1(struct Hjava_util_zip_Adler32* this, jint val)
-{
-	jbyte b;
-
-	b = val;
-	unhand(this)->adler = adler32((uLong)unhand(this)->adler, 
-				      (const Bytef *)&b, 
-				      (uInt)sizeof(b));
-}
-
===================================================================
Checking out kaffe/libraries/clib/zip/CRC32.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/zip/Attic/CRC32.c,v
VERS: 1.8
***************
--- kaffe/libraries/clib/zip/CRC32.c	Sat Feb  2 01:11:29 2008
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,38 +0,0 @@
-/*
- * java.util.zip.CRC32.c
- *
- * Copyright (c) 1996, 1997
- *	Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#include "config.h"
-#include "config-std.h"
-#include "config-mem.h"
-#include <native.h>
-#include "java_util_zip_CRC32.h"
-#include "gtypes.h"
-
-#include <zlib.h>
-
-void
-java_util_zip_CRC32_update(struct Hjava_util_zip_CRC32* this, HArrayOfByte* buf, jint from, jint len)
-{
-	unhand(this)->crc = crc32((uLong)unhand(this)->crc, 
-				  (const Bytef *)&unhand_array(buf)->body[from], 
-				  (uInt)len);
-}
-
-void
-java_util_zip_CRC32_update1(struct Hjava_util_zip_CRC32* this, jint val)
-{
-	jbyte b;
-
-	b = val;
-	unhand(this)->crc = crc32((uLong)unhand(this)->crc,
-				  (const Bytef *)&b,
-				  (uInt)sizeof(b));
-}
-
Index: kaffe/libraries/clib/zip/Makefile.am
diff -u kaffe/libraries/clib/zip/Makefile.am:1.20 kaffe/libraries/clib/zip/Makefile.am:1.21
--- kaffe/libraries/clib/zip/Makefile.am:1.20	Sun Jul  1 19:09:14 2007
+++ kaffe/libraries/clib/zip/Makefile.am	Sat Feb  2 01:08:41 2008
@@ -31,8 +31,6 @@
 	$(ZIP_LIBS)
 
 libzip_la_SOURCES = \
-	Adler32.c \
-	CRC32.c \
 	Deflater.c \
 	Inflater.c \
 	ZipFile.c
Index: kaffe/libraries/clib/zip/Makefile.in
diff -u kaffe/libraries/clib/zip/Makefile.in:1.205 kaffe/libraries/clib/zip/Makefile.in:1.206
--- kaffe/libraries/clib/zip/Makefile.in:1.205	Tue Jan 22 23:21:44 2008
+++ kaffe/libraries/clib/zip/Makefile.in	Sat Feb  2 01:08:41 2008
@@ -80,8 +80,7 @@
 am__DEPENDENCIES_1 =
 libzip_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffe.la \
 	$(am__DEPENDENCIES_1)
-am_libzip_la_OBJECTS = libzip_la-Adler32.lo libzip_la-CRC32.lo \
-	libzip_la-Deflater.lo libzip_la-Inflater.lo \
+am_libzip_la_OBJECTS = libzip_la-Deflater.lo libzip_la-Inflater.lo \
 	libzip_la-ZipFile.lo
 libzip_la_OBJECTS = $(am_libzip_la_OBJECTS)
 libzip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -328,8 +327,6 @@
 	$(ZIP_LIBS)
 
 libzip_la_SOURCES = \
-	Adler32.c \
-	CRC32.c \
 	Deflater.c \
 	Inflater.c \
 	ZipFile.c
@@ -404,8 +401,6 @@
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libzip_la-Adler32.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libzip_la-CRC32.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libzip_la-Deflater.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libzip_la-Inflater.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libzip_la-ZipFile.Plo at am__quote@
@@ -430,20 +425,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libzip_la-Adler32.lo: Adler32.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzip_la_CFLAGS) $(CFLAGS) -MT libzip_la-Adler32.lo -MD -MP -MF $(DEPDIR)/libzip_la-Adler32.Tpo -c -o libzip_la-Adler32.lo `test -f 'Adler32.c' || echo '$(srcdir)/'`Adler32.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libzip_la-Adler32.Tpo $(DEPDIR)/libzip_la-Adler32.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Adler32.c' object='libzip_la-Adler32.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzip_la_CFLAGS) $(CFLAGS) -c -o libzip_la-Adler32.lo `test -f 'Adler32.c' || echo '$(srcdir)/'`Adler32.c
-
-libzip_la-CRC32.lo: CRC32.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzip_la_CFLAGS) $(CFLAGS) -MT libzip_la-CRC32.lo -MD -MP -MF $(DEPDIR)/libzip_la-CRC32.Tpo -c -o libzip_la-CRC32.lo `test -f 'CRC32.c' || echo '$(srcdir)/'`CRC32.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libzip_la-CRC32.Tpo $(DEPDIR)/libzip_la-CRC32.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='CRC32.c' object='libzip_la-CRC32.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzip_la_CFLAGS) $(CFLAGS) -c -o libzip_la-CRC32.lo `test -f 'CRC32.c' || echo '$(srcdir)/'`CRC32.c
 
 libzip_la-Deflater.lo: Deflater.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libzip_la_CFLAGS) $(CFLAGS) -MT libzip_la-Deflater.lo -MD -MP -MF $(DEPDIR)/libzip_la-Deflater.Tpo -c -o libzip_la-Deflater.lo `test -f 'Deflater.c' || echo '$(srcdir)/'`Deflater.c
Index: kaffe/libraries/javalib/zlib-zip/Makefile.am
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.am:1.8 kaffe/libraries/javalib/zlib-zip/Makefile.am:1.9
--- kaffe/libraries/javalib/zlib-zip/Makefile.am:1.8	Thu Jan 31 20:49:48 2008
+++ kaffe/libraries/javalib/zlib-zip/Makefile.am	Sat Feb  2 01:08:42 2008
@@ -22,8 +22,6 @@
 zlibdir = $(FAKE)
 
 dist_zlib_JAVA = \
-	java/util/zip/Adler32.java \
-	java/util/zip/CRC32.java \
 	java/util/zip/Deflater.java \
 	java/util/zip/DeflaterOutputStream.java \
 	java/util/zip/Inflater.java \
Index: kaffe/libraries/javalib/zlib-zip/Makefile.in
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.in:1.28 kaffe/libraries/javalib/zlib-zip/Makefile.in:1.29
--- kaffe/libraries/javalib/zlib-zip/Makefile.in:1.28	Thu Jan 31 20:49:48 2008
+++ kaffe/libraries/javalib/zlib-zip/Makefile.in	Sat Feb  2 01:08:42 2008
@@ -287,8 +287,6 @@
 FAKE = fakeinstall
 zlibdir = $(FAKE)
 dist_zlib_JAVA = \
-	java/util/zip/Adler32.java \
-	java/util/zip/CRC32.java \
 	java/util/zip/Deflater.java \
 	java/util/zip/DeflaterOutputStream.java \
 	java/util/zip/Inflater.java \
===================================================================
Checking out kaffe/libraries/javalib/zlib-zip/java/util/zip/Adler32.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/zlib-zip/java/util/zip/Attic/Adler32.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/zlib-zip/java/util/zip/Adler32.java	Sat Feb  2 01:11:29 2008
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,49 +0,0 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 1997, 1998
- *      Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
-
-package java.util.zip;
-
-public class Adler32 implements Checksum {
-
-  static {
-    System.loadLibrary("zip");
-  }
-
-  private int adler;
-
-  public Adler32()
-  {
-    adler = 1;
-  }
-
-  public void update(int b)
-  {
-    update1(b);
-  }
-
-  public void update(byte b[])
-  {
-    update(b, 0, b.length);
-  }
-
-  public void reset()
-  {
-    adler = 1;
-  }
-
-  public long getValue()
-  {
-    return (adler & 0xFFFFFFFFL);
-  }
-
-  public native void update(byte[] buf, int from, int len);
-  private native void update1(int val);
-
-}
===================================================================
Checking out kaffe/libraries/javalib/zlib-zip/java/util/zip/CRC32.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/zlib-zip/java/util/zip/Attic/CRC32.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/zlib-zip/java/util/zip/CRC32.java	Sat Feb  2 01:11:29 2008
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,49 +0,0 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 1997, 1998
- *      Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
-
-package java.util.zip;
-
-public class CRC32 implements Checksum {
-
-  static {
-    System.loadLibrary("zip");
-  }
-
-  private int crc;
-
-  public CRC32()
-  {
-    crc = 0;
-  }
-
-  public void update(int b)
-  {
-    update1(b);
-  }
-
-  public void update(byte b[])
-  {
-    update(b, 0, b.length);
-  }
-
-  public void reset()
-  {
-    crc = 0;
-  }
-
-  public long getValue()
-  {
-    return (((long)crc) & 0xFFFFFFFFL);
-  }
-
-  public native void update(byte b[], int off, int len);
-  private native void update1(int val);
-
-}




More information about the kaffe mailing list