Author: brane
Date: Wed May 8 19:08:14 2013
New Revision: 1480413
URL: http://svn.apache.org/r1480413
Log:
Change functions merged from the wc-collate-branch to our
customary output-parameters-first style.
* subversion/include/private/svn_utf_private.h
(svn_utf__normcmp, svn_utf__glob): Here.
* subversion/libsvn_subr/utf8proc.c
(decompose_normalized, svn_utf__normcmp, svn_utf__glob): And here.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/include/private/svn_utf_private.h
subversion/trunk/subversion/libsvn_subr/utf8proc.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
Merged /subversion/branches/wc-collate-path:r1402685-1407641,1407643-1480384
Modified: subversion/trunk/subversion/include/private/svn_utf_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_utf_private.h?rev=1480413&r1=1480412&r2=1480413&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_utf_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_utf_private.h Wed May 8
19:08:14 2013
@@ -95,10 +95,10 @@ svn_utf__cstring_from_utf8_fuzzy(const c
* Return compare value in *RESULT.
*/
svn_error_t *
-svn_utf__normcmp(const char *str1, apr_size_t len1,
+svn_utf__normcmp(int *result,
+ const char *str1, apr_size_t len1,
const char *str2, apr_size_t len2,
- svn_membuf_t *buf1, svn_membuf_t *buf2,
- int *result);
+ svn_membuf_t *buf1, svn_membuf_t *buf2);
/* Pattern matching similar to the the SQLite LIKE and GLOB
@@ -120,14 +120,14 @@ svn_utf__normcmp(const char *str1, apr_s
* Set *MATCH to the result of the comparison.
*/
svn_error_t *
-svn_utf__glob(const char *pattern, apr_size_t pattern_len,
+svn_utf__glob(svn_boolean_t *match,
+ const char *pattern, apr_size_t pattern_len,
const char *string, apr_size_t string_len,
const char *escape, apr_size_t escape_len,
svn_boolean_t sql_like,
svn_membuf_t *pattern_buf,
svn_membuf_t *string_buf,
- svn_membuf_t *temp_buf,
- svn_boolean_t *match);
+ svn_membuf_t *temp_buf);
/* Return the version of the wrapped utf8proc library. */
const char *
Modified: subversion/trunk/subversion/libsvn_subr/utf8proc.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf8proc.c?rev=1480413&r1=1480412&r2=1480413&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf8proc.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf8proc.c Wed May 8 19:08:14 2013
@@ -58,8 +58,9 @@ const char *svn_utf__utf8proc_version(vo
* invalid Unicode codepoints. Any error message comes from utf8proc.
*/
static svn_error_t *
-decompose_normalized(const char *string, apr_size_t length,
- svn_membuf_t *buffer, apr_size_t *result_length)
+decompose_normalized(apr_size_t *result_length,
+ const char *string, apr_size_t length,
+ svn_membuf_t *buffer)
{
const int nullterm = (length == SVN_UTF__UNKNOWN_LENGTH
? UTF8PROC_NULLTERM : 0);
@@ -112,10 +113,10 @@ ucs4cmp(const apr_int32_t *bufa, apr_siz
svn_error_t *
-svn_utf__normcmp(const char *str1, apr_size_t len1,
+svn_utf__normcmp(int *result,
+ const char *str1, apr_size_t len1,
const char *str2, apr_size_t len2,
- svn_membuf_t *buf1, svn_membuf_t *buf2,
- int *result)
+ svn_membuf_t *buf1, svn_membuf_t *buf2)
{
apr_size_t buflen1;
apr_size_t buflen2;
@@ -131,8 +132,8 @@ svn_utf__normcmp(const char *str1, apr_s
return SVN_NO_ERROR;
}
- SVN_ERR(decompose_normalized(str1, len1, buf1, &buflen1));
- SVN_ERR(decompose_normalized(str2, len2, buf2, &buflen2));
+ SVN_ERR(decompose_normalized(&buflen1, str1, len1, buf1));
+ SVN_ERR(decompose_normalized(&buflen2, str2, len2, buf2));
*result = ucs4cmp(buf1->data, buflen1, buf2->data, buflen2);
return SVN_NO_ERROR;
}
@@ -182,14 +183,14 @@ encode_ucs4_string(svn_membuf_t *buffer,
svn_error_t *
-svn_utf__glob(const char *pattern, apr_size_t pattern_len,
+svn_utf__glob(svn_boolean_t *match,
+ const char *pattern, apr_size_t pattern_len,
const char *string, apr_size_t string_len,
const char *escape, apr_size_t escape_len,
svn_boolean_t sql_like,
svn_membuf_t *pattern_buf,
svn_membuf_t *string_buf,
- svn_membuf_t *temp_buf,
- svn_boolean_t *match)
+ svn_membuf_t *temp_buf)
{
apr_size_t patternbuf_len;
apr_size_t tempbuf_len;
@@ -202,7 +203,7 @@ svn_utf__glob(const char *pattern, apr_s
/* Convert the patern to NFD UTF-8. We can't use the UCS-4 result
because apr_fnmatch can't handle it.*/
- SVN_ERR(decompose_normalized(pattern, pattern_len, temp_buf, &tempbuf_len));
+ SVN_ERR(decompose_normalized(&tempbuf_len, pattern, pattern_len, temp_buf));
if (!sql_like)
SVN_ERR(encode_ucs4_string(pattern_buf, temp_buf->data, tempbuf_len,
&patternbuf_len));
@@ -273,7 +274,7 @@ svn_utf__glob(const char *pattern, apr_s
}
/* Now normalize the string */
- SVN_ERR(decompose_normalized(string, string_len, temp_buf, &tempbuf_len));
+ SVN_ERR(decompose_normalized(&tempbuf_len, string, string_len, temp_buf));
SVN_ERR(encode_ucs4_string(string_buf, temp_buf->data,
tempbuf_len, &tempbuf_len));
