Author: ivan
Date: Tue Feb 3 12:54:37 2015
New Revision: 1656714
URL: http://svn.apache.org/r1656714
Log:
Rename library private type to match our codestyle.
* subversion/libsvn_subr/win32_xlate.c
* subversion/libsvn_subr/win32_xlate.h
(svn_subr__win32_xlate_t): Rename from win32_xlate_t.
(svn_subr__win32_xlate_open, svn_subr__win32_xlate_to_stringbuf): Update
signature.
* subversion/libsvn_subr/utf.c
(xlate_handle_t): Typedef as svn_subr__win32_xlate_t on Windows.
Modified:
subversion/trunk/subversion/libsvn_subr/utf.c
subversion/trunk/subversion/libsvn_subr/win32_xlate.c
subversion/trunk/subversion/libsvn_subr/win32_xlate.h
Modified: subversion/trunk/subversion/libsvn_subr/utf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf.c?rev=1656714&r1=1656713&r2=1656714&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf.c Tue Feb 3 12:54:37 2015
@@ -60,7 +60,7 @@ static svn_mutex__t *xlate_handle_mutex
static svn_boolean_t assume_native_charset_is_utf8 = FALSE;
#if defined(WIN32)
-typedef win32_xlate_t xlate_handle_t;
+typedef svn_subr__win32_xlate_t xlate_handle_t;
#else
typedef apr_xlate_t xlate_handle_t;
#endif
Modified: subversion/trunk/subversion/libsvn_subr/win32_xlate.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/win32_xlate.c?rev=1656714&r1=1656713&r2=1656714&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/win32_xlate.c (original)
+++ subversion/trunk/subversion/libsvn_subr/win32_xlate.c Tue Feb 3 12:54:37
2015
@@ -77,11 +77,11 @@ initialize_com(void *baton, apr_pool_t*
return SVN_NO_ERROR;
}
-typedef struct win32_xlate_t
+typedef struct svn_subr__win32_xlate_t
{
UINT from_page_id;
UINT to_page_id;
-} win32_xlate_t;
+} svn_subr__win32_xlate_t;
static apr_status_t
get_page_id_from_name(UINT *page_id_p, const char *page_name, apr_pool_t *pool)
@@ -166,12 +166,12 @@ get_page_id_from_name(UINT *page_id_p, c
}
apr_status_t
-svn_subr__win32_xlate_open(win32_xlate_t **xlate_p, const char *topage,
+svn_subr__win32_xlate_open(svn_subr__win32_xlate_t **xlate_p, const char
*topage,
const char *frompage, apr_pool_t *pool)
{
UINT from_page_id, to_page_id;
apr_status_t apr_err = APR_SUCCESS;
- win32_xlate_t *xlate;
+ svn_subr__win32_xlate_t *xlate;
apr_err = get_page_id_from_name(&to_page_id, topage, pool);
if (apr_err == APR_SUCCESS)
@@ -190,7 +190,7 @@ svn_subr__win32_xlate_open(win32_xlate_t
}
apr_status_t
-svn_subr__win32_xlate_to_stringbuf(win32_xlate_t *handle,
+svn_subr__win32_xlate_to_stringbuf(svn_subr__win32_xlate_t *handle,
const char *src_data,
apr_size_t src_length,
svn_stringbuf_t **dest,
Modified: subversion/trunk/subversion/libsvn_subr/win32_xlate.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/win32_xlate.h?rev=1656714&r1=1656713&r2=1656714&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/win32_xlate.h (original)
+++ subversion/trunk/subversion/libsvn_subr/win32_xlate.h Tue Feb 3 12:54:37
2015
@@ -27,25 +27,27 @@
#ifdef WIN32
/* Opaque translation buffer. */
-typedef struct win32_xlate_t win32_xlate_t;
+typedef struct svn_subr__win32_xlate_t svn_subr__win32_xlate_t;
/* Set *XLATE_P to a handle node for converting from FROMPAGE to TOPAGE.
Returns APR_EINVAL or APR_ENOTIMPL, if a conversion isn't supported.
If fail for any other reason, return the error.
Allocate *RET in POOL. */
-apr_status_t svn_subr__win32_xlate_open(win32_xlate_t **xlate_p,
- const char *topage,
- const char *frompage,
- apr_pool_t *pool);
+apr_status_t
+svn_subr__win32_xlate_open(svn_subr__win32_xlate_t **xlate_p,
+ const char *topage,
+ const char *frompage,
+ apr_pool_t *pool);
/* Convert SRC_LENGTH bytes of SRC_DATA in NODE->handle, store the result
in *DEST, which is allocated in POOL. */
-apr_status_t svn_subr__win32_xlate_to_stringbuf(win32_xlate_t *handle,
- const char *src_data,
- apr_size_t src_length,
- svn_stringbuf_t **dest,
- apr_pool_t *pool);
+apr_status_t
+svn_subr__win32_xlate_to_stringbuf(svn_subr__win32_xlate_t *handle,
+ const char *src_data,
+ apr_size_t src_length,
+ svn_stringbuf_t **dest,
+ apr_pool_t *pool);
#endif /* WIN32 */
