subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1130509 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c
Date Thu, 02 Jun 2011 12:05:39 GMT
Author: julianfoad
Date: Thu Jun  2 12:05:39 2011
New Revision: 1130509

URL: http://svn.apache.org/viewvc?rev=1130509&view=rev
Log:
Rename all new public stream symbols to start with 'svn_stream_' so that all
of the stream symbols are in the same name space except for some old ones
such as 'svn_read_fn_t'.  Some or all of these might soon be renamed again
to make them private, but that is a separate issue.

* subversion/include/svn_io.h,
  subversion/libsvn_subr/stream.c
  (svn_skip_fn_t): Rename to svn_stream_skip_fn_t.
  (svn_io_mark_fn_t): Rename to svn_stream_mark_fn_t.
  (svn_io_seek_fn_t): Rename to svn_stream_seek_fn_t.
  (svn_io_is_buffered_fn_t): Rename to svn_stream_is_buffered_fn_t.
  (svn_stream_t, svn_stream_set_skip, svn_stream_set_mark,
   svn_stream_set_seek, svn_stream_set_is_buffered): Adjust uses of the same.

* subversion/libsvn_subr/subst.c
  (translated_stream_mark, translated_stream_seek,
   translated_stream_is_buffered): Adjust doc strings.

Modified:
    subversion/trunk/subversion/include/svn_io.h
    subversion/trunk/subversion/libsvn_subr/stream.c
    subversion/trunk/subversion/libsvn_subr/subst.c

Modified: subversion/trunk/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_io.h?rev=1130509&r1=1130508&r2=1130509&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_io.h (original)
+++ subversion/trunk/subversion/include/svn_io.h Thu Jun  2 12:05:39 2011
@@ -767,8 +767,8 @@ typedef svn_error_t *(*svn_read_fn_t)(vo
  * and svn_stream_skip().
  * @since New in 1.7.
  */
-typedef svn_error_t *(*svn_skip_fn_t)(void *baton,
-                                      apr_size_t len);
+typedef svn_error_t *(*svn_stream_skip_fn_t)(void *baton,
+                                             apr_size_t len);
 
 /** Write handler function for a generic stream.  @see svn_stream_t. */
 typedef svn_error_t *(*svn_write_fn_t)(void *baton,
@@ -792,7 +792,7 @@ typedef struct svn_stream_mark_t svn_str
  *
  * @since New in 1.7.
  */
-typedef svn_error_t *(*svn_io_mark_fn_t)(void *baton,
+typedef svn_error_t *(*svn_stream_mark_fn_t)(void *baton,
                                          svn_stream_mark_t **mark,
                                          apr_pool_t *pool);
 
@@ -801,7 +801,7 @@ typedef svn_error_t *(*svn_io_mark_fn_t)
  *
  * @since New in 1.7.
  */
-typedef svn_error_t *(*svn_io_seek_fn_t)(void *baton,
+typedef svn_error_t *(*svn_stream_seek_fn_t)(void *baton,
                                          const svn_stream_mark_t *mark);
 
 /** Buffer test handler function for a generic stream. @see svn_stream_t 
@@ -809,7 +809,7 @@ typedef svn_error_t *(*svn_io_seek_fn_t)
  *
  * @since New in 1.7.
  */
-typedef svn_boolean_t (*svn_io_is_buffered_fn_t)(void *baton);
+typedef svn_boolean_t (*svn_stream_is_buffered_fn_t)(void *baton);
 
 /** Create a generic stream.  @see svn_stream_t. */
 svn_stream_t *
@@ -832,7 +832,7 @@ svn_stream_set_read(svn_stream_t *stream
  */
 void
 svn_stream_set_skip(svn_stream_t *stream,
-                    svn_skip_fn_t skip_fn);
+                    svn_stream_skip_fn_t skip_fn);
 
 /** Set @a stream's write function to @a write_fn */
 void
@@ -850,7 +850,7 @@ svn_stream_set_close(svn_stream_t *strea
  */
 void
 svn_stream_set_mark(svn_stream_t *stream,
-                    svn_io_mark_fn_t mark_fn);
+                    svn_stream_mark_fn_t mark_fn);
 
 /** Set @a stream's seek function to @a seek_fn
  *
@@ -858,7 +858,7 @@ svn_stream_set_mark(svn_stream_t *stream
  */
 void
 svn_stream_set_seek(svn_stream_t *stream,
-                    svn_io_seek_fn_t seek_fn);
+                    svn_stream_seek_fn_t seek_fn);
 
 /** Set @a stream's buffer test function to @a is_buffered_fn
  *
@@ -866,7 +866,7 @@ svn_stream_set_seek(svn_stream_t *stream
  */
 void
 svn_stream_set_is_buffered(svn_stream_t *stream,
-                           svn_io_is_buffered_fn_t is_buffered_fn);
+                           svn_stream_is_buffered_fn_t is_buffered_fn);
 
 /** Create a stream that is empty for reading and infinite for writing. */
 svn_stream_t *

Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=1130509&r1=1130508&r2=1130509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Thu Jun  2 12:05:39 2011
@@ -48,12 +48,12 @@
 struct svn_stream_t {
   void *baton;
   svn_read_fn_t read_fn;
-  svn_skip_fn_t skip_fn;
+  svn_stream_skip_fn_t skip_fn;
   svn_write_fn_t write_fn;
   svn_close_fn_t close_fn;
-  svn_io_mark_fn_t mark_fn;
-  svn_io_seek_fn_t seek_fn;
-  svn_io_is_buffered_fn_t is_buffered_fn;
+  svn_stream_mark_fn_t mark_fn;
+  svn_stream_seek_fn_t seek_fn;
+  svn_stream_is_buffered_fn_t is_buffered_fn;
 };
 
 
@@ -97,7 +97,7 @@ svn_stream_set_read(svn_stream_t *stream
 }
 
 void
-svn_stream_set_skip(svn_stream_t *stream, svn_skip_fn_t skip_fn)
+svn_stream_set_skip(svn_stream_t *stream, svn_stream_skip_fn_t skip_fn)
 {
   stream->skip_fn = skip_fn;
 }
@@ -115,20 +115,20 @@ svn_stream_set_close(svn_stream_t *strea
 }
 
 void
-svn_stream_set_mark(svn_stream_t *stream, svn_io_mark_fn_t mark_fn)
+svn_stream_set_mark(svn_stream_t *stream, svn_stream_mark_fn_t mark_fn)
 {
   stream->mark_fn = mark_fn;
 }
 
 void
-svn_stream_set_seek(svn_stream_t *stream, svn_io_seek_fn_t seek_fn)
+svn_stream_set_seek(svn_stream_t *stream, svn_stream_seek_fn_t seek_fn)
 {
   stream->seek_fn = seek_fn;
 }
 
 void
 svn_stream_set_is_buffered(svn_stream_t *stream,
-                           svn_io_is_buffered_fn_t is_buffered_fn)
+                           svn_stream_is_buffered_fn_t is_buffered_fn)
 {
   stream->is_buffered_fn = is_buffered_fn;
 }

Modified: subversion/trunk/subversion/libsvn_subr/subst.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/subst.c?rev=1130509&r1=1130508&r2=1130509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/subst.c (original)
+++ subversion/trunk/subversion/libsvn_subr/subst.c Thu Jun  2 12:05:39 2011
@@ -1287,7 +1287,7 @@ typedef struct mark_translated_t
   svn_stream_mark_t *mark;
 } mark_translated_t;
 
-/* Implements svn_io_mark_fn_t. */
+/* Implements svn_stream_mark_fn_t. */
 static svn_error_t *
 translated_stream_mark(void *baton, svn_stream_mark_t **mark, apr_pool_t *pool)
 {
@@ -1312,7 +1312,7 @@ translated_stream_mark(void *baton, svn_
   return SVN_NO_ERROR;
 }
 
-/* Implements svn_io_seek_fn_t. */
+/* Implements svn_stream_seek_fn_t. */
 static svn_error_t *
 translated_stream_seek(void *baton, const svn_stream_mark_t *mark)
 {
@@ -1358,7 +1358,7 @@ translated_stream_seek(void *baton, cons
   return SVN_NO_ERROR;
 }
 
-/* Implements svn_io_is_buffered_fn_t. */
+/* Implements svn_stream_is_buffered_fn_t. */
 static svn_boolean_t
 translated_stream_is_buffered(void *baton)
 {



Mime
View raw message