On Feb  9 11:59, Jon Turney wrote:
> ---
>  rebase.c | 47 ++++++++++++++++++++++++++++++++++++++++-------
>  1 file changed, 40 insertions(+), 7 deletions(-)
> 
> diff --git a/rebase.c b/rebase.c
> index 6f98d37..0aad1b2 100644
> --- a/rebase.c
> +++ b/rebase.c
> @@ -649,7 +649,16 @@ merge_image_info ()
>  		{
>  		  /* Reuse the old address if possible. */
>  		  if (match->slot_size < img_info_list[i].slot_size)
> -		    match->base = 0;
> +		    {
> +		      if (verbose)
> +		        fprintf (stderr, "rebasing %s because it won't fit in it's old slot size\n", img_info_list[i].name);
> +		      match->base = 0;
> +		    }
> +		  else
> +		    {
> +		      if (verbose)

This would ideally be an 

                  else if (verbose)
		    fprintf (<yadda>);

> -	    img_info_list[i].base = 0;
> +	    {
> +	      /* Not in database yet.  Set base to 0 to choose a new one. */
> +	      img_info_list[i].base = 0;
> +	      if (verbose)
> +		fprintf (stderr, "rebasing %s because not in database yet\n", img_info_list[i].name);

In the "reuse old address" case you have

  if (verbose)
    printf
  set var = 0

here and in later cases you have

  set var = 0;
  if (verbose)
    printf

I'd prefer to have these in the same order.

With this minor tweak patch is ok.


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat