[pacman-dev] [PATCH] libalpm/sync: remove useless intermediate variable

[Allan McRae]

On 07/03/13 23:56, Dave Reisner wrote:
> This also rearranges some code to ensure that declarations and code
> aren't mixed.
> 
> Signed-off-by: Dave Reisner <dreisner at archlinux.org>

Signed-off-by: Allan

(I thought my reviews were being reasonably thorough, so not sure how I
missed that.)

> ---
>  lib/libalpm/sync.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
> index 147a837..f9217bd 100644
> --- a/lib/libalpm/sync.c
> +++ b/lib/libalpm/sync.c
> @@ -212,9 +212,8 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
>  		/* Search for replacers then literal (if no replacer) in each sync database. */
>  		for(j = handle->dbs_sync; j; j = j->next) {
>  			alpm_db_t *sdb = j->data;
> +			alpm_list_t *replacers = check_replacers(handle, lpkg, sdb);
>  			/* Check sdb */
> -			alpm_list_t *replacers;
> -			replacers = check_replacers(handle, lpkg, sdb);
>  			if(replacers) {
>  				trans->add = alpm_list_join(trans->add, replacers);
>  				/* jump to next local package */
> @@ -222,9 +221,7 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
>  			} else {
>  				alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name);
>  				if(spkg) {
> -					int literal_upgrade = 0;
> -					literal_upgrade = check_literal(handle, lpkg, spkg, enable_downgrade);
> -					if(literal_upgrade) {
> +					if(check_literal(handle, lpkg, spkg, enable_downgrade)) {
>  						trans->add = alpm_list_add(trans->add, spkg);
>  					}
>  					/* jump to next local package */
>