Mercurial > mplayer.hg
changeset 29717:afc8b80eb027
cosmetics: Remove some pointless parentheses from return calls.
| author | diego |
|---|---|
| date | Thu, 08 Oct 2009 11:25:01 +0000 |
| parents | 6ee9d09a3a2e |
| children | 7aa3b62ae7d5 |
| files | drivers/mga_vid.c libvo/vo_vdpau.c mp3lib/sr1.c mp3lib/test.c stream/dvb_tune.c stream/stream_dvdnav.c stream/tv.c |
| diffstat | 7 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/drivers/mga_vid.c Thu Oct 08 10:48:12 2009 +0000 +++ b/drivers/mga_vid.c Thu Oct 08 11:25:01 2009 +0000 @@ -1197,7 +1197,7 @@ tmp = MGA_VID_VERSION; if (copy_to_user((uint32_t *) arg, &tmp, sizeof(uint32_t))) { printk(KERN_ERR "mga_vid: failed copy %p to userspace %p\n", &tmp, (uint32_t *) arg); - return (-EFAULT); + return -EFAULT; } break;
--- a/libvo/vo_vdpau.c Thu Oct 08 10:48:12 2009 +0000 +++ b/libvo/vo_vdpau.c Thu Oct 08 11:25:01 2009 +0000 @@ -1198,9 +1198,9 @@ } return VO_TRUE; case VOCTRL_PAUSE: - return (int_pause = 1); + return int_pause = 1; case VOCTRL_RESUME: - return (int_pause = 0); + return int_pause = 0; case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t *)data); case VOCTRL_GET_IMAGE:
--- a/mp3lib/sr1.c Thu Oct 08 10:48:12 2009 +0000 +++ b/mp3lib/sr1.c Thu Oct 08 11:25:01 2009 +0000 @@ -79,7 +79,7 @@ //void mp3_seek(int pos){ // fseek(mp3_file,pos,SEEK_SET); -// return (MP3_fpos=ftell(mp3_file)); +// return MP3_fpos = ftell(mp3_file); //} /* Frame reader */ @@ -168,7 +168,7 @@ bitindex++; wordpointer += (bitindex>>3); bitindex &= 7; - return ((rval>>7)&1); + return (val >> 7) & 1; } LOCAL void set_pointer(int backstep) @@ -537,8 +537,8 @@ int MP3_DecodeFrame(unsigned char *hova,short single){ pcm_sample = hova; pcm_point = 0; - if(!read_frame(&fr))return(0); - if(single==-2){ set_pointer(512); return(1); } + if(!read_frame(&fr)) return 0; + if(single==-2){ set_pointer(512); return 1; } if(fr.error_protection) getbits(16); /* skip crc */ fr.single=single; switch(fr.lay){ @@ -549,7 +549,7 @@ return 0; // unsupported } // ++MP3_frames; - return(pcm_point?pcm_point:2); + return pcm_point ? pcm_point : 2; } // Prints last frame header in ascii.
--- a/mp3lib/test.c Thu Oct 08 10:48:12 2009 +0000 +++ b/mp3lib/test.c Thu Oct 08 11:25:01 2009 +0000 @@ -17,7 +17,7 @@ // float s; gettimeofday(&tv,&tz); // s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec; - return (tv.tv_sec*1000000+tv.tv_usec); + return tv.tv_sec * 1000000 + tv.tv_usec; } static FILE* mp3file=NULL;
--- a/stream/dvb_tune.c Thu Oct 08 10:48:12 2009 +0000 +++ b/stream/dvb_tune.c Thu Oct 08 11:25:01 2009 +0000 @@ -230,7 +230,7 @@ mp_msg(MSGT_DEMUX, MSGL_DBG2, "STOPPING FD: %d, RESULT: %d\n", fd, i); - return (i==0); + return i == 0; } @@ -241,7 +241,7 @@ mp_msg(MSGT_DEMUX, MSGL_DBG2, "STARTING FD: %d, RESULT: %d\n", fd, i); - return (i==0); + return i == 0; } @@ -265,7 +265,7 @@ if(ris != 0) mp_msg(MSGT_DEMUX, MSGL_INFO, "dvb_tune, TUNING FAILED\n"); - return (ris == 0); + return ris == 0; } @@ -740,5 +740,5 @@ return -1; } - return(check_status(fd_frontend, timeout)); + return check_status(fd_frontend, timeout); }
--- a/stream/stream_dvdnav.c Thu Oct 08 10:48:12 2009 +0000 +++ b/stream/stream_dvdnav.c Thu Oct 08 11:25:01 2009 +0000 @@ -698,11 +698,11 @@ format = dvdnav_audio_stream_format(priv->dvdnav, lg); switch(format) { case DVDNAV_FORMAT_AC3: - return (index + 128); + return index + 128; case DVDNAV_FORMAT_DTS: - return (index + 136); + return index + 136; case DVDNAV_FORMAT_LPCM: - return (index + 160); + return index + 160; case DVDNAV_FORMAT_MPEGAUDIO: return index; default: