svn commit: r1404912 - in /subversion/trunk/subversion: libsvn_ra_svn/cyrus_auth.c svnserve/cyrus_auth.c

[stefan2]

Author: stefan2
Date: Fri Nov  2 10:35:05 2012
New Revision: 1404912

URL: http://svn.apache.org/viewvc?rev=1404912&view=rev
Log:
Fix "incompatible pointer type" warnings when assigning SASL callbacks.
The problem is that the function signature is not fixed and the SASL
structure defines it as having no args at all.

* subversion/libsvn_ra_svn/cyrus_auth.c
  (svn_ra_svn__do_cyrus_auth): cast function pointers to void* before
   assigning them
* subversion/svnserve/cyrus_auth.c
  (callbacks): ditto

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/trunk/subversion/svnserve/cyrus_auth.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c?rev=1404912&r1=1404911&r2=1404912&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c Fri Nov  2 10:35:05 
2012
@@ -871,12 +871,12 @@ svn_ra_svn__do_cyrus_auth(svn_ra_svn__se
 
   /* The username callback. */
   callbacks[0].id = SASL_CB_AUTHNAME;
-  callbacks[0].proc = get_username_cb;
+  callbacks[0].proc = (void*)get_username_cb;
   callbacks[0].context = &cred_baton;
 
   /* The password callback. */
   callbacks[1].id = SASL_CB_PASS;
-  callbacks[1].proc = get_password_cb;
+  callbacks[1].proc = (void*)get_password_cb;
   callbacks[1].context = &cred_baton;
 
   /* Mark the end of the array. */

Modified: subversion/trunk/subversion/svnserve/cyrus_auth.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/cyrus_auth.c?rev=1404912&r1=1404911&r2=1404912&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/trunk/subversion/svnserve/cyrus_auth.c Fri Nov  2 10:35:05 2012
@@ -98,7 +98,7 @@ static int canonicalize_username(sasl_co
 
 static sasl_callback_t callbacks[] =
 {
-  { SASL_CB_CANON_USER, canonicalize_username, NULL },
+  { SASL_CB_CANON_USER, (void*)canonicalize_username, NULL },
   { SASL_CB_LIST_END, NULL, NULL }
 };