From 50f563f9279f01a9f2177cac84178b153365f037 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 8 Oct 2009 11:25:01 +0000
Subject: [PATCH] cosmetics: Remove some pointless parentheses from return
 calls.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 drivers/mga_vid.c      |  2 +-
 libvo/vo_vdpau.c       |  4 ++--
 mp3lib/sr1.c           | 10 +++++-----
 mp3lib/test.c          |  2 +-
 stream/dvb_tune.c      |  8 ++++----
 stream/stream_dvdnav.c |  6 +++---
 stream/tv.c            |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c
index fdbfe04d1b..8330be29d6 100644
--- a/drivers/mga_vid.c
+++ b/drivers/mga_vid.c
@@ -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;
 
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 3d6a3f0ca9..2034e4027b 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -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:
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 224f838c7d..e02c1cfd8c 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -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.
diff --git a/mp3lib/test.c b/mp3lib/test.c
index 5246ad3ff8..8ae1c68d41 100644
--- a/mp3lib/test.c
+++ b/mp3lib/test.c
@@ -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;
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index 8b7bdb7317..214fe871c2 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -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);
 }
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index ea8a28fe5f..13b6c5f144 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -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:
diff --git a/stream/tv.c b/stream/tv.c
index 240596b32d..34e184a37f 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -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)