diff options
author | Dan McGee <dan@archlinux.org> | 2011-03-21 01:45:57 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-03-21 01:49:45 +0100 |
commit | 0303b26b1ed6d060e65ec7dbae5db50fc14836ff (patch) | |
tree | 902e26197511ee42a9562bc6b71ae77c20f3c86d /lib/libalpm/group.c | |
parent | 0cf05c77ad86b5c1895e94284b571afba5feebe8 (diff) | |
download | pacman-0303b26b1ed6d060e65ec7dbae5db50fc14836ff.tar.gz pacman-0303b26b1ed6d060e65ec7dbae5db50fc14836ff.tar.xz |
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>
Diffstat (limited to 'lib/libalpm/group.c')
-rw-r--r-- | lib/libalpm/group.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 398c2588..b13908c1 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -40,7 +40,7 @@ pmgrp_t *_alpm_grp_new(const char *name) CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL)); - return(grp); + return grp; } void _alpm_grp_free(pmgrp_t *grp) @@ -62,7 +62,7 @@ const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp) ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(grp != NULL, return(NULL)); + ASSERT(grp != NULL, return NULL); return grp->name; } @@ -72,7 +72,7 @@ alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp) ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(grp != NULL, return(NULL)); + ASSERT(grp != NULL, return NULL); return grp->packages; } |