[MPlayer-cvslog] r27998 - trunk/libvo/vo_wii.c

[Diego Biurrun]

On Sun, Nov 23, 2008 at 04:05:54PM +0100, Reimar Döffinger wrote:
> On Sun, Nov 23, 2008 at 03:32:39PM +0100, diego wrote:
> > Modified: trunk/libvo/vo_wii.c
> > ==============================================================================
> > --- trunk/libvo/vo_wii.c	(original)
> > +++ trunk/libvo/vo_wii.c	Sun Nov 23 15:32:39 2008
> > @@ -210,10 +210,8 @@ static int config(uint32_t width, uint32
> >    fb_line_len = fb_finfo.line_length;
> >    fb_size     = fb_finfo.smem_len;
> >    frame_buffer = NULL;
> > -
> > -  frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
> > -                                  MAP_SHARED, fb_dev_fd, 0);
> > -  if (frame_buffer == (uint8_t *) -1) {
> > +  if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
> > +                                       MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) {
> 
> I think "merging" the other way would have been preferable, that would
> also have made it more obvious what a nonsense that "frame_buffer = NULL;" directly before is.
> Going by what I have seen so far it should be no problem to find a good
> dozen of bugs in both vos... I really hate all that "umaintainted and
> almost unused and untested" code.

No problem, merged the other way around.

Diego