rpms/flex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #1360744

Browse Source 
Fix wrong type on num_to_read.
This commit is contained in:
Patsy Franklin 2016-07-27 13:59:22 -04:00
parent ffdaf36582
commit 3821e2741c
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flex-2.6.0-num_to_read.patch Normal file
View File

@ -0,0 +1,36 @@
diff -Nrup a/src/flex.skl b/src/flex.skl
--- a/src/flex.skl 2016-07-27 11:11:48.528378027 -0400
+++ b/src/flex.skl 2016-07-27 11:14:03.012351701 -0400
@@ -1718,7 +1718,7 @@ int yyFlexLexer::yy_get_next_buffer()
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
diff -Nrup a/src/scan.c b/src/scan.c
--- a/src/scan.c 2015-11-17 11:17:41.000000000 -0500
+++ b/src/scan.c 2016-07-27 11:14:18.126674417 -0400
@@ -4181,7 +4181,7 @@ static int yy_get_next_buffer (void)
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
diff -Nrup a/src/skel.c b/src/skel.c
--- a/src/skel.c 2015-11-17 11:17:39.000000000 -0500
+++ b/src/skel.c 2016-07-27 11:14:36.362857240 -0400
@@ -1929,7 +1929,7 @@ const char *skel[] = {
"",
" else",
" {",
- " yy_size_t num_to_read =",
+ " int num_to_read =",
" YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;",
"",
" while ( num_to_read <= 0 )",

7
flex.spec
View File

@ -3,7 +3,7 @@
Summary: A tool for creating scanners (text pattern recognizers)
Name: flex
Version: 2.6.0
Release: 1%{?dist}
Release: 2%{?dist}
# parse.c and parse.h are under GPLv3+ with exception which allows
# relicensing. Since flex is shipped under BDS-style license,
# let's assume that the relicensing was done.
@ -14,6 +14,7 @@ URL: http://flex.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: flex-2.6.0-yyless.patch
Patch1: flex-2.6.0-num_to_read.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: m4
@ -61,6 +62,7 @@ plain text and PDF formats.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS"
@ -133,6 +135,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_pkgdocdir}
%changelog
* Wed Jul 27 2016 Patsy Franklin <pfrankli@redhat.com> - 2.6.0-2
Fix wrong type on num_to_read. BZ #1360744
* Thu Mar 10 2016 Patsy Franklin <pfrankli@redhat.com> - 2.6.0-1
- Rebase to 2.6.0
- Pick up an additional patch requested in BZ #1281976