fix some compile warnings

Author: jcupitt

src/class.c

@@ -1007,21 +1007,18 @@ class_newv( Heap *heap, const char *name, PElement *out, ... )
 static void
 class_typecheck_error( PElement *instance, const char *name, const char *type )
 {
-	PElement val;
-	gboolean res;
 	char txt[1024];
 	VipsBuf buf = VIPS_BUF_STATIC( txt );
-
-	res = class_get_member( instance, name, NULL, &val );
-	g_assert( res );
+	PElement val;
 
 	vips_buf_appendf( &buf, _( "Member \"%s\" of class \"%s\" "
 		"should be of type \"%s\", instead it's:" ), 
 		name, 
 		IOBJECT( PEGETCLASSCOMPILE( instance )->sym )->name, 
 		type );
 	vips_buf_appends( &buf, "\n   " );
-	if( !itext_value( reduce_context, &buf, &val ) )
+	if( class_get_member( instance, name, NULL, &val ) &&
+		!itext_value( reduce_context, &buf, &val ) )
 		return;
 
 	error_top( _( "Bad argument." ) );

src/classmodel.c

@@ -1139,6 +1139,7 @@ classmodel_get_item( Classmodel *classmodel,
 
 	case CLASSMODEL_MEMBER_REALVEC_FIXED:
 		g_assert( m->extent < 4 );
+
 		if( (l = heap_get_realvec( value, vec, m->extent )) < 0 )
 			return( FALSE );
 		if( l != m->extent ) {
@@ -1168,21 +1169,17 @@ classmodel_get_item( Classmodel *classmodel,
 	}
 
 	case CLASSMODEL_MEMBER_OPTIONS:
-	{
-		ClassmodelClass *class = CLASSMODEL_GET_CLASS( classmodel );
-
 		/* If there are optional fields, we have to have a reset
 		 * method for clearing the ones we don't use.
 		 */
-		g_assert( class->reset );
+		g_assert( CLASSMODEL_GET_CLASS( classmodel )->reset );
 
 		if( heap_map_dict( value, 
 			(heap_map_dict_fn) classmodel_parse_option, 
 			classmodel, m ) ) 
 			return( FALSE );
 
 		break;
-	}
 
 	case CLASSMODEL_MEMBER_IMAGE:
 	{

src/compile.c

@@ -1186,6 +1186,7 @@ compile_share_scan_element( CompileShare *share, PElement *e )
 
 	case ELEMENT_NOVAL:
 	default:
+		hash = 0; 
 		g_assert( 0 );
 	}
 

src/heap.c

@@ -122,6 +122,7 @@ heap_map( HeapNode *hn, heap_map_fn fn, void *a, void *b )
 	}
 }
 
+#ifdef DEBUG_HEAP_GC
 /* Debugging ... check that all nodes on the free list are TAG_FREE, and that
  * all other nodes are not TAG_FREE.
  */
@@ -164,6 +165,7 @@ heap_check_free( Heap *heap )
 		}
 	}
 }
+#endif /*DEBUG_HEAP_GC*/
 
 #ifdef DEBUG_HEAP_GC
 static void
@@ -180,9 +182,9 @@ heap_check_managed( void *key, void *value, Heap *heap )
 int
 heap_sanity( Heap *heap )
 {
+#ifdef DEBUG_HEAP_GC
 	heap_check_free( heap );
 
-#ifdef DEBUG_HEAP_GC
 	heap_gc( heap );
 	heap_check_free( heap );
 	g_hash_table_foreach( heap->mtable, (GHFunc) heap_check_managed, heap );

src/imagepresent.c

@@ -1483,7 +1483,6 @@ imagepresent_ruler_hide_cb( GtkWidget *wid, GtkWidget *host, Imagepresent *ip )
 static void
 imagepresent_init( Imagepresent *ip )
 {
-	GtkWidget *port;
 	GtkWidget *bar;
 	GtkWidget *table;
 
@@ -1539,8 +1538,6 @@ imagepresent_init( Imagepresent *ip )
 	gtk_signal_connect( GTK_OBJECT( ip->swin ), "scroll_event",
 		GTK_SIGNAL_FUNC( imagepresent_scroll_event_cb ), ip );
 
-	port = gtk_bin_get_child( GTK_BIN( ip->swin ) );
-	g_assert( GTK_IS_VIEWPORT( port ) );
 	gtk_signal_connect( GTK_OBJECT( ip->hadj ), "changed",
 		GTK_SIGNAL_FUNC( imagepresent_hadj_changed_cb ), ip );
 	gtk_signal_connect( GTK_OBJECT( ip->hadj ), "value_changed",

src/link.c

@@ -420,11 +420,15 @@ symbol_ndirty( Symbol *sym )
 void *
 symbol_fix_counts( Symbol *sym )
 {
+#ifdef DEBUG
 	int old_count = sym->ndirtychildren;
+#endif /*DEBUG*/
 
 	sym->ndirtychildren = symbol_ndirty( sym );
 
+#ifdef DEBUG
 	g_assert( sym->ndirtychildren == old_count );
+#endif /*DEBUG*/
 
 	symbol_state_change( sym );
 

src/plot.c

@@ -164,6 +164,7 @@ plot_unpack( Plot *plot, DOUBLEMASK *mask )
 		break;
 
 	default:
+		columns = 1;
 		g_assert( 0 );
 	}
 

src/tree.c

@@ -491,6 +491,7 @@ tree_copy( Compile *compile, ParseNode *node )
 
 	case NODE_NONE:
 	default:
+		copy = NULL; 
 		g_assert( FALSE );
 	}