Author: ivan
Date: Thu Aug 15 14:31:11 2013
New Revision: 1514295
URL: http://svn.apache.org/r1514295
Log:
Add serf library version to svn --version output.
* subversion/libsvn_ra/ra_loader.c
(svn_ra_print_modules): Pass pool to get_description() vtable call.
* subversion/libsvn_ra/ra_loader.h
(svn_ra__vtable_t): Add pool parameter to get_description.
* subversion/libsvn_ra_serf/serf.c
(RA_SERF_DESCRIPTION_NEW): New.
(ra_serf_get_description): Add serf library version information to RA layer
description.
* subversion/libsvn_ra_local/ra_plugin.c
* subversion/libsvn_ra_svn/client.c
(svn_ra_local__get_description, ra_svn_get_description): Add Add pool
parameter.
Modified:
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_ra/ra_loader.h
subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_svn/client.c
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1514295&r1=1514294&r2=1514295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Thu Aug 15 14:31:11 2013
@@ -1436,7 +1436,7 @@ svn_ra_print_modules(svn_stringbuf_t *ou
built with SASL. */
line = apr_psprintf(iterpool, "* ra_%s : %s\n",
defn->ra_name,
- vtable->get_description());
+ vtable->get_description(iterpool));
svn_stringbuf_appendcstr(output, line);
for (schemes = vtable->get_schemes(iterpool); *schemes != NULL;
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.h?rev=1514295&r1=1514294&r2=1514295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.h Thu Aug 15 14:31:11 2013
@@ -45,7 +45,7 @@ typedef struct svn_ra__vtable_t {
/* Return a short description of the RA implementation, as a localized
* string. */
- const char *(*get_description)(void);
+ const char *(*get_description)(apr_pool_t *pool);
/* Return a list of actual URI schemes supported by this implementation.
* The returned array is NULL-terminated. */
Modified: subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c?rev=1514295&r1=1514294&r2=1514295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c Thu Aug 15 14:31:11
2013
@@ -502,7 +502,7 @@ apply_lock_tokens(svn_fs_t *fs,
N_("Module for accessing a repository on local disk.")
static const char *
-svn_ra_local__get_description(void)
+svn_ra_local__get_description(apr_pool_t *pool)
{
return _(RA_LOCAL_DESCRIPTION);
}
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1514295&r1=1514294&r2=1514295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Thu Aug 15 14:31:11 2013
@@ -61,11 +61,18 @@ ra_serf_version(void)
#define RA_SERF_DESCRIPTION \
N_("Module for accessing a repository via WebDAV protocol using serf.")
+#define RA_SERF_DESCRIPTION_VER \
+ N_("Module for accessing a repository via WebDAV protocol using serf " \
+ "%d.%d.%d.")
+
/* Implements svn_ra__vtable_t.get_description(). */
static const char *
-ra_serf_get_description(void)
+ra_serf_get_description(apr_pool_t *pool)
{
- return _(RA_SERF_DESCRIPTION);
+ int major, minor, patch;
+
+ serf_lib_version(&major, &minor, &patch);
+ return apr_psprintf(pool, _(RA_SERF_DESCRIPTION_VER), major, minor, patch);
}
/* Implements svn_ra__vtable_t.get_schemes(). */
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1514295&r1=1514294&r2=1514295&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Thu Aug 15 14:31:11 2013
@@ -701,7 +701,7 @@ static svn_error_t *open_session(svn_ra_
N_("Module for accessing a repository using the svn network protocol.")
#endif
-static const char *ra_svn_get_description(void)
+static const char *ra_svn_get_description(apr_pool_t *pool)
{
return _(RA_SVN_DESCRIPTION);
}
