* Clear history when closing alpine, for commands that keep it.

  * Reversing the clearing of the rmap memory.

1 files changed, 2 insertions, 8 deletions

diff --git a/pith/filter.c b/pith/filter.c
index e4dbda07..9f0182ba 100644
--- a/pith/filter.c
+++ b/pith/filter.c
@@ -1799,7 +1799,6 @@ gf_convert_8bit_charset(FILTER_S *f, int flg)
 typedef	struct _utf8c_s {
     void *conv_table;
     int   report_err;
-    int	  free_this;
 } UTF8C_S;
 
 
@@ -1914,12 +1913,8 @@ gf_convert_utf8_charset(FILTER_S *f, int flg)
     }
     else if(flg == GF_EOD){
 	(void) GF_FLUSH(f->next);
-	if(f->opt){
-	  if(((UTF8C_S *) f->opt)->conv_table != NULL
-	     && ((UTF8C_S *) f->opt)->free_this != 0)
-	  fs_give((void **) &((UTF8C_S *) f->opt)->conv_table);
+	if(f->opt)
 	  fs_give((void **) &f->opt);
-	}
 	(*f->next->f)(f->next, GF_EOD);
     }
     else if(flg == GF_RESET){
@@ -1933,14 +1928,13 @@ gf_convert_utf8_charset(FILTER_S *f, int flg)
 
 
 void *
-gf_convert_utf8_charset_opt(void *table, int report_err, int free_this)
+gf_convert_utf8_charset_opt(void *table, int report_err)
 {
     UTF8C_S *utf8c;
 
     utf8c = (UTF8C_S *) fs_get(sizeof(UTF8C_S));
     utf8c->conv_table = table;
     utf8c->report_err = report_err;
-    utf8c->free_this = free_this;
     return((void *) utf8c);
 }