[MPlayer-cvslog] CVS: main/libvo vo_s3fb.c,1.4,1.5

[Rich Felker]

On Fri, May 19, 2006 at 09:33:37AM +0200, Guillaume Poirier CVS wrote:
> CVS change done by Guillaume Poirier CVS
> 
> Update of /cvsroot/mplayer/main/libvo
> In directory mail:/var2/tmp/cvs-serv29398/libvo
> 
> Modified Files:
> 	vo_s3fb.c 
> Log Message:
> Remove dead code, and do close smem file descriptor during un-init
> 
> 
> Index: vo_s3fb.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/vo_s3fb.c,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- vo_s3fb.c	18 May 2006 10:08:38 -0000	1.4
> +++ vo_s3fb.c	19 May 2006 07:33:35 -0000	1.5
> @@ -265,9 +265,9 @@
>  
>    if((long)smem == -1) {
>      mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: Couldn't map memory areas: %s\n", strerror(errno));
> -    if((long)smem != -1)
> -      munmap(smem, fb_finfo.smem_len);

Actually the condition should be:

if (smem == (void *)-1)

This is not quite the same as what's currently in the code, and
although what's currently in the code will work in practice it's not
formally correct.

Rich