Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: neutral (athena.apache.org: local policy)
From: Philip Martin <philip.martin@wandisco.com>
To: dev@subversion.apache.org
Subject: Re: svn commit: r1180154 - in /subversion/trunk/subversion:
 include/svn_sorts.h libsvn_client/merge.c libsvn_subr/mergeinfo.c
 libsvn_subr/sorts.c tests/libsvn_subr/mergeinfo-test.c
References: <20111007190041.C233B2388A32@eris.apache.org>
Date: Mon, 10 Oct 2011 11:48:58 +0100
In-Reply-To: <20111007190041.C233B2388A32@eris.apache.org>
	(pburba@apache.org's message of "Fri, 07 Oct 2011 19:00:41 -0000")
Message-ID: <87obxp5dgl.fsf@stat.home.lan>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

pburba@apache.org writes:

> Author: pburba
> Date: Fri Oct  7 19:00:40 2011
> New Revision: 1180154

> +  if (elements_to_delete)
> +    for (i = starting_index; i < (elements_to_delete + starting_index); i++)
> +      svn_sort__array_delete(rangelist, starting_index);
> +}

Given the pop optimisation it would be more efficient to delete the
elements in reverse order.  Passing the number of elements to be deleted
to svn_sort__array_delete would be better.

> +void
> +svn_sort__array_delete(apr_array_header_t *arr,
> +                       int delete_index)
> +{
> +  /* Do we have a valid index? */
> +  if (delete_index >= 0 && delete_index < arr->nelts)
> +    {
> +      if (delete_index == (arr->nelts - 1))
> +        {
> +          /* Deleting the last or only element in an array is easy. */
> +          apr_array_pop(arr);
> +        }
> +      else
> +        {
> +          memmove(arr->elts + arr->elt_size * delete_index,
> +                  arr->elts + arr->elt_size * (delete_index + 1),
> +                  arr->elt_size * (arr->nelts - 1 - delete_index));
> +          --(arr->nelts);
> +        }
> +    }
> +}

-- 
Philip