cosmetics: Remove some pointless parentheses from return calls.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-10-08 11:25:01 +00:00
parent 77bc2b34b7
commit 50f563f927
7 changed files with 17 additions and 17 deletions

View File

@ -1197,7 +1197,7 @@ static int mga_vid_ioctl(struct inode *inode, struct file *file, unsigned int cm
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;

View File

@ -1198,9 +1198,9 @@ static int control(uint32_t request, void *data, ...)
}
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:

View File

@ -79,7 +79,7 @@ int mp3_read(char *buf,int size);
//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 @@ LOCAL unsigned int get1bit(void)
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_Open(char *filename,int buffsize){
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 @@ int MP3_DecodeFrame(unsigned char *hova,short single){
return 0; // unsupported
}
// ++MP3_frames;
return(pcm_point?pcm_point:2);
return pcm_point ? pcm_point : 2;
}
// Prints last frame header in ascii.

View File

@ -17,7 +17,7 @@ static inline unsigned int GetTimer(void){
// 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;

View File

@ -230,7 +230,7 @@ int dvb_demux_stop(int fd)
mp_msg(MSGT_DEMUX, MSGL_DBG2, "STOPPING FD: %d, RESULT: %d\n", fd, i);
return (i==0);
return i == 0;
}
@ -241,7 +241,7 @@ int dvb_demux_start(int fd)
mp_msg(MSGT_DEMUX, MSGL_DBG2, "STARTING FD: %d, RESULT: %d\n", fd, i);
return (i==0);
return i == 0;
}
@ -265,7 +265,7 @@ int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int to
if(ris != 0)
mp_msg(MSGT_DEMUX, MSGL_INFO, "dvb_tune, TUNING FAILED\n");
return (ris == 0);
return ris == 0;
}
@ -740,5 +740,5 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int
return -1;
}
return(check_status(fd_frontend, timeout));
return check_status(fd_frontend, timeout);
}

View File

@ -698,11 +698,11 @@ static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l
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:

View File

@ -348,7 +348,7 @@ int tv_set_norm_i(tvi_handle_t *tvh, int norm)
}
tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param);
return(1);
return 1;
}
static int open_tv(tvi_handle_t *tvh)