Only return without value, if the function is void.

4 files changed, 88 insertions, 1 deletions

diff --git a/lang/squeak-vm/distinfo b/lang/squeak-vm/distinfo
index 671169874f6..825a7b656fa 100644
--- a/lang/squeak-vm/distinfo
+++ b/lang/squeak-vm/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.4 2011/12/19 11:26:59 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/10/20 22:12:30 joerg Exp $
 
 SHA1 (squeak/Squeak-3.11.3.2135-src.tar.gz) = cdc033b14e56ea05aa62bcb1686bb73f4347e29f
 RMD160 (squeak/Squeak-3.11.3.2135-src.tar.gz) = abb7dbde7e79f18161842d1451959ad09e7ef3ad
 Size (squeak/Squeak-3.11.3.2135-src.tar.gz) = 3585556 bytes
+SHA1 (patch-Cross_plugins_Mpeg3Plugin_libmpeg_audio_layer3.c) = 81539b093c78f88747da97f18f56f38223117a39
+SHA1 (patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_getpicture.c) = 19f0eabfcdc983d5e7c09db9081d0a01fe333798
+SHA1 (patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_idct.c) = 2509f50f51671943df8b989e89a21408b08dbdc9
 SHA1 (patch-aa) = dfdb3be82288e8bd7658832e8dd91d242d2b97b2
 SHA1 (patch-ab) = 019a6b1bc50e3abc500902a45edcd960b7708bf2
 SHA1 (patch-ac) = bad06ae257766407c90a62f5927a53c97ee8072a
diff --git a/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_audio_layer3.c b/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_audio_layer3.c
new file mode 100644
index 00000000000..4c9c9b710d4
--- /dev/null
+++ b/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_audio_layer3.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-Cross_plugins_Mpeg3Plugin_libmpeg_audio_layer3.c,v 1.1 2012/10/20 22:12:30 joerg Exp $
+
+--- Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c.orig	2012-10-20 13:51:52.000000000 +0000
++++ Cross/plugins/Mpeg3Plugin/libmpeg/audio/layer3.c
+@@ -884,7 +884,7 @@ int mpeg3audio_III_antialias(mpeg3audio_
+ 	if(gr_info->block_type == 2) 
+ 	{
+     	if(!gr_info->mixed_block_flag) 
+-        	return;
++        	return 0;
+     	sblim = 1; 
+ 	}
+ 	else 
diff --git a/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_getpicture.c b/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_getpicture.c
new file mode 100644
index 00000000000..46b99dbdb4e
--- /dev/null
+++ b/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_getpicture.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_getpicture.c,v 1.1 2012/10/20 22:12:30 joerg Exp $
+
+--- Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c.orig	2012-10-20 13:52:22.000000000 +0000
++++ Cross/plugins/Mpeg3Plugin/libmpeg/video/getpicture.c
+@@ -205,7 +205,7 @@ int mpeg3video_getintrablock(mpeg3_slice
+ 		{
+ /*    	  	fprintf(stderr, "mpeg3video_getintrablock: invalid Huffman code\n"); */
+     	  	slice->fault = 1;
+-    	  	return;
++    	  	return 1;
+     	}
+ 
+     	mpeg3slice_flushbits(slice_buffer, tab->len);
+@@ -240,7 +240,7 @@ int mpeg3video_getintrablock(mpeg3_slice
+ 		else
+ 		{
+     	  	slice->fault = 1;
+-    	  	return;
++    	  	return 1;
+ 		}
+ 			
+ 
+@@ -397,7 +397,7 @@ int mpeg3video_getmpg2intrablock(mpeg3_s
+ 	else                  
+ 		val = (dc_dct_pred[2] += mpeg3video_getdcchrom(slice_buffer));
+ 
+-  	if(slice->fault) return;
++  	if(slice->fault) return 1;
+ #ifdef HAVE_MMX
+ 	if(video->have_mmx)
+   		bp[0] = val << (7 - video->dc_prec);
+@@ -463,7 +463,7 @@ int mpeg3video_getmpg2intrablock(mpeg3_s
+ 			{
+ // invalid signed_level (escape)
+         		slice->fault = 1;
+-        		return;
++        		return 1;
+     	  	}
+     	  	if((sign = (val >= 2048)) != 0) val = 4096 - val;
+     	}
+@@ -545,7 +545,7 @@ int mpeg3video_getmpg2interblock(mpeg3_s
+ 		{
+ // invalid Huffman code
+     		slice->fault = 1;
+-    		return;
++    		return 1;
+     	}
+ 
+     	mpeg3slice_flushbits(slice_buffer, tab->len);
diff --git a/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_idct.c b/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_idct.c
new file mode 100644
index 00000000000..3949f52585a
--- /dev/null
+++ b/lang/squeak-vm/patches/patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_idct.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_idct.c,v 1.1 2012/10/20 22:12:30 joerg Exp $
+
+--- Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c.orig	2012-10-20 13:53:28.000000000 +0000
++++ Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c
+@@ -70,7 +70,7 @@
+ 
+  
+ inline 
+-int mpeg3video_idctrow(short *blk)
++void mpeg3video_idctrow(short *blk)
+ {
+ 	int x0, x1, x2, x3, x4, x5, x6, x7, x8;
+ 
+@@ -134,7 +134,7 @@ int mpeg3video_idctrow(short *blk)
+ 
+ 
+ inline
+-int mpeg3video_idctcol(short *blk)
++void mpeg3video_idctcol(short *blk)
+ {
+   int x0, x1, x2, x3, x4, x5, x6, x7, x8;
+