summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ChangeLog4
-rw-r--r--lib/buffer.c8
-rw-r--r--lib/buffer.h4
-rw-r--r--lib/zebra.h2
4 files changed, 11 insertions, 7 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index b42f4611..05cf2930 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-04 Paul Jakma <paul@dishone.st>
+
+ * type mismatch fixes
+
2004-05-18 Hasso Tepper <hasso@estpak.ee>
* pqueue.[c|h]: Added as part of ospf6d merge from Zebra repository.
diff --git a/lib/buffer.c b/lib/buffer.c
index de51ee3e..0fffdfd1 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -149,7 +149,7 @@ buffer_add (struct buffer *b)
/* Write data to buffer. */
int
-buffer_write (struct buffer *b, u_char *ptr, size_t size)
+buffer_write (struct buffer *b, void *ptr, size_t size)
{
struct buffer_data *data;
@@ -205,12 +205,12 @@ buffer_putw (struct buffer *b, u_short c)
/* Put string to the buffer. */
int
-buffer_putstr (struct buffer *b, u_char *c)
+buffer_putstr (struct buffer *b, char *c)
{
size_t size;
- size = strlen ((char *)c);
- buffer_write (b, c, size);
+ size = strlen (c);
+ buffer_write (b, (void *) c, size);
return 1;
}
diff --git a/lib/buffer.h b/lib/buffer.h
index 7449aa77..eaf4b88d 100644
--- a/lib/buffer.h
+++ b/lib/buffer.h
@@ -63,11 +63,11 @@ struct buffer_data
/* Buffer prototypes. */
struct buffer *buffer_new (size_t);
-int buffer_write (struct buffer *, u_char *, size_t);
+int buffer_write (struct buffer *, void *, size_t);
void buffer_free (struct buffer *);
char *buffer_getstr (struct buffer *);
int buffer_putc (struct buffer *, u_char);
-int buffer_putstr (struct buffer *, u_char *);
+int buffer_putstr (struct buffer *, char *);
void buffer_reset (struct buffer *);
int buffer_flush_all (struct buffer *, int);
int buffer_flush_vty_all (struct buffer *, int, int, int);
diff --git a/lib/zebra.h b/lib/zebra.h
index 997237d2..30377fdb 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -337,7 +337,7 @@ struct in_pktinfo
/* AFI and SAFI type. */
typedef u_int16_t afi_t;
-typedef u_char safi_t;
+typedef u_int8_t safi_t;
/* Zebra types. */
typedef u_int16_t zebra_size_t;