[Forensics-changes] [yara] 15/407: Fix typo. "Duplicated" instead of "duplicate".
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:27:59 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 cbd096ff74f466cca9f863342b239504f2e2439f
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date: Fri Aug 29 17:21:55 2014 +0200
Fix typo. "Duplicated" instead of "duplicate".
---
libyara/compiler.c | 24 ++++++++++++------------
libyara/grammar.c | 4 ++--
libyara/grammar.y | 4 ++--
libyara/include/yara/error.h | 12 ++++++------
libyara/object.c | 2 +-
libyara/parser.c | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libyara/compiler.c b/libyara/compiler.c
index 27c98e2..4c518e9 100644
--- a/libyara/compiler.c
+++ b/libyara/compiler.c
@@ -665,39 +665,39 @@ char* yr_compiler_get_error_message(
case ERROR_INSUFICIENT_MEMORY:
snprintf(buffer, buffer_size, "not enough memory");
break;
- case ERROR_DUPLICATE_IDENTIFIER:
+ case ERROR_DUPLICATED_IDENTIFIER:
snprintf(
buffer,
buffer_size,
- "duplicate identifier \"%s\"",
+ "duplicated identifier \"%s\"",
compiler->last_error_extra_info);
break;
- case ERROR_DUPLICATE_STRING_IDENTIFIER:
+ case ERROR_DUPLICATED_STRING_IDENTIFIER:
snprintf(
buffer,
buffer_size,
- "duplicate string identifier \"%s\"",
+ "duplicated string identifier \"%s\"",
compiler->last_error_extra_info);
break;
- case ERROR_DUPLICATE_TAG_IDENTIFIER:
+ case ERROR_DUPLICATED_TAG_IDENTIFIER:
snprintf(
buffer,
buffer_size,
- "duplicate tag identifier \"%s\"",
+ "duplicated tag identifier \"%s\"",
compiler->last_error_extra_info);
break;
- case ERROR_DUPLICATE_META_IDENTIFIER:
+ case ERROR_DUPLICATED_META_IDENTIFIER:
snprintf(
buffer,
buffer_size,
- "duplicate metadata identifier \"%s\"",
+ "duplicated metadata identifier \"%s\"",
compiler->last_error_extra_info);
break;
- case ERROR_DUPLICATE_LOOP_IDENTIFIER:
+ case ERROR_DUPLICATED_LOOP_IDENTIFIER:
snprintf(
buffer,
buffer_size,
- "duplicate loop identifier \"%s\"",
+ "duplicated loop identifier \"%s\"",
compiler->last_error_extra_info);
break;
case ERROR_UNDEFINED_STRING:
@@ -776,10 +776,10 @@ char* yr_compiler_get_error_message(
"unknown module \"%s\"",
compiler->last_error_extra_info);
break;
- case ERROR_DUPLICATE_STRUCTURE_MEMBER:
+ case ERROR_DUPLICATED_STRUCTURE_MEMBER:
snprintf(buffer,
buffer_size,
- "duplicate structure member");
+ "duplicated structure member");
break;
case ERROR_INVALID_HEX_STRING:
case ERROR_INVALID_REGULAR_EXPRESSION:
diff --git a/libyara/grammar.c b/libyara/grammar.c
index a4c04df..a2995f9 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -1961,7 +1961,7 @@ yyreduce:
if (strcmp(tag_name, (yyvsp[(2) - (2)].c_string)) == 0)
{
yr_compiler_set_error_extra_info(compiler, tag_name);
- compiler->last_result = ERROR_DUPLICATE_TAG_IDENTIFIER;
+ compiler->last_result = ERROR_DUPLICATED_TAG_IDENTIFIER;
break;
}
@@ -2620,7 +2620,7 @@ yyreduce:
(yyvsp[(3) - (4)].c_string));
compiler->last_result = \
- ERROR_DUPLICATE_LOOP_IDENTIFIER;
+ ERROR_DUPLICATED_LOOP_IDENTIFIER;
}
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
diff --git a/libyara/grammar.y b/libyara/grammar.y
index 5a0348f..23391a7 100644
--- a/libyara/grammar.y
+++ b/libyara/grammar.y
@@ -362,7 +362,7 @@ tag_list
if (strcmp(tag_name, $2) == 0)
{
yr_compiler_set_error_extra_info(compiler, tag_name);
- compiler->last_result = ERROR_DUPLICATE_TAG_IDENTIFIER;
+ compiler->last_result = ERROR_DUPLICATED_TAG_IDENTIFIER;
break;
}
@@ -951,7 +951,7 @@ expression
$3);
compiler->last_result = \
- ERROR_DUPLICATE_LOOP_IDENTIFIER;
+ ERROR_DUPLICATED_LOOP_IDENTIFIER;
}
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
diff --git a/libyara/include/yara/error.h b/libyara/include/yara/error.h
index 40644d2..c3f08a9 100644
--- a/libyara/include/yara/error.h
+++ b/libyara/include/yara/error.h
@@ -34,11 +34,11 @@ limitations under the License.
#define ERROR_INVALID_HEX_STRING 10
#define ERROR_SYNTAX_ERROR 11
#define ERROR_LOOP_NESTING_LIMIT_EXCEEDED 12
-#define ERROR_DUPLICATE_LOOP_IDENTIFIER 13
-#define ERROR_DUPLICATE_IDENTIFIER 14
-#define ERROR_DUPLICATE_TAG_IDENTIFIER 15
-#define ERROR_DUPLICATE_META_IDENTIFIER 16
-#define ERROR_DUPLICATE_STRING_IDENTIFIER 17
+#define ERROR_DUPLICATED_LOOP_IDENTIFIER 13
+#define ERROR_DUPLICATED_IDENTIFIER 14
+#define ERROR_DUPLICATED_TAG_IDENTIFIER 15
+#define ERROR_DUPLICATED_META_IDENTIFIER 16
+#define ERROR_DUPLICATED_STRING_IDENTIFIER 17
#define ERROR_UNREFERENCED_STRING 18
#define ERROR_UNDEFINED_STRING 19
#define ERROR_UNDEFINED_IDENTIFIER 20
@@ -62,7 +62,7 @@ limitations under the License.
#define ERROR_INVALID_FORMAT 38
#define ERROR_TOO_MANY_ARGUMENTS 39
#define ERROR_WRONG_NUMBER_OF_ARGUMENTS 40
-#define ERROR_DUPLICATE_STRUCTURE_MEMBER 41
+#define ERROR_DUPLICATED_STRUCTURE_MEMBER 41
#define FAIL_ON_ERROR(x) { \
diff --git a/libyara/object.c b/libyara/object.c
index 537d287..5347c91 100644
--- a/libyara/object.c
+++ b/libyara/object.c
@@ -495,7 +495,7 @@ int yr_object_structure_set_member(
// Check if the object already have a member with the same identifier
if (yr_object_lookup_field(object, member->identifier) != NULL)
- return ERROR_DUPLICATE_STRUCTURE_MEMBER;
+ return ERROR_DUPLICATED_STRUCTURE_MEMBER;
sm = yr_malloc(sizeof(YR_STRUCTURE_MEMBER));
diff --git a/libyara/parser.c b/libyara/parser.c
index bdbd124..87e7931 100644
--- a/libyara/parser.c
+++ b/libyara/parser.c
@@ -651,7 +651,7 @@ int yr_parser_reduce_rule_declaration(
// appropriate error.
yr_compiler_set_error_extra_info(compiler, identifier);
- compiler->last_result = ERROR_DUPLICATE_IDENTIFIER;
+ compiler->last_result = ERROR_DUPLICATED_IDENTIFIER;
return compiler->last_result;
}
--
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