From patchwork Fri Mar 21 18:37:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 216 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id 2D2403600C2 for ; Fri, 21 Mar 2014 11:37:26 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id C20CA12A594E; Fri, 21 Mar 2014 11:37:25 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 6FCED1B1B22D for ; Fri, 21 Mar 2014 11:37:25 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:content-type:content-transfer-encoding; q=dns; s= default; b=YDy6U2dOdtMrqjEGPtz2iSw9oo8d+EveBxd0DvQVlBKwNVLq/UpZi +ZYiYXfszmckM1GdHtN4WlnUzrNbqm99xuY0Y19rQRbe8h+H8XI0GnsmEyenxnQm yZdqM9IA+r0hfs4003Z7EpIRYlFRDplJdfptv5G+HU8+LD1dDFcdM0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:content-type:content-transfer-encoding; s=default; bh=j Jnf3tfKNKJmj+xsarpnhudr+Ys=; b=wXqOwRH4leqwqttqroogp1nou9DNJ5bAQ VBBp9hhR8JTOlS6loFKdGtETdsUA38qLJ1x3seazFgxuMqJr0j8S6YcJsB4ki0Cc ELIADpAEWyAnTHLAIR/3CzCteZ6S5b6IVHTQtrrzWz9njmzy3gmKtwymsAL30GW4 GoCthyZfPs= Received: (qmail 6497 invoked by alias); 21 Mar 2014 18:37:23 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 6488 invoked by uid 89); 21 Mar 2014 18:37:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e24smtp01.br.ibm.com Message-ID: <532C86D8.3080203@linux.vnet.ibm.com> Date: Fri, 21 Mar 2014 15:37:12 -0300 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: "GNU C. Library" CC: "Joseph S. Myers" Subject: [PATCH] Sync intl/loadmsgcat.c with gettext X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14032118-1524-0000-0000-00000945BF58 X-DH-Original-To: glibc@patchwork.siddhesh.in Change merged from gettext. --- * intl/loadmsgcat.c (get_sysdep_segment_value): Use ISO C prototype. (_nl_load_domain): Likewise. (_nl_unload_domain): Likewise. --- diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index 3b9ceec..12ae1dd 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -487,8 +487,7 @@ int _nl_msg_cat_cntr; /* Expand a system dependent string segment. Return NULL if unsupported. */ static const char * -get_sysdep_segment_value (name) - const char *name; +get_sysdep_segment_value (const char *name) { /* Test for an ISO C 99 section 7.8.1 format string directive. Syntax: @@ -757,9 +756,8 @@ get_sysdep_segment_value (name) message catalog do nothing. */ void internal_function -_nl_load_domain (domain_file, domainbinding) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; +_nl_load_domain (struct loaded_l10nfile *domain_file, + struct binding *domainbinding) { __libc_lock_define_initialized_recursive (static, lock); int fd = -1; @@ -822,7 +820,7 @@ _nl_load_domain (domain_file, domainbinding) || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) || __builtin_expect (size < sizeof (struct mo_file_header), 0)) /* Something went wrong. */ - goto out;; + goto out; #ifdef HAVE_MMAP /* Now we are ready to load the file. If mmap() is available we try @@ -1278,8 +1276,7 @@ _nl_load_domain (domain_file, domainbinding) #ifdef _LIBC void internal_function __libc_freeres_fn_section -_nl_unload_domain (domain) - struct loaded_domain *domain; +_nl_unload_domain (struct loaded_domain *domain) { size_t i;