[Forensics-changes] [yara] 373/407: Declare loop variables in the "for" statement
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:28:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.3.0
in repository yara.
commit 5c8007c76f084432a990e6237593bd4ab1f31cf0
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Tue Feb 3 12:39:45 2015 +0100
Declare loop variables in the "for" statement
---
libyara/re_lexer.c | 44 +++++++++++++++++++-------------------------
libyara/re_lexer.l | 14 ++++----------
2 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/libyara/re_lexer.c b/libyara/re_lexer.c
index 3d113b4..b9a416e 100644
--- a/libyara/re_lexer.c
+++ b/libyara/re_lexer.c
@@ -1057,14 +1057,12 @@ YY_RULE_SETUP
// End of character class.
- int i;
-
yylval->class_vector = (uint8_t*) yr_malloc(32);
memcpy(yylval->class_vector, LEX_ENV->class_vector, 32);
if (LEX_ENV->negated_class)
{
- for(i = 0; i < 32; i++)
+ for(int i = 0; i < 32; i++)
yylval->class_vector[i] = ~yylval->class_vector[i];
}
@@ -1075,15 +1073,13 @@ YY_RULE_SETUP
case 19:
/* rule 19 can match eol */
YY_RULE_SETUP
-#line 243 "re_lexer.l"
+#line 241 "re_lexer.l"
{
// A range inside a character class.
// [abc0-9]
// ^- matching here
- int c;
-
uint8_t start = yytext[0];
uint8_t end = yytext[2];
@@ -1106,7 +1102,7 @@ YY_RULE_SETUP
yyterminate();
}
- for (c = start; c <= end; c++)
+ for (int c = start; c <= end; c++)
{
LEX_ENV->class_vector[c / 8] |= 1 << c % 8;
}
@@ -1114,37 +1110,35 @@ YY_RULE_SETUP
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 280 "re_lexer.l"
+#line 276 "re_lexer.l"
{
- int i;
char word_chars[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x07,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- for (i = 0; i < 32; i++)
+ for (int i = 0; i < 32; i++)
LEX_ENV->class_vector[i] |= word_chars[i];
}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 293 "re_lexer.l"
+#line 288 "re_lexer.l"
{
- int i;
char word_chars[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x07,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- for (i = 0; i < 32; i++)
+ for (int i = 0; i < 32; i++)
LEX_ENV->class_vector[i] |= ~word_chars[i];
}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 306 "re_lexer.l"
+#line 300 "re_lexer.l"
{
LEX_ENV->class_vector[' ' / 8] |= 1 << ' ' % 8;
@@ -1153,7 +1147,7 @@ YY_RULE_SETUP
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 313 "re_lexer.l"
+#line 307 "re_lexer.l"
{
for (int i = 0; i < 32; i++)
@@ -1169,7 +1163,7 @@ YY_RULE_SETUP
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 327 "re_lexer.l"
+#line 321 "re_lexer.l"
{
for (char c = '0'; c <= '9'; c++)
@@ -1178,7 +1172,7 @@ YY_RULE_SETUP
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 334 "re_lexer.l"
+#line 328 "re_lexer.l"
{
for (int i = 0; i < 32; i++)
@@ -1198,7 +1192,7 @@ YY_RULE_SETUP
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 352 "re_lexer.l"
+#line 346 "re_lexer.l"
{
uint8_t c = read_escaped_char(yyscanner);
@@ -1207,7 +1201,7 @@ YY_RULE_SETUP
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 359 "re_lexer.l"
+#line 353 "re_lexer.l"
{
if (yytext[0] >= 32 && yytext[0] < 127)
@@ -1225,7 +1219,7 @@ YY_RULE_SETUP
}
YY_BREAK
case YY_STATE_EOF(char_class):
-#line 376 "re_lexer.l"
+#line 370 "re_lexer.l"
{
// End of regexp reached while scanning a character class.
@@ -1236,7 +1230,7 @@ case YY_STATE_EOF(char_class):
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 385 "re_lexer.l"
+#line 379 "re_lexer.l"
{
if (yytext[0] >= 32 && yytext[0] < 127)
@@ -1251,7 +1245,7 @@ YY_RULE_SETUP
}
YY_BREAK
case YY_STATE_EOF(INITIAL):
-#line 399 "re_lexer.l"
+#line 393 "re_lexer.l"
{
yyterminate();
@@ -1259,10 +1253,10 @@ case YY_STATE_EOF(INITIAL):
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 404 "re_lexer.l"
+#line 398 "re_lexer.l"
ECHO;
YY_BREAK
-#line 1266 "re_lexer.c"
+#line 1260 "re_lexer.c"
case YY_END_OF_BUFFER:
{
@@ -2392,7 +2386,7 @@ void re_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 404 "re_lexer.l"
+#line 398 "re_lexer.l"
diff --git a/libyara/re_lexer.l b/libyara/re_lexer.l
index 89cf19e..ff61f84 100644
--- a/libyara/re_lexer.l
+++ b/libyara/re_lexer.l
@@ -223,14 +223,12 @@ hex_digit [0-9a-fA-F]
// End of character class.
- int i;
-
yylval->class_vector = (uint8_t*) yr_malloc(32);
memcpy(yylval->class_vector, LEX_ENV->class_vector, 32);
if (LEX_ENV->negated_class)
{
- for(i = 0; i < 32; i++)
+ for(int i = 0; i < 32; i++)
yylval->class_vector[i] = ~yylval->class_vector[i];
}
@@ -246,8 +244,6 @@ hex_digit [0-9a-fA-F]
// [abc0-9]
// ^- matching here
- int c;
-
uint8_t start = yytext[0];
uint8_t end = yytext[2];
@@ -270,7 +266,7 @@ hex_digit [0-9a-fA-F]
yyterminate();
}
- for (c = start; c <= end; c++)
+ for (int c = start; c <= end; c++)
{
LEX_ENV->class_vector[c / 8] |= 1 << c % 8;
}
@@ -279,26 +275,24 @@ hex_digit [0-9a-fA-F]
<char_class>\\w {
- int i;
char word_chars[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x07,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- for (i = 0; i < 32; i++)
+ for (int i = 0; i < 32; i++)
LEX_ENV->class_vector[i] |= word_chars[i];
}
<char_class>\\W {
- int i;
char word_chars[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,
0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x07,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- for (i = 0; i < 32; i++)
+ for (int i = 0; i < 32; i++)
LEX_ENV->class_vector[i] |= ~word_chars[i];
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list