2004-10-07 Greg Troxel <gdt@claude.ir.bbn.com>
* ospf_apiserver.c (ospf_apiserver_unregister_opaque_type): Don't
use of variable names 'node' and 'nextnode' to avoid possible
conflict with list macros. Move variable declaration inside for
loop after a statement to top of function.
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 20e9f40..f71479e 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-07 Greg Troxel <gdt@claude.ir.bbn.com>
+
+ * ospf_apiserver.c (ospf_apiserver_unregister_opaque_type): Don't
+ use of variable names 'node' and 'nextnode' to avoid possible
+ conflict with list macros. Move variable declaration inside for
+ loop after a statement to top of function.
+
2004-10-07 Paul Jakma <paul@dishone.st>
* ospf_snmp.c: Missed list typedef update
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 9a2a65d..96fb917 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -962,13 +962,14 @@
ospf_apiserver_unregister_opaque_type (struct ospf_apiserver *apiserv,
u_char lsa_type, u_char opaque_type)
{
- struct listnode *node, *nextnode;
+ struct listnode *n1, *n1_next;
+ struct registered_opaque_type *regtype;
- for (node = listhead (apiserv->opaque_types); node; node = nextnode)
+ for (n1 = listhead (apiserv->opaque_types); n1; n1 = n1_next)
{
- nextnode = node->next;
+ n1_next = n1->next;
- struct registered_opaque_type *regtype = node->data;
+ regtype = (struct registered_opaque_type *) getdata(n1);
/* Check if we really registered this opaque type */
if (regtype->lsa_type == lsa_type &&