mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-10 16:58:47 +03:00
gcc: avoid shadowing index
Some older headers were declaring 'index' so avoid its usage. /usr/include/string.h:489: warning: shadowed declaration is here
This commit is contained in:
parent
250e05a965
commit
1aac59f82a
@ -624,15 +624,15 @@ static void _degrade_to_n48(struct node256 *n256, struct value *result)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Removes an entry in an array by sliding the values above it down.
|
// Removes an entry in an array by sliding the values above it down.
|
||||||
static void _erase_elt(void *array, size_t obj_size, unsigned count, unsigned index)
|
static void _erase_elt(void *array, size_t obj_size, unsigned count, unsigned idx)
|
||||||
{
|
{
|
||||||
if (index == (count - 1))
|
if (idx == (count - 1))
|
||||||
// The simple case
|
// The simple case
|
||||||
return;
|
return;
|
||||||
|
|
||||||
memmove(((uint8_t *) array) + (obj_size * index),
|
memmove(((uint8_t *) array) + (obj_size * idx),
|
||||||
((uint8_t *) array) + (obj_size * (index + 1)),
|
((uint8_t *) array) + (obj_size * (idx + 1)),
|
||||||
obj_size * (count - index - 1));
|
obj_size * (count - idx - 1));
|
||||||
|
|
||||||
// Zero the now unused last elt (set's v.type to UNSET)
|
// Zero the now unused last elt (set's v.type to UNSET)
|
||||||
memset(((uint8_t *) array) + (count - 1) * obj_size, 0, obj_size);
|
memset(((uint8_t *) array) + (count - 1) * obj_size, 0, obj_size);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user