[Forensics-changes] [yara] 124/135: Homogenize newlines at the end of files

Hilko Bengen bengen at moszumanska.debian.org
Sat Jul 1 10:27:39 UTC 2017


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.1.0
in repository yara.

commit 174cda2257f71a4df0fb6c405b0159141f2cce5f
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Mon Aug 25 00:12:10 2014 +0200

    Homogenize newlines at the end of files
---
 libyara/arena.c                    |  5 -----
 libyara/atoms.c                    |  2 +-
 libyara/compiler.c                 |  2 +-
 libyara/exefiles.c                 |  3 ---
 libyara/filemap.c                  |  1 -
 libyara/grammar.c                  | 14 --------------
 libyara/grammar.y                  | 14 --------------
 libyara/hash.c                     |  2 --
 libyara/hex_grammar.c              | 14 --------------
 libyara/hex_grammar.y              | 14 --------------
 libyara/hex_lexer.c                | 21 +++++++++------------
 libyara/hex_lexer.l                |  4 ----
 libyara/include/yara.h             |  1 -
 libyara/include/yara/ahocorasick.h |  2 --
 libyara/include/yara/arena.h       |  2 --
 libyara/include/yara/atoms.h       |  2 +-
 libyara/include/yara/compiler.h    |  2 +-
 libyara/include/yara/elf.h         |  1 -
 libyara/include/yara/error.h       |  2 +-
 libyara/include/yara/exec.h        |  1 -
 libyara/include/yara/exefiles.h    |  1 -
 libyara/include/yara/filemap.h     |  1 -
 libyara/include/yara/globals.h     |  2 +-
 libyara/include/yara/lexer.h       |  3 ---
 libyara/include/yara/libyara.h     |  2 +-
 libyara/include/yara/mem.h         |  2 --
 libyara/include/yara/object.h      |  2 +-
 libyara/include/yara/parser.h      |  5 +----
 libyara/include/yara/pe.h          |  1 -
 libyara/include/yara/re_lexer.h    |  1 -
 libyara/include/yara/rules.h       |  2 +-
 libyara/include/yara/scan.h        |  2 +-
 libyara/include/yara/sizedstr.h    |  1 -
 libyara/include/yara/types.h       |  2 +-
 libyara/include/yara/utils.h       |  2 +-
 libyara/lexer.c                    | 18 +++++++-----------
 libyara/lexer.l                    |  5 -----
 libyara/mem.c                      |  2 +-
 libyara/modules.c                  |  7 -------
 libyara/object.c                   |  7 -------
 libyara/parser.c                   |  4 ----
 libyara/proc.c                     |  1 -
 libyara/re_grammar.c               | 16 ----------------
 libyara/re_grammar.y               | 16 ----------------
 libyara/re_lexer.c                 | 23 +++++++++--------------
 libyara/re_lexer.l                 |  6 ------
 libyara/scan.c                     |  2 +-
 libyara/utils.c                    |  2 +-
 48 files changed, 41 insertions(+), 206 deletions(-)

diff --git a/libyara/arena.c b/libyara/arena.c
index 0af5bf3..85df78f 100644
--- a/libyara/arena.c
+++ b/libyara/arena.c
@@ -1083,8 +1083,3 @@ int yr_arena_load(
 
   return ERROR_SUCCESS;
 }
-
-
-
-
-
diff --git a/libyara/atoms.c b/libyara/atoms.c
index 7be169f..ba9736b 100644
--- a/libyara/atoms.c
+++ b/libyara/atoms.c
@@ -1153,4 +1153,4 @@ void yr_atoms_tree_node_print(
     printf(")");
     break;
   }
-}
\ No newline at end of file
+}
diff --git a/libyara/compiler.c b/libyara/compiler.c
index b096390..77c752e 100644
--- a/libyara/compiler.c
+++ b/libyara/compiler.c
@@ -795,4 +795,4 @@ char* yr_compiler_get_error_message(
   }
 
   return buffer;
-}
\ No newline at end of file
+}
diff --git a/libyara/exefiles.c b/libyara/exefiles.c
index 7f4e9ba..74841cf 100644
--- a/libyara/exefiles.c
+++ b/libyara/exefiles.c
@@ -335,6 +335,3 @@ int yr_file_is_elf(
 
   return (type == ELF_CLASS_32 || type == ELF_CLASS_64);
 }
-
-
-
diff --git a/libyara/filemap.c b/libyara/filemap.c
index a532460..e371968 100755
--- a/libyara/filemap.c
+++ b/libyara/filemap.c
@@ -179,4 +179,3 @@ void yr_filemap_unmap(
 }
 
 #endif
-
diff --git a/libyara/grammar.c b/libyara/grammar.c
index 292c14d..4e8f023 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -3737,17 +3737,3 @@ yyreturn:
 #line 1721 "grammar.y"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libyara/grammar.y b/libyara/grammar.y
index 7674453..e54cb20 100644
--- a/libyara/grammar.y
+++ b/libyara/grammar.y
@@ -1719,17 +1719,3 @@ primary_expression
     ;
 
 %%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libyara/hash.c b/libyara/hash.c
index 1ef21c1..d8b0a36 100644
--- a/libyara/hash.c
+++ b/libyara/hash.c
@@ -227,5 +227,3 @@ int yr_hash_table_add(
 
   return ERROR_SUCCESS;
 }
-
-
diff --git a/libyara/hex_grammar.c b/libyara/hex_grammar.c
index 79d61fb..be0a3d5 100644
--- a/libyara/hex_grammar.c
+++ b/libyara/hex_grammar.c
@@ -1859,17 +1859,3 @@ yyreturn:
 #line 294 "hex_grammar.y"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libyara/hex_grammar.y b/libyara/hex_grammar.y
index cf49b9a..2ae615e 100644
--- a/libyara/hex_grammar.y
+++ b/libyara/hex_grammar.y
@@ -292,17 +292,3 @@ byte  : _BYTE_
       ;
 
 %%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libyara/hex_lexer.c b/libyara/hex_lexer.c
index 4954551..b41a313 100644
--- a/libyara/hex_lexer.c
+++ b/libyara/hex_lexer.c
@@ -47,6 +47,7 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -357,7 +358,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
  */
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (yy_size_t) (yy_cp - yy_bp); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
@@ -488,7 +489,7 @@ limitations under the License.
 
 #include "hex_grammar.h"
 
-#ifdef _WIN32
+#ifdef WIN32
 #define snprintf _snprintf
 #endif
 
@@ -503,7 +504,7 @@ limitations under the License.
 #define YY_NO_UNISTD_H 1
 #define YY_NO_INPUT 1
 
-#line 507 "hex_lexer.c"
+#line 508 "hex_lexer.c"
 
 #define INITIAL 0
 #define range 1
@@ -739,7 +740,7 @@ YY_DECL
 
 
 
-#line 743 "hex_lexer.c"
+#line 744 "hex_lexer.c"
 
     yylval = yylval_param;
 
@@ -942,7 +943,7 @@ YY_RULE_SETUP
 #line 138 "hex_lexer.l"
 ECHO;
 	YY_BREAK
-#line 946 "hex_lexer.c"
+#line 947 "hex_lexer.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(range):
 	yyterminate();
@@ -2083,7 +2084,7 @@ void hex_yyfree (void * ptr , yyscan_t yyscanner)
 
 
 
-#ifdef _WIN32
+#ifdef WIN32
 #include <windows.h>
 extern DWORD recovery_state_key;
 #else
@@ -2098,7 +2099,7 @@ void yyfatal(
 {
   jmp_buf* recovery_state;
 
-  #ifdef _WIN32
+  #ifdef WIN32
   recovery_state = TlsGetValue(recovery_state_key) ;
   #else
   recovery_state = pthread_getspecific(recovery_state_key);
@@ -2142,7 +2143,7 @@ int yr_parse_hex_string(
   lex_env.last_error_code = ERROR_SUCCESS;
   lex_env.inside_or = 0;
 
-  #ifdef _WIN32
+  #ifdef WIN32
   TlsSetValue(recovery_state_key, (LPVOID) &recovery_state);
   #else
   pthread_setspecific(recovery_state_key, (void*) &recovery_state);
@@ -2182,7 +2183,3 @@ int yr_parse_hex_string(
   return ERROR_SUCCESS;
 }
 
-
-
-
-
diff --git a/libyara/hex_lexer.l b/libyara/hex_lexer.l
index 85c0915..50f8bbb 100644
--- a/libyara/hex_lexer.l
+++ b/libyara/hex_lexer.l
@@ -236,7 +236,3 @@ int yr_parse_hex_string(
 
   return ERROR_SUCCESS;
 }
-
-
-
-
diff --git a/libyara/include/yara.h b/libyara/include/yara.h
index b35ae7c..e0870e6 100644
--- a/libyara/include/yara.h
+++ b/libyara/include/yara.h
@@ -35,4 +35,3 @@ extern "C" {
 #endif
 
 #endif
-
diff --git a/libyara/include/yara/ahocorasick.h b/libyara/include/yara/ahocorasick.h
index 76fa89f..173253d 100644
--- a/libyara/include/yara/ahocorasick.h
+++ b/libyara/include/yara/ahocorasick.h
@@ -48,5 +48,3 @@ void yr_ac_print_automaton(
     YR_AC_AUTOMATON* automaton);
 
 #endif
-
-
diff --git a/libyara/include/yara/arena.h b/libyara/include/yara/arena.h
index 7746c75..a0c342d 100644
--- a/libyara/include/yara/arena.h
+++ b/libyara/include/yara/arena.h
@@ -148,5 +148,3 @@ void yr_arena_print(
     YR_ARENA* arena);
 
 #endif
-
-
diff --git a/libyara/include/yara/atoms.h b/libyara/include/yara/atoms.h
index 88ea5ca..692f577 100644
--- a/libyara/include/yara/atoms.h
+++ b/libyara/include/yara/atoms.h
@@ -82,4 +82,4 @@ int yr_atoms_extract_from_string(
 void yr_atoms_list_destroy(
     YR_ATOM_LIST_ITEM* list_head);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/compiler.h b/libyara/include/yara/compiler.h
index d7d3daf..3b64a9d 100644
--- a/libyara/include/yara/compiler.h
+++ b/libyara/include/yara/compiler.h
@@ -178,4 +178,4 @@ int yr_compiler_get_rules(
     YR_RULES** rules);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/elf.h b/libyara/include/yara/elf.h
index f1ba2a0..e695295 100644
--- a/libyara/include/yara/elf.h
+++ b/libyara/include/yara/elf.h
@@ -202,4 +202,3 @@ typedef struct
 } elf64_section_header_t;
 
 #endif
-
diff --git a/libyara/include/yara/error.h b/libyara/include/yara/error.h
index 35bedd6..bf60da5 100644
--- a/libyara/include/yara/error.h
+++ b/libyara/include/yara/error.h
@@ -82,4 +82,4 @@ limitations under the License.
     return compiler->last_result; \
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/exec.h b/libyara/include/yara/exec.h
index 9b1624f..7fbe7ac 100644
--- a/libyara/include/yara/exec.h
+++ b/libyara/include/yara/exec.h
@@ -92,4 +92,3 @@ int yr_execute_code(
     time_t start_time);
 
 #endif
-
diff --git a/libyara/include/yara/exefiles.h b/libyara/include/yara/exefiles.h
index 52650d6..137320d 100644
--- a/libyara/include/yara/exefiles.h
+++ b/libyara/include/yara/exefiles.h
@@ -38,4 +38,3 @@ uint64_t yr_get_entry_point_address(
     size_t base_address);
 
 #endif
-
diff --git a/libyara/include/yara/filemap.h b/libyara/include/yara/filemap.h
index 5e698c9..3b5a2ff 100755
--- a/libyara/include/yara/filemap.h
+++ b/libyara/include/yara/filemap.h
@@ -49,4 +49,3 @@ void yr_filemap_unmap(
     YR_MAPPED_FILE* pmapped_file);
 
 #endif
-
diff --git a/libyara/include/yara/globals.h b/libyara/include/yara/globals.h
index e3f278f..dfeb683 100644
--- a/libyara/include/yara/globals.h
+++ b/libyara/include/yara/globals.h
@@ -20,4 +20,4 @@ limitations under the License.
 extern char lowercase[256];
 extern char altercase[256];
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/lexer.h b/libyara/include/yara/lexer.h
index 0c6a5a4..b2d708f 100644
--- a/libyara/include/yara/lexer.h
+++ b/libyara/include/yara/lexer.h
@@ -94,6 +94,3 @@ int yr_lex_parse_rules_string(
 int yr_lex_parse_rules_file(
     FILE* rules_file,
     YR_COMPILER* compiler);
-
-
-
diff --git a/libyara/include/yara/libyara.h b/libyara/include/yara/libyara.h
index f4b5445..edce8a3 100644
--- a/libyara/include/yara/libyara.h
+++ b/libyara/include/yara/libyara.h
@@ -31,4 +31,4 @@ int yr_get_tidx(void);
 
 void yr_set_tidx(int);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/mem.h b/libyara/include/yara/mem.h
index 0c2aaa1..9c843af 100644
--- a/libyara/include/yara/mem.h
+++ b/libyara/include/yara/mem.h
@@ -52,5 +52,3 @@ int yr_heap_alloc();
 int yr_heap_free();
 
 #endif
-
-
diff --git a/libyara/include/yara/object.h b/libyara/include/yara/object.h
index 0a632ca..5eb5448 100644
--- a/libyara/include/yara/object.h
+++ b/libyara/include/yara/object.h
@@ -114,4 +114,4 @@ YR_OBJECT* yr_object_get_root(
     YR_OBJECT* object);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/parser.h b/libyara/include/yara/parser.h
index 5b29581..6625897 100644
--- a/libyara/include/yara/parser.h
+++ b/libyara/include/yara/parser.h
@@ -102,7 +102,4 @@ int yr_parser_reduce_import(
     yyscan_t yyscanner,
     SIZED_STRING* module_name);
 
-
-
-
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/pe.h b/libyara/include/yara/pe.h
index ce57734..f6019a7 100644
--- a/libyara/include/yara/pe.h
+++ b/libyara/include/yara/pe.h
@@ -347,4 +347,3 @@ typedef struct _IMAGE_THUNK_DATA64 {
 
 
 #pragma pack(pop)
-
diff --git a/libyara/include/yara/re_lexer.h b/libyara/include/yara/re_lexer.h
index f8ce8f4..fb89771 100644
--- a/libyara/include/yara/re_lexer.h
+++ b/libyara/include/yara/re_lexer.h
@@ -95,4 +95,3 @@ int yr_parse_re_string(
   int flags,
   RE** re,
   RE_ERROR* error);
-
diff --git a/libyara/include/yara/rules.h b/libyara/include/yara/rules.h
index be09b8d..9114827 100644
--- a/libyara/include/yara/rules.h
+++ b/libyara/include/yara/rules.h
@@ -113,4 +113,4 @@ int yr_rules_define_string_variable(
 void yr_rules_print_profiling_info(
     YR_RULES* rules);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/scan.h b/libyara/include/yara/scan.h
index b2e47b8..c0eb3d2 100644
--- a/libyara/include/yara/scan.h
+++ b/libyara/include/yara/scan.h
@@ -32,4 +32,4 @@ int yr_scan_verify_match(
     YR_ARENA* matches_arena,
     int flags);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/sizedstr.h b/libyara/include/yara/sizedstr.h
index 5ca2aac..7134946 100644
--- a/libyara/include/yara/sizedstr.h
+++ b/libyara/include/yara/sizedstr.h
@@ -35,4 +35,3 @@ typedef struct _SIZED_STRING
 } SIZED_STRING;
 
 #endif
-
diff --git a/libyara/include/yara/types.h b/libyara/include/yara/types.h
index 2a8052b..0e2c284 100644
--- a/libyara/include/yara/types.h
+++ b/libyara/include/yara/types.h
@@ -470,4 +470,4 @@ typedef struct _YR_ARRAY_ITEMS
 } YR_ARRAY_ITEMS;
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/include/yara/utils.h b/libyara/include/yara/utils.h
index 52a0147..3cdc700 100644
--- a/libyara/include/yara/utils.h
+++ b/libyara/include/yara/utils.h
@@ -66,4 +66,4 @@ limitations under the License.
 
 size_t xtoi(const char* hexstr);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/lexer.c b/libyara/lexer.c
index b27732b..a6235ac 100644
--- a/libyara/lexer.c
+++ b/libyara/lexer.c
@@ -47,6 +47,7 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -357,7 +358,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
  */
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (yy_size_t) (yy_cp - yy_bp); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
@@ -670,7 +671,7 @@ limitations under the License.
       } \
     }
 
-#ifdef _WIN32
+#ifdef WIN32
 #define snprintf _snprintf
 #endif
 
@@ -680,7 +681,7 @@ limitations under the License.
 
 
 
-#line 684 "lexer.c"
+#line 685 "lexer.c"
 
 #define INITIAL 0
 #define str 1
@@ -918,7 +919,7 @@ YY_DECL
 #line 83 "lexer.l"
 
 
-#line 922 "lexer.c"
+#line 923 "lexer.c"
 
     yylval = yylval_param;
 
@@ -1288,7 +1289,7 @@ YY_RULE_SETUP
     // make included file path relative to current source file
     s = strrchr(buffer, '/');
 
-    #ifdef _WIN32
+    #ifdef WIN32
     b = strrchr(buffer, '\\'); // in Windows both path delimiters are accepted
     #endif
 
@@ -1737,7 +1738,7 @@ YY_RULE_SETUP
 #line 556 "lexer.l"
 ECHO;
 	YY_BREAK
-#line 1741 "lexer.c"
+#line 1742 "lexer.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3026,8 +3027,3 @@ int yr_lex_parse_rules_file(
   return compiler->errors;
 }
 
-
-
-
-
-
diff --git a/libyara/lexer.l b/libyara/lexer.l
index f6f3874..87b1fd4 100644
--- a/libyara/lexer.l
+++ b/libyara/lexer.l
@@ -706,8 +706,3 @@ int yr_lex_parse_rules_file(
 
   return compiler->errors;
 }
-
-
-
-
-
diff --git a/libyara/mem.c b/libyara/mem.c
index e18e3f5..e7664a2 100644
--- a/libyara/mem.c
+++ b/libyara/mem.c
@@ -117,4 +117,4 @@ char* yr_strdup(const char *str)
   return strdup(str);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libyara/modules.c b/libyara/modules.c
index a5ba738..1e63201 100644
--- a/libyara/modules.c
+++ b/libyara/modules.c
@@ -199,10 +199,3 @@ int yr_modules_unload_all(
 
   return ERROR_SUCCESS;
 }
-
-
-
-
-
-
-
diff --git a/libyara/object.c b/libyara/object.c
index 69173a0..e926495 100644
--- a/libyara/object.c
+++ b/libyara/object.c
@@ -706,10 +706,3 @@ YR_OBJECT* yr_object_get_root(
 
   return o;
 }
-
-
-
-
-
-
-
diff --git a/libyara/parser.c b/libyara/parser.c
index a30dd7d..afb3d04 100644
--- a/libyara/parser.c
+++ b/libyara/parser.c
@@ -894,7 +894,3 @@ int yr_parser_reduce_import(
 
   return compiler->last_result;
 }
-
-
-
-
diff --git a/libyara/proc.c b/libyara/proc.c
index 4b16959..f704c71 100644
--- a/libyara/proc.c
+++ b/libyara/proc.c
@@ -342,4 +342,3 @@ int yr_process_get_memory(
 
 #endif
 #endif
-
diff --git a/libyara/re_grammar.c b/libyara/re_grammar.c
index 4ce2197..de26a47 100644
--- a/libyara/re_grammar.c
+++ b/libyara/re_grammar.c
@@ -1907,19 +1907,3 @@ yyreturn:
 #line 282 "re_grammar.y"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libyara/re_grammar.y b/libyara/re_grammar.y
index 61855ea..f4e3434 100644
--- a/libyara/re_grammar.y
+++ b/libyara/re_grammar.y
@@ -280,19 +280,3 @@ single : '(' alternative ')'
 
 
 %%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libyara/re_lexer.c b/libyara/re_lexer.c
index 32af944..71c8795 100644
--- a/libyara/re_lexer.c
+++ b/libyara/re_lexer.c
@@ -47,6 +47,7 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -357,7 +358,7 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
  */
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (yy_size_t) (yy_cp - yy_bp); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
@@ -514,7 +515,7 @@ limitations under the License.
 #include <yara/re_lexer.h>
 
 
-#ifdef _WIN32
+#ifdef WIN32
 #define snprintf _snprintf
 #endif
 
@@ -524,7 +525,7 @@ uint8_t read_escaped_char(yyscan_t yyscanner);
 
 #define YY_NO_UNISTD_H 1
 
-#line 528 "re_lexer.c"
+#line 529 "re_lexer.c"
 
 #define INITIAL 0
 #define char_class 1
@@ -759,7 +760,7 @@ YY_DECL
 #line 60 "re_lexer.l"
 
 
-#line 763 "re_lexer.c"
+#line 764 "re_lexer.c"
 
     yylval = yylval_param;
 
@@ -1244,7 +1245,7 @@ YY_RULE_SETUP
 #line 388 "re_lexer.l"
 ECHO;
 	YY_BREAK
-#line 1248 "re_lexer.c"
+#line 1249 "re_lexer.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2443,7 +2444,7 @@ uint8_t read_escaped_char(yyscan_t yyscanner)
 
 
 
-#ifdef _WIN32
+#ifdef WIN32
 #include <windows.h>
 extern DWORD recovery_state_key;
 #else
@@ -2457,7 +2458,7 @@ void yyfatal(
 {
   jmp_buf* recovery_state;
 
-  #ifdef _WIN32
+  #ifdef WIN32
   recovery_state = TlsGetValue(recovery_state_key) ;
   #else
   recovery_state = pthread_getspecific(recovery_state_key);
@@ -2501,7 +2502,7 @@ int yr_parse_re_string(
 
   lex_env.last_error_code = ERROR_SUCCESS;
 
-  #ifdef _WIN32
+  #ifdef WIN32
   TlsSetValue(recovery_state_key, (LPVOID) &recovery_state);
   #else
   pthread_setspecific(recovery_state_key, (void*) &recovery_state);
@@ -2536,9 +2537,3 @@ int yr_parse_re_string(
   return ERROR_SUCCESS;
 }
 
-
-
-
-
-
-
diff --git a/libyara/re_lexer.l b/libyara/re_lexer.l
index e52d374..389431a 100644
--- a/libyara/re_lexer.l
+++ b/libyara/re_lexer.l
@@ -541,9 +541,3 @@ int yr_parse_re_string(
 
   return ERROR_SUCCESS;
 }
-
-
-
-
-
-
diff --git a/libyara/scan.c b/libyara/scan.c
index ad68bf1..44ddf5c 100644
--- a/libyara/scan.c
+++ b/libyara/scan.c
@@ -874,4 +874,4 @@ int yr_scan_verify_match(
   #endif
 
   return ERROR_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/libyara/utils.c b/libyara/utils.c
index 12bf535..84bb493 100644
--- a/libyara/utils.c
+++ b/libyara/utils.c
@@ -61,4 +61,4 @@ size_t xtoi(const char* hexstr)
   }
 
   return r;
-}
\ No newline at end of file
+}

-- 
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