[kaffe] CVS kaffe (robilad): small cleanup in inflater module

Kaffe CVS cvs-commits at kaffe.org
Tue Apr 18 17:52:41 PDT 2006


PatchSet 7247 
Date: 2006/04/19 00:44:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small cleanup in inflater module

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.
Moved up in the file so that it's defined before use.

Members: 
	ChangeLog:1.4752->1.4753 
	kaffe/kaffevm/inflate.c:1.15->1.16 
	kaffe/kaffevm/inflate.h:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4752 kaffe/ChangeLog:1.4753
--- kaffe/ChangeLog:1.4752	Wed Apr 19 00:15:23 2006
+++ kaffe/ChangeLog	Wed Apr 19 00:44:00 2006
@@ -1,5 +1,12 @@
 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. 
+	Moved up in the file so that it's defined before use.
+
+2006-04-19  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/inflate.h (inflate_new): Removed prototype.
 
 	* kaffe/kaffevm/inflate.c (inflate_new): Made static.
Index: kaffe/kaffe/kaffevm/inflate.c
diff -u kaffe/kaffe/kaffevm/inflate.c:1.15 kaffe/kaffe/kaffevm/inflate.c:1.16
--- kaffe/kaffe/kaffevm/inflate.c:1.15	Wed Apr 19 00:15:28 2006
+++ kaffe/kaffe/kaffevm/inflate.c	Wed Apr 19 00:44:05 2006
@@ -542,6 +542,23 @@
 	return (info);
 }
 
+static
+int
+inflate_free(inflateInfo* pG)
+{
+  if (pG != 0) {
+    if (pG->fixed_tl != 0) {
+      huft_free(pG->fixed_td);
+      huft_free(pG->fixed_tl);
+      pG->fixed_td = pG->fixed_tl = NULL;
+    }
+    gc_free(pG->slide);
+    gc_free(pG);
+  }
+
+  return 0;
+}
+
 /*
  * We pass in a buffer of deflated data and a place to stored the inflated
  * result.  This does not provide continuous operation and should only be
@@ -607,23 +624,6 @@
   IDBG(dprintf("\n%u bytes in Huffman tables (%d/entry)\n", h * sizeof(huft), sizeof(huft)));
   return 0;
 }
-
-int
-inflate_free(inflateInfo* pG)
-{
-  if (pG != 0) {
-    if (pG->fixed_tl != 0) {
-      huft_free(pG->fixed_td);
-      huft_free(pG->fixed_tl);
-      pG->fixed_td = pG->fixed_tl = NULL;
-    }
-    gc_free(pG->slide);
-    gc_free(pG);
-  }
-
-  return 0;
-}
-
 
 /* If BMAX needs to be larger than 16, then h and x[] should be uint32. */
 #define BMAX 16         /* maximum bit length of any code (16 for explode) */
Index: kaffe/kaffe/kaffevm/inflate.h
diff -u kaffe/kaffe/kaffevm/inflate.h:1.4 kaffe/kaffe/kaffevm/inflate.h:1.5
--- kaffe/kaffe/kaffevm/inflate.h:1.4	Wed Apr 19 00:15:28 2006
+++ kaffe/kaffe/kaffevm/inflate.h	Wed Apr 19 00:44:05 2006
@@ -34,7 +34,6 @@
 	size_t		outsz;
 } inflateInfo;
 
-extern int inflate_free(inflateInfo*);
 extern int inflate_oneshot(uint8*, int, uint8*, int);
 
 #endif




More information about the kaffe mailing list