From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 130346 invoked by alias); 22 Jan 2017 14:17:07 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 130224 invoked by uid 89); 22 Jan 2017 14:17:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.9 required=5.0 tests=AWL,BAYES_20,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 spammy=MESSAGE, 1169, 969, 966 X-HELO: rgout03.bt.lon5.cpcloud.co.uk Received: from rgout0307.bt.lon5.cpcloud.co.uk (HELO rgout03.bt.lon5.cpcloud.co.uk) (65.20.0.213) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Jan 2017 14:16:59 +0000 X-OWM-Source-IP: 86.166.190.63 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=8/50,refid=2.7.2:2016.12.21.193617:17:8.707,ip=,rules=NO_URI_FOUND, NO_CTA_URI_FOUND, NO_MESSAGE_ID, TO_MALFORMED, NO_URI_HTTPS Received: from localhost.localdomain (86.166.190.63) by rgout03.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58482CCA0400B659; Sun, 22 Jan 2017 14:16:59 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 5/8] Remove unused syntax for separate size and hash lines Date: Sun, 22 Jan 2017 14:17:00 -0000 Message-Id: <20170122141623.226172-6-jon.turney@dronecode.org.uk> In-Reply-To: <20170122141623.226172-1-jon.turney@dronecode.org.uk> References: <20170122141623.226172-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-01/txt/msg00041.txt.bz2 Size:, MD5sum:, SHA512: are never used as the size and hash are always given in install: or source: lines Signed-off-by: Jon Turney --- inilex.ll | 3 --- iniparse.yy | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/inilex.ll b/inilex.ll index e9100e2..a7c31fb 100644 --- a/inilex.ll +++ b/inilex.ll @@ -116,9 +116,6 @@ B64 [a-zA-Z0-9_-] "sdesc:" return SDESC; "ldesc:" return LDESC; "message:" return MESSAGE; -"Size:" return FILESIZE; -"MD5sum:" return MD5LINE; -"SHA512:" return SHA512LINE; "Source:" return SOURCEPACKAGE; "Build-Depends:" return BUILDDEPENDS; "Build-Depends-Indep:" return BUILDDEPENDS; /* technicallyincorrect :[ */ diff --git a/iniparse.yy b/iniparse.yy index a544bce..bfc234a 100644 --- a/iniparse.yy +++ b/iniparse.yy @@ -41,8 +41,8 @@ void add_correct_version(); %token SETUP_TIMESTAMP SETUP_VERSION PACKAGEVERSION INSTALL SOURCE SDESC LDESC %token CATEGORY DEPENDS REQUIRES %token T_PREV T_CURR T_TEST T_OTHER -%token MD5 MD5LINE SHA512 SHA512LINE -%token FILESIZE SOURCEPACKAGE +%token MD5 SHA512 +%token SOURCEPACKAGE %token PACKAGENAME %token COMMA OR NL AT %token OPENBRACE CLOSEBRACE EQUAL GT LT GTEQUAL LTEQUAL @@ -96,9 +96,6 @@ singleitem /* non-empty */ | T_CURR NL { iniBuilder->buildPackageTrust (TRUST_CURR); } | T_TEST NL { iniBuilder->buildPackageTrust (TRUST_TEST); } | T_OTHER NL { iniBuilder->buildPackageTrust (TRUST_OTHER); } - | FILESIZE STRING NL { iniBuilder->buildInstallSize($2); } - | MD5LINE MD5 NL { iniBuilder->buildInstallMD5 ((unsigned char *)$2); } - | SHA512LINE SHA512 NL { iniBuilder->buildInstallSHA512 ((unsigned char *)$2); } | SOURCEPACKAGE source NL | CATEGORY categories NL | INSTALL STRING STRING { iniBuilder->buildPackageInstall ($2); iniBuilder->buildInstallSize($3);} installchksum NL -- 2.8.3