[gnome-keyring] Fix shadowing of a glibc function to fix a gcc warning
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] Fix shadowing of a glibc function to fix a gcc warning
- Date: Sun, 29 Aug 2010 14:39:03 +0000 (UTC)
commit 0cb06e4a3ff4a83305f1539a286c4060e9b0d6bc
Author: Philip Withnall <philip withnall collabora co uk>
Date: Wed Aug 25 15:12:56 2010 +0100
Fix shadowing of a glibc function to fix a gcc warning
gp11/gp11-attributes.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gp11/gp11-attributes.c b/gp11/gp11-attributes.c
index afbd08c..5e0b1b1 100644
--- a/gp11/gp11-attributes.c
+++ b/gp11/gp11-attributes.c
@@ -927,7 +927,7 @@ gp11_attributes_new_valist (GP11Allocator allocator, va_list va)
/**
* gp11_attributes_at:
* @attrs: The attributes array.
- * @index: The attribute index to retrieve.
+ * @_index: The attribute index to retrieve.
*
* Get attribute at the specified index in the attribute array.
*
@@ -937,12 +937,12 @@ gp11_attributes_new_valist (GP11Allocator allocator, va_list va)
* Return value: The specified attribute.
**/
GP11Attribute*
-gp11_attributes_at (GP11Attributes *attrs, guint index)
+gp11_attributes_at (GP11Attributes *attrs, guint _index)
{
g_return_val_if_fail (attrs && attrs->array, NULL);
- g_return_val_if_fail (index < attrs->array->len, NULL);
+ g_return_val_if_fail (_index < attrs->array->len, NULL);
g_return_val_if_fail (!attrs->locked, NULL);
- return &g_array_index (attrs->array, GP11Attribute, index);
+ return &g_array_index (attrs->array, GP11Attribute, _index);
}
static GP11Attribute*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]