From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu, 19 Jan 2017 21:33:56 +0000 (+0000)
Subject: Remove unused syntax for separate size and hash lines
X-Git-Tag: release_2.878~18
X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=a4900b87444f2458449b8a6dfc1c6b87544aa47c;p=cygwin-apps%2Fsetup.git

Remove unused syntax for separate size and hash lines

Size:, MD5sum:, SHA512: are never used as the size and hash are always given
in install: or source: lines
---

diff --git a/inilex.ll b/inilex.ll
index e9100e26..a7c31fbb 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 a544bcef..bfc234ab 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