2005-02-09 Paul Jakma <paul.jakma@sun.com>
* (global) Update code to match stream.h changes.
stream_get_putp effectively replaced with stream_get_endp.
stream_forward renamed to stream_forward_getp.
stream_forward_endp introduced to replace some previous
setting/manual twiddling of putp by daemons.
* lib/stream.h: Remove putp. Update reference to putp with endp.
Add stream_forward_endp, which daemons were doing manually.
Rename stream_forward to stream_forward_getp.
lib/stream.c: Remove/update references to putp.
introduce stream_forward_endp.
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index dd712c3..17cf28c 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -455,7 +455,7 @@
lsa = (struct lsa_header *) STREAM_PNT (s);
ospf_lsa_header_dump (lsa);
- stream_forward (s, OSPF_LSA_HEADER_SIZE);
+ stream_forward_getp (s, OSPF_LSA_HEADER_SIZE);
length -= OSPF_LSA_HEADER_SIZE;
}
}
@@ -481,7 +481,7 @@
length -= OSPF_HEADER_SIZE + OSPF_DB_DESC_MIN_SIZE;
- stream_forward (s, OSPF_DB_DESC_MIN_SIZE);
+ stream_forward_getp (s, OSPF_DB_DESC_MIN_SIZE);
ospf_lsa_header_list_dump (s, length);
@@ -577,7 +577,7 @@
break;
}
- stream_forward (s, lsa_len);
+ stream_forward_getp (s, lsa_len);
length -= lsa_len;
count--;
}
@@ -673,7 +673,7 @@
/* Show OSPF header detail. */
ospf_header_dump (ospfh);
- stream_forward (s, OSPF_HEADER_SIZE);
+ stream_forward_getp (s, OSPF_HEADER_SIZE);
switch (ospfh->type)
{