Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DDEC4E122 for ; Sun, 25 Nov 2012 20:16:25 +0000 (UTC) Received: (qmail 51228 invoked by uid 500); 25 Nov 2012 20:16:25 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 51198 invoked by uid 500); 25 Nov 2012 20:16:25 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 51190 invoked by uid 99); 25 Nov 2012 20:16:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Nov 2012 20:16:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Nov 2012 20:16:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 94DEB23889BF; Sun, 25 Nov 2012 20:16:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1413402 - in /subversion/trunk/subversion: libsvn_ra_svn/cyrus_auth.c svnserve/cyrus_auth.c Date: Sun, 25 Nov 2012 20:16:04 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121125201604.94DEB23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Sun Nov 25 20:16:03 2012 New Revision: 1413402 URL: http://svn.apache.org/viewvc?rev=1413402&view=rev Log: Don't cast to void* for function pointers but use the proper target type instead. * subversion/libsvn_ra_svn/cyrus_auth.c (svn_ra_svn__do_cyrus_auth): use correct cast * subversion/svnserve/cyrus_auth.c (callbacks): same here 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=1413402&r1=1413401&r2=1413402&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c (original) +++ subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c Sun Nov 25 20:16:03 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 = (void*)get_username_cb; + callbacks[0].proc = (int (*)(void))get_username_cb; callbacks[0].context = &cred_baton; /* The password callback. */ callbacks[1].id = SASL_CB_PASS; - callbacks[1].proc = (void*)get_password_cb; + callbacks[1].proc = (int (*)(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=1413402&r1=1413401&r2=1413402&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/cyrus_auth.c (original) +++ subversion/trunk/subversion/svnserve/cyrus_auth.c Sun Nov 25 20:16:03 2012 @@ -98,7 +98,7 @@ static int canonicalize_username(sasl_co static sasl_callback_t callbacks[] = { - { SASL_CB_CANON_USER, (void*)canonicalize_username, NULL }, + { SASL_CB_CANON_USER, (int (*)(void))canonicalize_username, NULL }, { SASL_CB_LIST_END, NULL, NULL } };