Re: [flashrom] [PATCH] remove exit call from show_id

[Niklas Söderlund]

Sorry I forgot,

Signed-off-by: Niklas Söderlund

On 05/30/2012 08:18 PM, Niklas Söderlund wrote:
> The only caller is able to check the return code and handle it correctly
>
> flashrom.c |    5 ++++-
>  layout.c   |    2 +-
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/flashrom.c b/flashrom.c
> index ec8137b..f6597e5 100644
> --- a/flashrom.c
> +++ b/flashrom.c
> @@ -1781,7 +1781,10 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it,
>
> #if CONFIG_INTERNAL == 1
>    	if (programmer == PROGRAMMER_INTERNAL)
> 	show_id(newcontents, size, force);
> 	if (show_id(newcontents, size, force)) {
> 		ret = 1;
> 		goto out;
> 	}
>
> #endif
>    }
>
> diff --git a/layout.c b/layout.c
> index 379ee8c..0512638 100644
> --- a/layout.c
> +++ b/layout.c
> @@ -137,7 +137,7 @@ int show_id(uint8_t *bios, int size, int force)
>    			  "\n\n",
>    			  mainboard_vendor, mainboard_part, lb_vendor,
>    			  lb_part);
> 	exit(1);
> 	return 1;
> }
> }