From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28808 invoked by alias); 12 Dec 2018 11:34:02 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 27604 invoked by uid 89); 12 Dec 2018 11:34:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Quote X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Dec 2018 11:34:00 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12CD630917A1 for ; Wed, 12 Dec 2018 11:33:59 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C90465ED22 for ; Wed, 12 Dec 2018 11:33:58 +0000 (UTC) Received: by oldenburg2.str.redhat.com (Postfix, from userid 1000) id 0B65983150F7; Wed, 12 Dec 2018 12:33:56 +0100 (CET) Date: Mon, 01 Jan 2018 00:00:00 -0000 To: libc-stable@sourceware.org Subject: [2.28 COMMITTED] support_quote_string: Do not use str parameter name User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20181212113357.0B65983150F7@oldenburg2.str.redhat.com> From: Florian Weimer X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 12 Dec 2018 11:33:59 +0000 (UTC) X-IsSubscribed: yes X-SW-Source: 2018-12/txt/msg00007.txt.bz2 This avoids a build failure if this identifier is used as a macro in a test. (cherry picked from commit 47d8d9a2172f827a8dde7695f415aa6f78a82d0e) 2018-11-28 Florian Weimer * support/support.h (support_quote_string): Do not use str parameter name. diff --git a/support/support.h b/support/support.h index 4d9f7528a6..4ea92e1c21 100644 --- a/support/support.h +++ b/support/support.h @@ -65,10 +65,10 @@ void support_write_file_string (const char *path, const char *contents); the result). */ char *support_quote_blob (const void *blob, size_t length); -/* Quote the contents of the at STR, in such a way that the result +/* Quote the contents of the string, in such a way that the result string can be included in a C literal (in single/double quotes, without putting the quotes into the result). */ -char *support_quote_string (const char *str); +char *support_quote_string (const char *); /* Error-checking wrapper functions which terminate the process on error. */