From 0303b26b1ed6d060e65ec7dbae5db50fc14836ff Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 20 Mar 2011 19:45:57 -0500 Subject: 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/) // @@ expression a; @@ - return(a); + return a; // 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 --- lib/libalpm/alpm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/libalpm/alpm.c') diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index db2a63de..4d40d675 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -57,7 +57,7 @@ int SYMEXPORT alpm_initialize(void) /* error code should be set */ _alpm_handle_free(handle); handle = NULL; - return(-1); + return -1; } #ifdef ENABLE_NLS @@ -69,7 +69,7 @@ int SYMEXPORT alpm_initialize(void) handle->curl = curl_easy_init(); #endif - return(0); + return 0; } /** Release the library. This should be the last alpm call you make. @@ -82,7 +82,7 @@ int SYMEXPORT alpm_release(void) ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(alpm_db_unregister_all() == -1) { - return(-1); + return -1; } _alpm_handle_free(handle); @@ -92,7 +92,7 @@ int SYMEXPORT alpm_release(void) curl_global_cleanup(); #endif - return(0); + return 0; } /** @} */ @@ -103,7 +103,7 @@ int SYMEXPORT alpm_release(void) /* Get the version of library */ const char SYMEXPORT *alpm_version(void) { - return(LIB_VERSION); + return LIB_VERSION; } /* vim: set ts=2 sw=2 noet: */ -- cgit v1.2.3-70-g09d2