From 0b1db75a44c712174493d2c23a0a087714704c94 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Sat, 19 Mar 2011 13:53:43 +1100
Subject: [PATCH] Cleanups.

---
 lrzip.c  | 6 +++---
 lrzip.h  | 4 ++--
 main.c   | 2 +-
 runzip.c | 2 +-
 rzip.c   | 2 ++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lrzip.c b/lrzip.c
index bb8124e..4fb679e 100644
--- a/lrzip.c
+++ b/lrzip.c
@@ -102,7 +102,7 @@ void write_magic(rzip_control *control)
 	control->magic_written = 1;
 }
 
-static i64 enc_loops(uchar b1, uchar b2)
+static inline i64 enc_loops(uchar b1, uchar b2)
 {
 	return (i64)b2 << (i64)b1;
 }
@@ -299,7 +299,7 @@ void dump_tmpoutfile(rzip_control *control, int fd_out)
 
 /* Used if we're unable to read STDIN into the temporary buffer, shunts data
  * to temporary file */
-void write_fdin(struct rzip_control *control)
+void write_fdin(rzip_control *control)
 {
 	uchar *offset_buf = control->tmp_inbuf;
 	i64 len = control->in_len;
@@ -408,7 +408,7 @@ static void open_tmpinbuf(rzip_control *control)
 		fatal("Failed to malloc tmp_inbuf in open_tmpinbuf\n");
 }
 
-void clear_tmpinbuf(rzip_control *control)
+inline void clear_tmpinbuf(rzip_control *control)
 {
 	control->in_len = control->in_ofs = 0;
 }
diff --git a/lrzip.h b/lrzip.h
index b519396..6b54c99 100644
--- a/lrzip.h
+++ b/lrzip.h
@@ -33,10 +33,10 @@ void get_header_info(rzip_control *control, int fd_in, uchar *ctype, i64 *c_len,
 void get_fileinfo(rzip_control *control);
 void compress_file(rzip_control *control);
 void write_fdout(rzip_control *control, void *buf, i64 len);
-void write_fdin(struct rzip_control *control);
+void write_fdin(rzip_control *control);
 void flush_tmpoutbuf(rzip_control *control);
 void close_tmpoutbuf(rzip_control *control);
 void clear_tmpinbuf(rzip_control *control);
-void clear_tmpinfile(rzip_control *control);
+inline void clear_tmpinfile(rzip_control *control);
 void close_tmpinbuf(rzip_control *control);
 #endif
diff --git a/main.c b/main.c
index be3007e..34bc07a 100644
--- a/main.c
+++ b/main.c
@@ -283,7 +283,7 @@ static void show_summary(void)
 	}
 }
 
-static void read_config( struct rzip_control *control )
+static void read_config(rzip_control *control)
 {
 	/* check for lrzip.conf in ., $HOME/.lrzip and /etc/lrzip */
 	char *HOME, *homeconf;
diff --git a/runzip.c b/runzip.c
index 3f848c9..360068f 100644
--- a/runzip.c
+++ b/runzip.c
@@ -181,7 +181,7 @@ static i64 unzip_literal(rzip_control *control, void *ss, i64 len, int fd_out, u
 	return stream_read;
 }
 
-static i64 read_fdhist(struct rzip_control *control, void *buf, i64 len)
+static i64 read_fdhist(rzip_control *control, void *buf, i64 len)
 {
 	if (!TMP_OUTBUF)
 		return read_1g(control, control->fd_hist, buf, len);
diff --git a/rzip.c b/rzip.c
index 65f0794..7b1c235 100644
--- a/rzip.c
+++ b/rzip.c
@@ -973,6 +973,8 @@ retry:
 	}
 
 	close_streamout_threads(control);
+	if (likely(st->hash_table))
+		free(st->hash_table);
 
 	md5_finish_ctx(&control->ctx, md5_resblock);
 	if (HASH_CHECK || MAX_VERBOSE) {