From 732e06258c81427cf7fedfca98107e21244264eb Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Fri, 7 Apr 2006 15:46:32 -0700
Subject: [PATCH] Rename write_data to write_func in cairo_output_stream_t.

---
 src/cairo-base85-stream.c |  8 ++++----
 src/cairo-output-stream.c | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cairo-base85-stream.c b/src/cairo-base85-stream.c
index bd1a7ac7e..1d4535a9f 100644
--- a/src/cairo-base85-stream.c
+++ b/src/cairo-base85-stream.c
@@ -63,9 +63,9 @@ _expand_four_tuple_to_five (unsigned char four_tuple[4],
 }
 
 static cairo_status_t
-_cairo_base85_stream_write_data (void			*closure,
-				 const unsigned char	*data,
-				 unsigned int		 length)
+_cairo_base85_stream_write (void		*closure,
+			    const unsigned char	*data,
+			    unsigned int	 length)
 {
     cairo_base85_stream_t *stream = closure;
     const unsigned char *ptr = data;
@@ -123,7 +123,7 @@ _cairo_base85_stream_create (cairo_output_stream_t *output)
     stream->output = output;
     stream->pending = 0;
 
-    return _cairo_output_stream_create (_cairo_base85_stream_write_data,
+    return _cairo_output_stream_create (_cairo_base85_stream_write,
 					_cairo_base85_stream_close,
 					stream);
 }
diff --git a/src/cairo-output-stream.c b/src/cairo-output-stream.c
index adc00b86a..16d937172 100644
--- a/src/cairo-output-stream.c
+++ b/src/cairo-output-stream.c
@@ -44,7 +44,7 @@
 #endif /* _MSC_VER */
 
 struct _cairo_output_stream {
-    cairo_write_func_t		write_data;
+    cairo_write_func_t		write_func;
     cairo_close_func_t		close_func;
     void			*closure;
     unsigned long		position;
@@ -53,7 +53,7 @@ struct _cairo_output_stream {
 };
 
 const cairo_output_stream_t cairo_output_stream_nil = {
-    NULL, /* write_data */
+    NULL, /* write_func */
     NULL, /* close_func */
     NULL, /* closure */
     0,    /* position */
@@ -62,7 +62,7 @@ const cairo_output_stream_t cairo_output_stream_nil = {
 };
 
 static const cairo_output_stream_t cairo_output_stream_nil_write_error = {
-    NULL, /* write_data */
+    NULL, /* write_func */
     NULL, /* close_func */
     NULL, /* closure */
     0,    /* position */
@@ -71,7 +71,7 @@ static const cairo_output_stream_t cairo_output_stream_nil_write_error = {
 };
 
 cairo_output_stream_t *
-_cairo_output_stream_create (cairo_write_func_t		write_data,
+_cairo_output_stream_create (cairo_write_func_t		write_func,
 			     cairo_close_func_t		close_func,
 			     void			*closure)
 {
@@ -81,7 +81,7 @@ _cairo_output_stream_create (cairo_write_func_t		write_data,
     if (stream == NULL)
 	return (cairo_output_stream_t *) &cairo_output_stream_nil;
 
-    stream->write_data = write_data;
+    stream->write_func = write_func;
     stream->close_func = close_func;
     stream->closure = closure;
     stream->position = 0;
@@ -125,7 +125,7 @@ _cairo_output_stream_write (cairo_output_stream_t *stream,
     if (stream->status)
 	return;
 
-    stream->status = stream->write_data (stream->closure, data, length);
+    stream->status = stream->write_func (stream->closure, data, length);
     stream->position += length;
 }