svn commit: r895474 - /subversion/trunk/subversion/libsvn_subr/stream.c

[stsp]

Author: stsp
Date: Sun Jan  3 20:39:59 2010
New Revision: 895474

URL: http://svn.apache.org/viewvc?rev=895474&view=rev
Log:
* subversion/libsvn_subr/stream.c: Put struct member declarations and
   function definitions into consistent read/write/close/reset/mark order.
   No functional change.

Modified:
    subversion/trunk/subversion/libsvn_subr/stream.c

Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=895474&r1=895473&r2=895474&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Sun Jan  3 20:39:59 2010
@@ -68,9 +68,9 @@
   stream->baton = baton;
   stream->read_fn = NULL;
   stream->write_fn = NULL;
+  stream->close_fn = NULL;
   stream->reset_fn = NULL;
   stream->mark_fn = NULL;
-  stream->close_fn = NULL;
   stream->line_filter_cb = NULL;
   stream->line_transformer_cb = NULL;
   return stream;
@@ -98,21 +98,21 @@
 }
 
 void
-svn_stream_set_reset(svn_stream_t *stream, svn_io_reset_fn_t reset_fn)
+svn_stream_set_close(svn_stream_t *stream, svn_close_fn_t close_fn)
 {
-  stream->reset_fn = reset_fn;
+  stream->close_fn = close_fn;
 }
 
 void
-svn_stream_set_mark(svn_stream_t *stream, svn_io_mark_fn_t mark_fn)
+svn_stream_set_reset(svn_stream_t *stream, svn_io_reset_fn_t reset_fn)
 {
-  stream->mark_fn = mark_fn;
+  stream->reset_fn = reset_fn;
 }
 
 void
-svn_stream_set_close(svn_stream_t *stream, svn_close_fn_t close_fn)
+svn_stream_set_mark(svn_stream_t *stream, svn_io_mark_fn_t mark_fn)
 {
-  stream->close_fn = close_fn;
+  stream->mark_fn = mark_fn;
 }
 
 void
@@ -601,7 +601,6 @@
   return err;
 }
 
-
 static svn_error_t *
 write_handler_apr(void *baton, const char *data, apr_size_t *len)
 {
@@ -611,6 +610,14 @@
 }
 
 static svn_error_t *
+close_handler_apr(void *baton)
+{
+  struct baton_apr *btn = baton;
+
+  return svn_io_file_close(btn->file, btn->pool);
+}
+
+static svn_error_t *
 reset_handler_apr(void *baton)
 {
   apr_off_t offset;
@@ -642,14 +649,6 @@
   return SVN_NO_ERROR;
 }
 
-static svn_error_t *
-close_handler_apr(void *baton)
-{
-  struct baton_apr *btn = baton;
-
-  return svn_io_file_close(btn->file, btn->pool);
-}
-
 
 svn_error_t *
 svn_stream_open_readonly(svn_stream_t **stream,