[kaffe] CVS kaffe (robilad): small inflate module cleanup

[Kaffe CVS]

PatchSet 7248 
Date: 2006/04/19 01:06:22
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small inflate module cleanup

2006-04-19  Dalibor Topic  <robilad at kaffe.org>

* kaffe/kaffevm/inflate.h: (inflateInfo) Moved over ...
* kaffe/kaffevm/inflate.c: (inflateInfo) ... here.

Members: 
	ChangeLog:1.4753->1.4754 
	kaffe/kaffevm/inflate.c:1.16->1.17 
	kaffe/kaffevm/inflate.h:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4753 kaffe/ChangeLog:1.4754
--- kaffe/ChangeLog:1.4753	Wed Apr 19 00:44:00 2006
+++ kaffe/ChangeLog	Wed Apr 19 01:06:22 2006
@@ -1,5 +1,10 @@
 2006-04-19  Dalibor Topic  <robilad at kaffe.org>
 
+	* kaffe/kaffevm/inflate.h: (inflateInfo) Moved over ...
+	* kaffe/kaffevm/inflate.c: (inflateInfo) ... here.
+
+2006-04-19  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/inflate.h (inflate_free): Removed prototype.
 
 	* kaffe/kaffevm/inflate.c (inflate_free): Made static. 
Index: kaffe/kaffe/kaffevm/inflate.c
diff -u kaffe/kaffe/kaffevm/inflate.c:1.16 kaffe/kaffe/kaffevm/inflate.c:1.17
--- kaffe/kaffe/kaffevm/inflate.c:1.16	Wed Apr 19 00:44:05 2006
+++ kaffe/kaffe/kaffevm/inflate.c	Wed Apr 19 01:06:27 2006
@@ -22,6 +22,9 @@
 #include "gc.h"
 #include "inflate.h"
 
+#include <sys/types.h>
+
+
 #define	WSIZE	0x8000
 
 typedef struct _huft {
@@ -32,6 +35,22 @@
 		struct _huft* t;/* pointer to next level of table */
 	} v;
 } huft;
+
+typedef struct _inflateInfo {
+	uint8*		slide;
+	unsigned 	hufts;		/* track memory usage */
+	struct _huft*	fixed_tl;
+	struct _huft*	fixed_td;
+	size_t		fixed_bl;
+	size_t		fixed_bd;
+	unsigned	wp;		/* current position in slide */
+	uint32		bb;		/* bit buffer */
+	unsigned	bk;		/* bits in bit buffer */
+	uint8*		inbuf;
+	size_t		insz;
+	uint8*		outbuf;
+	size_t		outsz;
+} inflateInfo;
 
 static int inflate_codes(inflateInfo*, huft*, huft*, size_t, size_t);
 static int inflate_stored(inflateInfo*);
Index: kaffe/kaffe/kaffevm/inflate.h
diff -u kaffe/kaffe/kaffevm/inflate.h:1.5 kaffe/kaffe/kaffevm/inflate.h:1.6
--- kaffe/kaffe/kaffevm/inflate.h:1.5	Wed Apr 19 00:44:05 2006
+++ kaffe/kaffe/kaffevm/inflate.h	Wed Apr 19 01:06:27 2006
@@ -15,25 +15,6 @@
 #ifndef __inflate_h
 #define __inflate_h
 
-#include <sys/types.h>
-struct _huft;
-
-typedef struct _inflateInfo {
-	uint8*		slide;
-	unsigned 	hufts;		/* track memory usage */
-	struct _huft*	fixed_tl;
-	struct _huft*	fixed_td;
-	size_t		fixed_bl;
-	size_t		fixed_bd;
-	unsigned	wp;		/* current position in slide */
-	uint32		bb;		/* bit buffer */
-	unsigned	bk;		/* bits in bit buffer */
-	uint8*		inbuf;
-	size_t		insz;
-	uint8*		outbuf;
-	size_t		outsz;
-} inflateInfo;
-
 extern int inflate_oneshot(uint8*, int, uint8*, int);
 
 #endif