diff options
| author | paul <paul> | 2005-02-09 15:51:56 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-02-09 15:51:56 +0000 |
| commit | 9985f83ce7102f64b15f744b60320f8d14a8a5ff (patch) | |
| tree | 344629bdc2b4a7d53b8d7ca1705c9be2ca282d18 /lib/stream.h | |
| parent | 083ee9d9cdbf72a452b9af96e62d0625ea712cd9 (diff) | |
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.
Diffstat (limited to 'lib/stream.h')
| -rw-r--r-- | lib/stream.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/stream.h b/lib/stream.h index f7a94ea3..c7e4ffbf 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -32,9 +32,6 @@ struct stream unsigned char *data; - /* Put pointer. */ - unsigned long putp; - /* Get pointer. */ unsigned long getp; @@ -57,7 +54,7 @@ struct stream_fifo /* Utility macros. */ #define STREAM_PNT(S) ((S)->data + (S)->getp) #define STREAM_SIZE(S) ((S)->size) -#define STREAM_REMAIN(S) ((S)->size - (S)->putp) +#define STREAM_REMAIN(S) ((S)->size - (S)->endp) #define STREAM_DATA(S) ((S)->data) /* Stream prototypes. */ @@ -65,15 +62,13 @@ struct stream *stream_new (size_t); void stream_free (struct stream *); unsigned long stream_get_getp (struct stream *); -unsigned long stream_get_putp (struct stream *); unsigned long stream_get_endp (struct stream *); unsigned long stream_get_size (struct stream *); u_char *stream_get_data (struct stream *); void stream_set_getp (struct stream *, unsigned long); -void stream_set_putp (struct stream *, unsigned long); - -void stream_forward (struct stream *, int); +void stream_forward_getp (struct stream *, int); +void stream_forward_endp (struct stream *, int); void stream_put (struct stream *, void *, size_t); int stream_putc (struct stream *, u_char); |