[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-cvs
Subject: svn commit: r20903 - trunk/subversion/mod_dav_svn
From: maxb () tigris ! org
Date: 2006-07-30 11:05:59
Message-ID: 20060730110559.6452D34C09F () svn ! collab ! net
[Download RAW message or body]
Author: maxb
Date: Sun Jul 30 04:05:57 2006
New Revision: 20903
Modified:
trunk/subversion/mod_dav_svn/dav_svn.h
trunk/subversion/mod_dav_svn/file_revs.c
trunk/subversion/mod_dav_svn/replay.c
trunk/subversion/mod_dav_svn/update.c
trunk/subversion/mod_dav_svn/util.c
Log:
Migrate some general utility code from mod_dav_svn's update.c to util.c,
and apply double-underscore policy to it whilst doing so.
[in subversion/mod_dav_svn/]
* dav_svn.h (dav_svn_make_base64_output_stream): Rename...
(dav_svn__make_base64_output_stream): ...to this.
* update.c
(brigade_write_baton, brigade_write_fn, dav_svn_make_base64_output_stream):
Move out of this file.
* util.c
(brigade_write_baton, brigade_write_fn, dav_svn__make_base64_output_stream):
Move to this file, adding underscore.
* file_revs.c, replay.c, update.c: Change callers to new name.
Modified: trunk/subversion/mod_dav_svn/dav_svn.h
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/dav_svn.h?pathrev=20903&r1=20902&r2=20903
==============================================================================
--- trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ trunk/subversion/mod_dav_svn/dav_svn.h Sun Jul 30 04:05:57 2006
@@ -614,9 +614,9 @@
and send it to the Apache filter OUTPUT using BB. Allocate the stream in
POOL. */
svn_stream_t *
-dav_svn_make_base64_output_stream(apr_bucket_brigade *bb,
- ap_filter_t *output,
- apr_pool_t *pool);
+dav_svn__make_base64_output_stream(apr_bucket_brigade *bb,
+ ap_filter_t *output,
+ apr_pool_t *pool);
/* A baton needed by dav_svn_authz_read(). */
Modified: trunk/subversion/mod_dav_svn/file_revs.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/file_revs.c?pathrev=20903&r1=20902&r2=20903
==============================================================================
--- trunk/subversion/mod_dav_svn/file_revs.c (original)
+++ trunk/subversion/mod_dav_svn/file_revs.c Sun Jul 30 04:05:57 2006
@@ -184,8 +184,8 @@
{
svn_stream_t *base64_stream;
- base64_stream = dav_svn_make_base64_output_stream(frb->bb, frb->output,
- pool);
+ base64_stream = dav_svn__make_base64_output_stream(frb->bb, frb->output,
+ pool);
svn_txdelta_to_svndiff2(&frb->window_handler, &frb->window_baton,
base64_stream, frb->svndiff_version, pool);
*window_handler = delta_window_handler;
Modified: trunk/subversion/mod_dav_svn/replay.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/replay.c?pathrev=20903&r1=20902&r2=20903
==============================================================================
--- trunk/subversion/mod_dav_svn/replay.c (original)
+++ trunk/subversion/mod_dav_svn/replay.c Sun Jul 30 04:05:57 2006
@@ -308,7 +308,7 @@
else
SVN_ERR(dav_svn__send_xml(eb->bb, eb->output, ">"));
- stream = dav_svn_make_base64_output_stream(eb->bb, eb->output, pool);
+ stream = dav_svn__make_base64_output_stream(eb->bb, eb->output, pool);
svn_txdelta_to_svndiff(stream, pool, handler, handler_baton);
Modified: trunk/subversion/mod_dav_svn/update.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/update.c?pathrev=20903&r1=20902&r2=20903
==============================================================================
--- trunk/subversion/mod_dav_svn/update.c (original)
+++ trunk/subversion/mod_dav_svn/update.c Sun Jul 30 04:05:57 2006
@@ -359,45 +359,6 @@
}
-struct brigade_write_baton
-{
- apr_bucket_brigade *bb;
- ap_filter_t *output;
-};
-
-
-/* This implements 'svn_write_fn_t'. */
-static svn_error_t *
-brigade_write_fn(void *baton, const char *data, apr_size_t *len)
-{
- struct brigade_write_baton *wb = baton;
- apr_status_t apr_err;
-
- apr_err = apr_brigade_write(wb->bb, ap_filter_flush, wb->output, data, *len);
-
- if (apr_err != APR_SUCCESS)
- return svn_error_wrap_apr(apr_err, "Error writing base64 data");
-
- return SVN_NO_ERROR;
-}
-
-
-svn_stream_t *
-dav_svn_make_base64_output_stream(apr_bucket_brigade *bb,
- ap_filter_t *output,
- apr_pool_t *pool)
-{
- struct brigade_write_baton *wb = apr_palloc(pool, sizeof(*wb));
- svn_stream_t *stream = svn_stream_create(wb, pool);
-
- wb->bb = bb;
- wb->output = output;
- svn_stream_set_write(stream, brigade_write_fn);
-
- return svn_base64_encode(stream, pool);
-}
-
-
/* Get the real filesystem PATH for BATON, and return the value
allocated from POOL. This function juggles the craziness of
updates, switches, and updates of switched things. */
@@ -1028,8 +989,9 @@
wb = apr_palloc(file->pool, sizeof(*wb));
wb->seen_first_window = FALSE;
wb->uc = file->uc;
- base64_stream = dav_svn_make_base64_output_stream(wb->uc->bb, wb->uc->output,
- file->pool);
+ base64_stream = dav_svn__make_base64_output_stream(wb->uc->bb,
+ wb->uc->output,
+ file->pool);
svn_txdelta_to_svndiff2(&(wb->handler), &(wb->handler_baton),
base64_stream, file->uc->svndiff_version,
Modified: trunk/subversion/mod_dav_svn/util.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/util.c?pathrev=20903&r1=20902&r2=20903
==============================================================================
--- trunk/subversion/mod_dav_svn/util.c (original)
+++ trunk/subversion/mod_dav_svn/util.c Sun Jul 30 04:05:57 2006
@@ -25,6 +25,7 @@
#include "svn_error.h"
#include "svn_fs.h"
#include "svn_dav.h"
+#include "svn_base64.h"
#include "dav_svn.h"
@@ -437,3 +438,42 @@
apr_psprintf(r->pool, safe_err->message),
r->pool);
}
+
+
+struct brigade_write_baton
+{
+ apr_bucket_brigade *bb;
+ ap_filter_t *output;
+};
+
+
+/* This implements 'svn_write_fn_t'. */
+static svn_error_t *
+brigade_write_fn(void *baton, const char *data, apr_size_t *len)
+{
+ struct brigade_write_baton *wb = baton;
+ apr_status_t apr_err;
+
+ apr_err = apr_brigade_write(wb->bb, ap_filter_flush, wb->output, data, *len);
+
+ if (apr_err != APR_SUCCESS)
+ return svn_error_wrap_apr(apr_err, "Error writing base64 data");
+
+ return SVN_NO_ERROR;
+}
+
+
+svn_stream_t *
+dav_svn__make_base64_output_stream(apr_bucket_brigade *bb,
+ ap_filter_t *output,
+ apr_pool_t *pool)
+{
+ struct brigade_write_baton *wb = apr_palloc(pool, sizeof(*wb));
+ svn_stream_t *stream = svn_stream_create(wb, pool);
+
+ wb->bb = bb;
+ wb->output = output;
+ svn_stream_set_write(stream, brigade_write_fn);
+
+ return svn_base64_encode(stream, pool);
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic