Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AF98B200B9B for ; Wed, 12 Oct 2016 12:52:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE6CD160AD4; Wed, 12 Oct 2016 10:52:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0038A160AD3 for ; Wed, 12 Oct 2016 12:52:47 +0200 (CEST) Received: (qmail 68004 invoked by uid 500); 12 Oct 2016 10:52:46 -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 67993 invoked by uid 99); 12 Oct 2016 10:52:46 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2016 10:52:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 6BCF61A0516 for ; Wed, 12 Oct 2016 10:52:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 1C-miF0M6T71 for ; Wed, 12 Oct 2016 10:52:44 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 3265F5FAF7 for ; Wed, 12 Oct 2016 10:52:44 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 4E254E0185 for ; Wed, 12 Oct 2016 10:52:43 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 2FFB43A039C for ; Wed, 12 Oct 2016 10:52:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1764437 - /subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c Date: Wed, 12 Oct 2016 10:52:42 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161012105243.2FFB43A039C@svn01-us-west.apache.org> archived-at: Wed, 12 Oct 2016 10:52:48 -0000 Author: rhuijben Date: Wed Oct 12 10:52:42 2016 New Revision: 1764437 URL: http://svn.apache.org/viewvc?rev=1764437&view=rev Log: Resolve two warnings in libsvn_fs_x on non-posix systems. * subversion/libsvn_fs_x/batch_fsync.c (internal_open_file): Reduce scope of one variable and conditionally define another one. Modified: subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c Modified: subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c?rev=1764437&r1=1764436&r2=1764437&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c Wed Oct 12 10:52:42 2016 @@ -332,8 +332,9 @@ internal_open_file(apr_file_t **file, svn_error_t *err; apr_pool_t *pool; to_sync_t *to_sync; - svn_node_kind_t kind; +#ifdef SVN_ON_POSIX svn_boolean_t is_new_file; +#endif /* If we already have a handle for PATH, return that. */ to_sync = svn_hash_gets(batch->files, path); @@ -356,6 +357,7 @@ internal_open_file(apr_file_t **file, is_new_file = FALSE; if (flags & APR_CREATE) { + svn_node_kind_t kind; /* We might actually be about to create a new file. * Check whether the file already exists. */ SVN_ERR(svn_io_check_path(path, &kind, scratch_pool));