[pacman-dev] [PATCH 1/4] pm_asprintf logs 'failed to allocate' already

Andrew Gregory andrew.gregory.8 at gmail.com
Mon Mar 25 21:59:59 EDT 2013


On 03/25/13 at 02:43pm, Simon Gomizelj wrote:
> Signed-off-by: Simon Gomizelj <simongmzlj at gmail.com>
> ---
>  src/pacman/util.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/src/pacman/util.c b/src/pacman/util.c
> index 238e328..a1ec9c7 100644
> --- a/src/pacman/util.c
> +++ b/src/pacman/util.c
> @@ -698,7 +698,6 @@ void signature_display(const char *title, alpm_siglist_t *siglist,
>  		for(i = 0; i < siglist->count; i++) {
>  			char *sigline;
>  			const char *status, *validity, *name;
> -			int ret;
>  			alpm_sigresult_t *result = siglist->results + i;
>  			/* Don't re-indent the first result */
>  			if(i != 0) {
> @@ -746,12 +745,8 @@ void signature_display(const char *title, alpm_siglist_t *siglist,
>  					break;
>  			}
>  			name = result->key.uid ? result->key.uid : result->key.fingerprint;
> -			ret = pm_asprintf(&sigline, _("%s, %s from \"%s\""),
> +			pm_asprintf(&sigline, _("%s, %s from \"%s\""),
>  					status, validity, name);
> -			if(ret == -1) {
> -				pm_printf(ALPM_LOG_ERROR,  _("failed to allocate string\n"));
> -				continue;

That continue shouldn't be removed so we don't try to print the
invalid string.

> -			}
>  			indentprint(sigline, len, maxcols);
>  			printf("\n");
>  			free(sigline);
> -- 
> 1.8.2
> 
> 

apg


More information about the pacman-dev mailing list