From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 5/8] Remove unused syntax for separate size and hash lines
Date: Sun, 22 Jan 2017 14:17:00 -0000 [thread overview]
Message-ID: <20170122141623.226172-6-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20170122141623.226172-1-jon.turney@dronecode.org.uk>
Size:, MD5sum:, SHA512: are never used as the size and hash are always given
in install: or source: lines
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
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
next prev parent reply other threads:[~2017-01-22 14:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-22 14:16 [PATCH setup 0/8] Remove cruft from setup Jon Turney
2017-01-22 14:16 ` [PATCH setup 1/8] Make package size and checksum mandatory in setup.ini Jon Turney
2017-01-22 14:17 ` [PATCH setup 7/8] Remove unused cvsid Jon Turney
2017-01-22 14:17 ` [PATCH setup 6/8] Remove redundant parser rule Jon Turney
2017-01-22 14:17 ` [PATCH setup 2/8] Remove unused lexer tokens Jon Turney
2017-01-22 14:17 ` [PATCH setup 3/8] Remove parser rules which do nothing Jon Turney
2017-01-22 14:17 ` [PATCH setup 4/8] Remove parser rules which store data which is never used Jon Turney
2017-01-22 14:17 ` Jon Turney [this message]
2017-01-22 14:18 ` [PATCH setup 8/8] Remove an obsolete prototype Jon Turney
2017-01-23 10:37 ` [PATCH setup 0/8] Remove cruft from setup Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170122141623.226172-6-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).