From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 2/6] compat/regex/regex_internal.c: reduce scope of variables
Date: Wed, 16 Apr 2014 02:33:27 -0700 [thread overview]
Message-ID: <1397640811-17719-2-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1397640811-17719-1-git-send-email-gitter.spiros@gmail.com>
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
compat/regex/regex_internal.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
index d4121f2..a7a71ec 100644
--- a/compat/regex/regex_internal.c
+++ b/compat/regex/regex_internal.c
@@ -707,7 +707,6 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1)
{
- int wcs_idx;
wint_t wc = WEOF;
if (pstr->is_utf8)
@@ -738,11 +737,11 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
mbstate_t cur_state;
wchar_t wc2;
int mlen = raw + pstr->len - p;
- unsigned char buf[6];
size_t mbclen;
if (BE (pstr->trans != NULL, 0))
{
+ unsigned char buf[6];
int i = mlen < 6 ? mlen : 6;
while (--i >= 0)
buf[i] = pstr->trans[p[i]];
@@ -778,6 +777,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
? CONTEXT_NEWLINE : 0));
if (BE (pstr->valid_len, 0))
{
+ int wcs_idx;
for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
pstr->wcs[wcs_idx] = WEOF;
if (pstr->mbs_allocated)
@@ -925,7 +925,6 @@ static unsigned int
internal_function
re_string_context_at (const re_string_t *input, int idx, int eflags)
{
- int c;
if (BE (idx < 0, 0))
/* In this case, we use the value stored in input->tip_context,
since we can't know the character in input->mbs[-1] here. */
@@ -957,6 +956,7 @@ re_string_context_at (const re_string_t *input, int idx, int eflags)
else
#endif
{
+ int c;
c = re_string_byte_at (input, idx);
if (bitset_contain (input->word_char, c))
return CONTEXT_WORD;
--
1.7.10.4
next prev parent reply other threads:[~2014-04-16 9:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-16 9:33 [PATCH 1/6] compat/regex/regcomp.c: reduce scope of variables Elia Pinto
2014-04-16 9:33 ` Elia Pinto [this message]
2014-04-16 9:33 ` [PATCH 3/6] compat/regex/regexec.c: " Elia Pinto
2014-04-16 9:33 ` [PATCH 4/6] contrib/credential/osxkeychain/git-credential-osxkeychain.c: " Elia Pinto
2014-04-16 9:55 ` Erik Faye-Lund
2014-04-16 9:33 ` [PATCH 5/6] contrib/credential/wincred/git-credential-wincred.c: " Elia Pinto
2014-04-16 9:54 ` Erik Faye-Lund
2014-04-16 9:33 ` [PATCH 6/6] xdiff/xprepare.c: " Elia Pinto
2014-04-16 9:55 ` Erik Faye-Lund
2014-04-16 16:49 ` [PATCH 1/6] compat/regex/regcomp.c: " Jonathan Nieder
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=1397640811-17719-2-git-send-email-gitter.spiros@gmail.com \
--to=gitter.spiros@gmail.com \
--cc=git@vger.kernel.org \
/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 NNTP newsgroup(s).