(trunk) remove unnecessary #includes

daemon/daemon.c

@@ -10,7 +10,6 @@
  * $Id$
  */
 
-#include <assert.h>
 #include <errno.h>
 #include <stdio.h> /* printf */
 #include <stdlib.h> /* exit, atoi */

gtk/conf.c

@@ -22,7 +22,6 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -108,7 +107,7 @@ lockfile( const char             * filename,
 static char*
 getLockFilename( void )
 {
-    assert( gl_confdir != NULL );
+    g_assert( gl_confdir != NULL );
     return g_build_filename( gl_confdir, "lock", NULL );
 }
 
@@ -211,7 +210,7 @@ tr_prefs_init_defaults( tr_benc * d )
 static char*
 getPrefsFilename( void )
 {
-    assert( gl_confdir != NULL );
+    g_assert( gl_confdir != NULL );
     return g_build_filename( gl_confdir, "settings.json", NULL );
 }
 
@@ -363,7 +362,7 @@ tr_file_set_contents( const char *   filename,
 static char*
 getCompat090PrefsFilename( void )
 {
-    assert( gl_confdir != NULL );
+    g_assert( gl_confdir != NULL );
 
     return g_build_filename( g_get_home_dir( ), ".transmission", "gtk", "prefs.ini", NULL );
 }

gtk/torrent-cell-renderer.c

@@ -10,7 +10,6 @@
  * $Id$
  */
 
-#include "assert.h"
 #include <string.h> /* strcmp() */
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>

gtk/tr-core.h

@@ -25,8 +25,6 @@
 #ifndef TR_CORE_H
 #define TR_CORE_H
 
-#include <string.h>
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
 

gtk/tr-prefs.c

@@ -11,8 +11,6 @@
  */
 
 #include <ctype.h> /* isspace */
-#include <errno.h>
-#include <stdarg.h>
 #include <limits.h> /* USHRT_MAX */
 #include <stdlib.h> /* free() */
 #include <unistd.h>

gtk/util.c

@@ -12,7 +12,6 @@
 
 #include <ctype.h> /* isxdigit() */
 #include <errno.h>
-#include <stdarg.h>
 #include <stdlib.h> /* free() */
 #include <string.h> /* strcmp() */
 

libtransmission/completion.h

@@ -21,7 +21,6 @@
 
 #include "transmission.h"
 #include "bitfield.h"
-#include "utils.h" /* tr_bitfield */
 
 typedef struct tr_completion
 {

libtransmission/fdlimit.c

@@ -61,7 +61,6 @@
 
 #include "transmission.h"
 #include "fdlimit.h"
-#include "list.h"
 #include "net.h"
 #include "platform.h" /* MAX_PATH_LENGTH, TR_PATH_DELIMITER */
 #include "session.h"

libtransmission/peer-mgr.h

@@ -28,7 +28,6 @@
 #include "net.h"
 #include "peer-common.h" /* struct peer_request */
 #include "publish.h" /* tr_publisher_tag */
-#include "utils.h"
 
 /**
  * @addtogroup peers Peers

libtransmission/utils.h

@@ -14,7 +14,6 @@
 #define TR_UTILS_H 1
 
 #include <inttypes.h>
-#include <stdarg.h>
 #include <stddef.h> /* size_t */
 #include <stdio.h> /* FILE* */
 #include <string.h> /* memcpy()* */

libtransmission/web.c

@@ -17,7 +17,6 @@
 #include <evdns.h>
 
 #include "transmission.h"
-#include "list.h"
 #include "net.h"
 #include "ptrarray.h"
 #include "session.h"
@@ -75,7 +74,7 @@ web_free( tr_web * g )
     evdns_shutdown( TRUE );
     curl_multi_cleanup( g->multi );
     evtimer_del( &g->timer_event );
-    tr_ptrArrayDestruct( &g->dns_cache, (TrListForeachFunc)dns_cache_item_free );
+    tr_ptrArrayDestruct( &g->dns_cache, (PtrArrayForeachFunc)dns_cache_item_free );
     memset( g, TR_MEMORY_TRASH, sizeof( struct tr_web ) );
     tr_free( g );
 }
@@ -135,6 +134,7 @@ dns_cache_item_free( struct dns_cache_item * item )
 {
     tr_free( item->host );
     tr_free( item->resolved_host );
+    memset( item, TR_MEMORY_TRASH, sizeof( struct dns_cache_item ) );
     tr_free( item );
 }
 

libtransmission/webseed.c

@@ -16,7 +16,6 @@
 
 #include "transmission.h"
 #include "inout.h"
-#include "list.h"
 #include "ratecontrol.h"
 #include "torrent.h"
 #include "utils.h"