From 1c830798fe54268cc0f9585b5940bea47fa8eb8a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 5 Jun 2013 02:20:15 +0200
Subject: Remove parenthesis around arguments of return statements.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 ax25/access.c             |  4 ++--
 ax25/axgetput/proto_bin.c |  2 +-
 ax25/axgetput/util.c      |  2 +-
 ax25/axspawn.c            | 24 ++++++++++++------------
 ax25/bpqparms.c           |  2 +-
 kiss/net2kiss.c           |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ax25/access.c b/ax25/access.c
index 1363238..185deda 100644
--- a/ax25/access.c
+++ b/ax25/access.c
@@ -32,7 +32,7 @@ static void char_to_hex(char *c, char *h, int n);
 int conv_rand(void)
 {
 	seed = (1103515245L * seed + 12345) & CONV_RAND_MAX;
-	return ((int) (seed & 077777));
+	return (int) (seed & 077777);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -46,7 +46,7 @@ void conv_randomize(void)
 
 int conv_random(int num, int base)
 {
-	return (((long) (conv_rand() * time(0)) & CONV_RAND_MAX) % num + base);
+	return ((long) (conv_rand() * time(0)) & CONV_RAND_MAX) % num + base;
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/ax25/axgetput/proto_bin.c b/ax25/axgetput/proto_bin.c
index 9be7a58..b3e3420 100644
--- a/ax25/axgetput/proto_bin.c
+++ b/ax25/axgetput/proto_bin.c
@@ -38,7 +38,7 @@ static int init_crc(void)
 static int do_crc(char b, int n, unsigned int crc)
 {
   crc = (crctab[(crc >> 8)] ^ ((crc << 8) | (b & 0xff))) & 0xffff;
-  return (crc);
+  return crc;
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/ax25/axgetput/util.c b/ax25/axgetput/util.c
index f20937f..5501035 100644
--- a/ax25/axgetput/util.c
+++ b/ax25/axgetput/util.c
@@ -62,7 +62,7 @@ int my_read(int fd, char *s, int len_max, int *eof, char *p_break)
        * len = 0: normal eof. if we're looking for a string, return -1 since
        * we have'nt found
        */
-      return (len == 0 && p_break ? -1 : (len_got ? len_got : len));
+      return len == 0 && p_break ? -1 : (len_got ? len_got : len);
     }
     len_got += len;
 
diff --git a/ax25/axspawn.c b/ax25/axspawn.c
index 9e74e85..f8afd66 100644
--- a/ax25/axspawn.c
+++ b/ax25/axspawn.c
@@ -525,11 +525,11 @@ int encstathuf(char *src, int srclen, char *dest, int *destlen)
 
 	if ((src == NULL) || (dest == NULL)) {
 		syslog(LOG_NOTICE, "Huffman encode: src or dest NULL!");
-		return(1);
+		return 1;
 	}
 	if (srclen > 255) {
 		syslog(LOG_NOTICE, "Huffman encode: srclen > 255: %d", srclen);
-		return(1);
+		return 1;
 	}
 	srcptr = src;
 	destptr = &dest[1];
@@ -552,7 +552,7 @@ int encstathuf(char *src, int srclen, char *dest, int *destlen)
 				memcpy(&dest[1],src,srclen);
 				dest[0] = 255;
 				*destlen = srclen + 1;
-				return(0);
+				return 0;
 			}
 			bit8 = 0;
 			*destptr = 0;
@@ -570,7 +570,7 @@ int encstathuf(char *src, int srclen, char *dest, int *destlen)
 	if (bit8 != 0) (*destlen)++;
 	(*destlen)++;
 	dest[0] = (char)(srclen-1);
-	return(0);
+	return 0;
 }
 
 /* The buffer in src (first byte length-1) is decoded into dest
@@ -588,24 +588,24 @@ int decstathuf(char *src, char *dest, int srclen, int *destlen)
 	unsigned short decod;
 	unsigned short newnode;
 
-	if ((src == NULL) || (dest == NULL)) return(1);
+	if ((src == NULL) || (dest == NULL)) return 1;
 
 	srcptr = src;
 	destptr = dest;
 	*destlen = (int)((*srcptr)+1);
 	srcptr++;
 	if (--srclen == 0) {
-		return(1);
+		return 1;
 	}
 	if (*destlen == 0) {
-		return(1);
+		return 1;
 	}
 
 	if (*destlen == 256) {
 		/* no compression, only copy */
 		memcpy(dest,src+1,srclen);
 		*destlen = (unsigned char)(srclen);
-		return(0);
+		return 0;
 	}
 	wrklen = 0;
 	decod = 0;
@@ -639,10 +639,10 @@ int decstathuf(char *src, char *dest, int srclen, int *destlen)
 		if (wrklen >= *destlen) break;
 		bitmask = 0x80;
 		srcptr++;
-		if (srclen == 0) return(1);
+		if (srclen == 0) return 1;
 		srclen--;
 	}
-	return(0);
+	return 0;
 }
 
 
@@ -654,7 +654,7 @@ int _write_ax25(const char *s, int len)
 
 	i = write(1, s, len);
 	fflush(stdout);
-	return (i > 0 ? i : 0);	/* on error, -1 is returned  */
+	return i > 0 ? i : 0;	/* on error, -1 is returned  */
 }
 
 int read_ax25(unsigned char *s, int size)
@@ -677,7 +677,7 @@ int read_ax25(unsigned char *s, int size)
 		}
 	}
 	if (bin) {
-		return(len);
+		return len;
 	}
 
 
diff --git a/ax25/bpqparms.c b/ax25/bpqparms.c
index c5e12ad..590ab61 100644
--- a/ax25/bpqparms.c
+++ b/ax25/bpqparms.c
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 
 			case 'v':
 				printf("bpqparms: %s\n", VERSION);
-				return(0);
+				return 0;
 
 			case 'h':
 			case ':':
diff --git a/kiss/net2kiss.c b/kiss/net2kiss.c
index 27cd702..535d86c 100644
--- a/kiss/net2kiss.c
+++ b/kiss/net2kiss.c
@@ -254,7 +254,7 @@ static int openpty(int *amaster, int *aslave, char *name,
 			line[9] = *cp2;
 			if ((master = open(line, O_RDWR, 0)) == -1) {
 				if (errno == ENOENT)
-					return (-1);	/* out of ptys */
+					return -1;	/* out of ptys */
 			} else {
 				line[5] = 't';
 				(void) chown(line, getuid(),
@@ -284,7 +284,7 @@ static int openpty(int *amaster, int *aslave, char *name,
 		}
 	}
 	errno = ENOENT;	/* out of ptys */
-	return (-1);
+	return -1;
 }
 
 /* ---------------------------------------------------------------------- */
-- 
cgit v1.2.3