Author: breser
Date: Mon Aug 18 10:43:22 2014
New Revision: 1618577
URL: http://svn.apache.org/r1618577
Log:
On svn-auth-x509, follow-up to r1618575, minor tweaks.
* subversion/libsvn_subr/x509parse.c
(equal): Switch to void type to avoid needing casts.
(oids_equal): Remove casts.
(starts_with): Fix indentation in declaration.
Suggested by: brane
Modified:
subversion/branches/svn-auth-x509/subversion/libsvn_subr/x509parse.c
Modified: subversion/branches/svn-auth-x509/subversion/libsvn_subr/x509parse.c
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/libsvn_subr/x509parse.c?rev=1618577&r1=1618576&r2=1618577&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/libsvn_subr/x509parse.c
(original)
+++ subversion/branches/svn-auth-x509/subversion/libsvn_subr/x509parse.c Mon
Aug 18 10:43:22 2014
@@ -140,8 +140,8 @@ asn1_get_int(const unsigned char **p, co
}
static svn_boolean_t
-equal(const char *left, apr_size_t left_len,
- const char *right, apr_size_t right_len)
+equal(const void *left, apr_size_t left_len,
+ const void *right, apr_size_t right_len)
{
if (left_len != right_len)
return FALSE;
@@ -152,14 +152,14 @@ equal(const char *left, apr_size_t left_
static svn_boolean_t
oids_equal(x509_buf *left, x509_buf *right)
{
- return equal((const char *)left->p, left->len,
- (const char *)right->p, right->len);
+ return equal(left->p, left->len,
+ right->p, right->len);
}
static svn_boolean_t
starts_with(const x509_buf *buf,
- const char *starts_with,
- apr_size_t sw_len)
+ const char *starts_with,
+ apr_size_t sw_len)
{
if (buf->len < sw_len)
return FALSE;
@@ -609,7 +609,7 @@ x509_get_ext(apr_array_header_t *dnsname
NULL);
/* skip all extensions except SubjectAltName */
- if (!equal((const char *)*p, len,
+ if (!equal(*p, len,
OID_SUBJECT_ALT_NAME, sizeof(OID_SUBJECT_ALT_NAME) - 1))
{
*p += ext_len - (*p - ext_start);