Style change: return(x) --> return x

This was discussed and more or less agreed upon on the mailing list. A
huge checkin, but if we just do it and let people adjust the pain will
end soon enough. Rebasing should be relatively straighforward for anyone
that sees conflicts; just be sure you use the new return style if
possible.

The following semantic patch was used to do the change, along with some
hand-massaging in order to preserve parenthesis where appropriate:

The semantic match that finds this problem is as follows, although some
hand-massaging was done in order to keep parenthesis where appropriate:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression a;
@@
- return(a);
+ return a;

// </smpl>

A macros_file was also provided with the following content:

Additional steps taken, mainly for ASSERT() macros:
$ sed -i -e 's#return(NULL)#return NULL#' lib/libalpm/*.c
$ sed -i -e 's#return(-1)#return -1#' lib/libalpm/*.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/util/pactree.c b/src/util/pactree.c
index 6a10006f..94e628b6 100644
--- a/src/util/pactree.c
+++ b/src/util/pactree.c
@@ -60,12 +60,12 @@ static int alpm_local_init(void)
 
 	ret = alpm_initialize();
 	if(ret != 0) {
-		return(ret);
+		return ret;
 	}
 
 	ret = alpm_option_set_root(ROOTDIR);
 	if(ret != 0) {
-		return(ret);
+		return ret;
 	}
 
 	if(dbpath) {
@@ -74,15 +74,15 @@ static int alpm_local_init(void)
 		ret = alpm_option_set_dbpath(DBPATH);
 	}
 	if(ret != 0) {
-		return(ret);
+		return ret;
 	}
 
 	db_local = alpm_option_get_localdb();
 	if(!db_local) {
-		return(1);
+		return 1;
 	}
 
-	return(0);
+	return 0;
 }
 
 static int parse_options(int argc, char *argv[])
@@ -137,12 +137,12 @@ static int parse_options(int argc, char *argv[])
 			case 'h':
 			case '?':
 			default:
-				return(1);
+				return 1;
 		}
 	}
 
 	if(!argv[optind]) {
-		return(1);
+		return 1;
 	}
 
 	if(!color) {
@@ -159,7 +159,7 @@ static int parse_options(int argc, char *argv[])
 		indent_size  = 0;
 	}
 
-	return(0);
+	return 0;
 }
 
 static void usage(void)
@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
 
 finish:
 	cleanup();
-	return(ret);
+	return ret;
 }
 
 /* vim: set ts=2 sw=2 noet: */