!11 fix 64 to 32 bit clang conversion warning
From: @eaglegai Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
573c1fe1f7
53
backport-fix-64-to-32-bit-clang-conversion-warning.patch
Normal file
53
backport-fix-64-to-32-bit-clang-conversion-warning.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From ba2e7c2f25047a6848f2baa9bc4cb700ea9dda84 Mon Sep 17 00:00:00 2001
|
||||
From: Hannah Shi <hannahshisfb@gmail.com>
|
||||
Date: Fri, 3 Jun 2022 17:16:29 -0700
|
||||
Subject: [PATCH] fix 64 to 32 bit clang conversion warning
|
||||
|
||||
Change-Id: I62e86c0e19800e128c2d2fb5f952c9ee7a7b4258
|
||||
Reviewed-on: https://code-review.googlesource.com/c/re2/+/60210
|
||||
Reviewed-by: Perry Lorier <perryl@google.com>
|
||||
Reviewed-by: Paul Wankadia <junyer@google.com>
|
||||
---
|
||||
util/rune.cc | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/util/rune.cc b/util/rune.cc
|
||||
index 4f625ea3..a40e756c 100644
|
||||
--- a/util/rune.cc
|
||||
+++ b/util/rune.cc
|
||||
@@ -51,7 +51,7 @@ int
|
||||
chartorune(Rune *rune, const char *str)
|
||||
{
|
||||
int c, c1, c2, c3;
|
||||
- long l;
|
||||
+ Rune l;
|
||||
|
||||
/*
|
||||
* one character sequence
|
||||
@@ -127,7 +127,7 @@ int
|
||||
runetochar(char *str, const Rune *rune)
|
||||
{
|
||||
/* Runes are signed, so convert to unsigned for range check. */
|
||||
- unsigned long c;
|
||||
+ unsigned int c;
|
||||
|
||||
/*
|
||||
* one character sequence
|
||||
@@ -212,7 +212,7 @@ int
|
||||
utflen(const char *s)
|
||||
{
|
||||
int c;
|
||||
- long n;
|
||||
+ int n;
|
||||
Rune rune;
|
||||
|
||||
n = 0;
|
||||
@@ -232,7 +232,7 @@ utflen(const char *s)
|
||||
char*
|
||||
utfrune(const char *s, Rune c)
|
||||
{
|
||||
- long c1;
|
||||
+ int c1;
|
||||
Rune r;
|
||||
int n;
|
||||
|
||||
6
re2.spec
6
re2.spec
@ -1,10 +1,11 @@
|
||||
Name: re2
|
||||
Version: 20211101
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Provide backtracking RE engine
|
||||
License: BSD
|
||||
URL: http://github.com/google/re2/
|
||||
Source0: https://github.com/google/re2/archive/2021-11-01.tar.gz
|
||||
Patch0: backport-fix-64-to-32-bit-clang-conversion-warning.patch
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
%description
|
||||
@ -49,6 +50,9 @@ make %{?_smp_mflags} shared-test
|
||||
%exclude %{_libdir}/libre2.a
|
||||
|
||||
%changelog
|
||||
* Mon Oct 24 2022 gaihuiying <eaglegai@163.com> - 20211101-2
|
||||
- fix 64 to 32 bit clang conversion warning
|
||||
|
||||
* Sat Mar 19 2022 xihaochen <xihaochen@h-partners.com> - 20211101-1
|
||||
- upgrade to 20211101
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user