summaryrefslogtreecommitdiffstats
path: root/stream.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-07-31 06:56:59 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-07-31 06:56:59 -0700
commit937f888f0a5873bf78d34afa5c68ca2cb764b331 (patch)
tree2722b32f2c8dcb8db9f7746b2de8672710baeb48 /stream.c
parentd9a0a4a147e016761ed29966246b347d0c8ef8bb (diff)
downloadtxr-937f888f0a5873bf78d34afa5c68ca2cb764b331.tar.gz
txr-937f888f0a5873bf78d34afa5c68ca2cb764b331.tar.bz2
txr-937f888f0a5873bf78d34afa5c68ca2cb764b331.zip
string_output renamed to string_out
* stream.c (struct string_output): Renamed to string_out. (string_out_stream_destroy, string_out_byte_callback, string_out_put_char, strnig_out_put_string, string_out_put_byte, make_string_output_stream, get_string_from_stream): Follow rename.
Diffstat (limited to 'stream.c')
-rw-r--r--stream.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/stream.c b/stream.c
index 73597cb9..240db1eb 100644
--- a/stream.c
+++ b/stream.c
@@ -1420,7 +1420,7 @@ val make_string_byte_input_stream(val string)
}
}
-struct string_output {
+struct string_out {
struct strm_base a;
wchar_t *buf;
size_t size;
@@ -1432,7 +1432,7 @@ struct string_output {
static void string_out_stream_destroy(val stream)
{
- struct string_output *so = coerce(struct string_output *, stream->co.handle);
+ struct string_out *so = coerce(struct string_out *, stream->co.handle);
strm_base_cleanup(&so->a);
free(so->buf);
@@ -1442,7 +1442,7 @@ static void string_out_stream_destroy(val stream)
static int string_out_byte_callback(mem_t *ctx)
{
- struct string_output *so = coerce(struct string_output *, ctx);
+ struct string_out *so = coerce(struct string_out *, ctx);
if (so->tail >= so->head)
return EOF;
return so->byte_buf[so->tail++];
@@ -1450,7 +1450,7 @@ static int string_out_byte_callback(mem_t *ctx)
static val string_out_put_char(val stream, val ch);
-static val string_out_byte_flush(struct string_output *so, val stream)
+static val string_out_byte_flush(struct string_out *so, val stream)
{
val result = nil;
@@ -1472,7 +1472,7 @@ static val string_out_byte_flush(struct string_output *so, val stream)
static val string_out_put_string(val stream, val str)
{
- struct string_output *so = coerce(struct string_output *, stream->co.handle);
+ struct string_out *so = coerce(struct string_out *, stream->co.handle);
if (so == 0)
return nil;
@@ -1515,7 +1515,7 @@ static val string_out_put_char(val stream, val ch)
static val string_out_put_byte(val stream, int ch)
{
- struct string_output *so = coerce(struct string_output *, stream->co.handle);
+ struct string_out *so = coerce(struct string_out *, stream->co.handle);
if (so == 0)
return nil;
@@ -1544,7 +1544,7 @@ static struct strm_ops string_out_ops =
val make_string_output_stream(void)
{
- struct string_output *so = coerce(struct string_output *, chk_malloc(sizeof *so));
+ struct string_out *so = coerce(struct string_out *, chk_malloc(sizeof *so));
strm_base_init(&so->a);
so->size = 128;
so->buf = coerce(wchar_t *, chk_malloc(so->size * sizeof so->buf));
@@ -1557,7 +1557,7 @@ val make_string_output_stream(void)
val get_string_from_stream(val stream)
{
- struct string_output *so = coerce(struct string_output *,
+ struct string_out *so = coerce(struct string_out *,
cobj_handle(stream, stream_s));
if (stream->co.ops == &string_out_ops.cobj_ops) {