From: Andre Noll <maan@systemlinux.org>
Date: Thu, 23 Jun 2011 17:13:40 +0000 (+0200)
Subject: Merge branch 't/hup_fix'
X-Git-Tag: v0.4.8~30
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;ds=sidebyside;h=6974e18e86064f870ff1c130b11ececc3e261158;hp=-c;p=paraslash.git

Merge branch 't/hup_fix'
---

6974e18e86064f870ff1c130b11ececc3e261158
diff --combined aft.c
index 0edc7013,078876be..a27e67ee
--- a/aft.c
+++ b/aft.c
@@@ -18,6 -18,7 +18,6 @@@
  #include "string.h"
  #include "afh.h"
  #include "afs.h"
 -#include "net.h"
  #include "fd.h"
  #include "ipc.h"
  #include "portable_io.h"
@@@ -2568,10 -2569,6 +2568,6 @@@ static void aft_close(void
  {
  	osl_close_table(audio_file_table, OSL_MARK_CLEAN);
  	audio_file_table = NULL;
- 	free(status_items);
- 	status_items = NULL;
- 	free(parser_friendly_status_items);
- 	parser_friendly_status_items = NULL;
  }
  
  /**