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, 7 insertions, 7 deletions

diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c
index eba66210..9f3a9b71 100644
--- a/lib/libalpm/version.c
+++ b/lib/libalpm/version.c
@@ -93,7 +93,7 @@ static int rpmvercmp(const char *a, const char *b)
 	int ret = 0;
 
 	/* easy comparison to see if versions are identical */
-	if(strcmp(a, b) == 0) return(0);
+	if(strcmp(a, b) == 0) return 0;
 
 	str1 = strdup(a);
 	str2 = strdup(b);
@@ -209,7 +209,7 @@ static int rpmvercmp(const char *a, const char *b)
 cleanup:
 	free(str1);
 	free(str2);
-	return(ret);
+	return ret;
 }
 
 /** Compare two version strings and determine which one is 'newer'.
@@ -235,15 +235,15 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b)
 
 	/* ensure our strings are not null */
 	if(!a && !b) {
-		return(0);
+		return 0;
 	} else if(!a) {
-		return(-1);
+		return -1;
 	} else if(!b) {
-		return(1);
+		return 1;
 	}
 	/* another quick shortcut- if full version specs are equal */
 	if(strcmp(a, b) == 0) {
-		return(0);
+		return 0;
 	}
 
 	/* Parse both versions into [epoch:]version[-release] triplets. We probably
@@ -266,7 +266,7 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b)
 
 	free(full1);
 	free(full2);
-	return(ret);
+	return ret;
 }
 
 /* vim: set ts=2 sw=2 noet: */