diff options
Diffstat (limited to 'lib/stream.h')
| -rw-r--r-- | lib/stream.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/lib/stream.h b/lib/stream.h index e738040d34..8011fc0963 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -148,7 +148,7 @@ extern size_t stream_resize(struct stream *, size_t); extern size_t stream_get_getp(struct stream *); extern size_t stream_get_endp(struct stream *); extern size_t stream_get_size(struct stream *); -extern u_char *stream_get_data(struct stream *); +extern uint8_t *stream_get_data(struct stream *); /** * Create a new stream structure; copy offset bytes from s1 to the new @@ -165,43 +165,43 @@ extern void stream_forward_endp(struct stream *, size_t); /* steam_put: NULL source zeroes out size_t bytes of stream */ extern void stream_put(struct stream *, const void *, size_t); -extern int stream_putc(struct stream *, u_char); -extern int stream_putc_at(struct stream *, size_t, u_char); -extern int stream_putw(struct stream *, u_int16_t); -extern int stream_putw_at(struct stream *, size_t, u_int16_t); -extern int stream_put3(struct stream *, u_int32_t); -extern int stream_put3_at(struct stream *, size_t, u_int32_t); -extern int stream_putl(struct stream *, u_int32_t); -extern int stream_putl_at(struct stream *, size_t, u_int32_t); +extern int stream_putc(struct stream *, uint8_t); +extern int stream_putc_at(struct stream *, size_t, uint8_t); +extern int stream_putw(struct stream *, uint16_t); +extern int stream_putw_at(struct stream *, size_t, uint16_t); +extern int stream_put3(struct stream *, uint32_t); +extern int stream_put3_at(struct stream *, size_t, uint32_t); +extern int stream_putl(struct stream *, uint32_t); +extern int stream_putl_at(struct stream *, size_t, uint32_t); extern int stream_putq(struct stream *, uint64_t); extern int stream_putq_at(struct stream *, size_t, uint64_t); -extern int stream_put_ipv4(struct stream *, u_int32_t); +extern int stream_put_ipv4(struct stream *, uint32_t); extern int stream_put_in_addr(struct stream *, struct in_addr *); extern int stream_put_in_addr_at(struct stream *, size_t, struct in_addr *); extern int stream_put_in6_addr_at(struct stream *, size_t, struct in6_addr *); extern int stream_put_prefix_addpath(struct stream *, struct prefix *, int addpath_encode, - u_int32_t addpath_tx_id); + uint32_t addpath_tx_id); extern int stream_put_prefix(struct stream *, struct prefix *); extern int stream_put_labeled_prefix(struct stream *, struct prefix *, mpls_label_t *); extern void stream_get(void *, struct stream *, size_t); extern bool stream_get2(void *data, struct stream *s, size_t size); extern void stream_get_from(void *, struct stream *, size_t, size_t); -extern u_char stream_getc(struct stream *); -extern bool stream_getc2(struct stream *s, u_char *byte); -extern u_char stream_getc_from(struct stream *, size_t); -extern u_int16_t stream_getw(struct stream *); +extern uint8_t stream_getc(struct stream *); +extern bool stream_getc2(struct stream *s, uint8_t *byte); +extern uint8_t stream_getc_from(struct stream *, size_t); +extern uint16_t stream_getw(struct stream *); extern bool stream_getw2(struct stream *s, uint16_t *word); -extern u_int16_t stream_getw_from(struct stream *, size_t); -extern u_int32_t stream_get3(struct stream *); -extern u_int32_t stream_get3_from(struct stream *, size_t); -extern u_int32_t stream_getl(struct stream *); +extern uint16_t stream_getw_from(struct stream *, size_t); +extern uint32_t stream_get3(struct stream *); +extern uint32_t stream_get3_from(struct stream *, size_t); +extern uint32_t stream_getl(struct stream *); extern bool stream_getl2(struct stream *s, uint32_t *l); -extern u_int32_t stream_getl_from(struct stream *, size_t); +extern uint32_t stream_getl_from(struct stream *, size_t); extern uint64_t stream_getq(struct stream *); extern uint64_t stream_getq_from(struct stream *, size_t); -extern u_int32_t stream_get_ipv4(struct stream *); +extern uint32_t stream_get_ipv4(struct stream *); /* IEEE-754 floats */ extern float stream_getf(struct stream *); @@ -238,7 +238,7 @@ extern int stream_flush(struct stream *, int); extern int stream_empty(struct stream *); /* is the stream empty? */ /* deprecated */ -extern u_char *stream_pnt(struct stream *); +extern uint8_t *stream_pnt(struct stream *); /* Stream fifo. */ extern struct stream_fifo *stream_fifo_new(void); |