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 43A6197B7 for ; Mon, 4 Jun 2012 09:31:44 +0000 (UTC) Received: (qmail 72443 invoked by uid 500); 4 Jun 2012 09:31:44 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 72365 invoked by uid 500); 4 Jun 2012 09:31:43 -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 72335 invoked by uid 99); 4 Jun 2012 09:31:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2012 09:31:42 +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; Mon, 04 Jun 2012 09:31:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5453E23888CD; Mon, 4 Jun 2012 09:31:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1345883 - /subversion/trunk/subversion/libsvn_subr/string.c Date: Mon, 04 Jun 2012 09:31:21 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120604093121.5453E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Mon Jun 4 09:31:20 2012 New Revision: 1345883 URL: http://svn.apache.org/viewvc?rev=1345883&view=rev Log: Simplify COPY_TWO_BYTES macro and fix -Wstrict-aliasing warning. * subversion/libsvn_subr/string.c (COPY_TWO_BYTES): implement as memcpy Suggested by: philip Modified: subversion/trunk/subversion/libsvn_subr/string.c Modified: subversion/trunk/subversion/libsvn_subr/string.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/string.c?rev=1345883&r1=1345882&r2=1345883&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/string.c (original) +++ subversion/trunk/subversion/libsvn_subr/string.c Mon Jun 4 09:31:20 2012 @@ -937,16 +937,8 @@ static const char decimal_table[100][4] , "90", "91", "92", "93", "94", "95", "96", "97", "98", "99"}; /* Copy the two bytes at SOURCE[0] and SOURCE[1] to DEST[0] and DEST[1] */ -#if SVN_UNALIGNED_ACCESS_IS_OK -# define COPY_TWO_BYTES(dest,source)\ - *(apr_uint16_t*)(dest) = *(apr_uint16_t*)(source) -#else -# define COPY_TWO_BYTES(dest,source) \ - do { \ - (dest)[0] = (source)[0]; \ - (dest)[1] = (source)[1]; \ - } while (0) -#endif +#define COPY_TWO_BYTES(dest,source)\ + memcpy(dest, source, 2) apr_size_t svn__ui64toa(char * dest, apr_uint64_t number)