[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] build: avoid shadowing a function name



On Thu, Mar 07, 2013 at 06:40:49AM -0700, Eric Blake wrote:
> Make the same fix as in commit de53eff.
> 
> * src/util/viralloc.h (virDeleteElementsN): Cater to old gcc/glibc.
> ---
> 
> Pushing under the trivial rule.
> 
>  src/util/viralloc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/util/viralloc.h b/src/util/viralloc.h
> index 3c97a58..6f46d0b 100644
> --- a/src/util/viralloc.h
> +++ b/src/util/viralloc.h
> @@ -64,7 +64,7 @@ int virInsertElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr,
>                         bool clearOriginal, bool inPlace)
>      ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
>  int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr,
> -                       size_t remove, bool inPlace)
> +                       size_t toremove, bool inPlace)
>      ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
>  int virAllocVar(void *ptrptr,
>                  size_t struct_size,

Ideally we should update the .c file too, to match.

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]