[Forensics-changes] [yara] 399/415: Fix conflict with C++ keyword "namespace"

[Hilko Bengen]

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

bengen pushed a commit to branch debian
in repository yara.

commit 694b5c7324b71deb3a46c100b87c1576a8feea35
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Thu Feb 13 11:12:52 2014 +0100

    Fix conflict with C++ keyword "namespace"
---
 libyara/compiler.c | 20 ++++++++++----------
 libyara/yara.h     |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libyara/compiler.c b/libyara/compiler.c
index 4661f2c..56663fc 100644
--- a/libyara/compiler.c
+++ b/libyara/compiler.c
@@ -236,21 +236,21 @@ char* yr_compiler_get_current_file_name(
 
 int _yr_compiler_set_namespace(
     YR_COMPILER* compiler,
-    const char* namespace)
+    const char* namespace_)
 {
   YR_NAMESPACE* ns;
+
   char* ns_name;
   int result;
   int i;
   int found;
 
-
   ns = yr_arena_base_address(compiler->namespaces_arena);
   found = FALSE;
 
   for (i = 0; i < compiler->namespaces_count; i++)
   {
-    if (strcmp(ns->name, namespace) == 0)
+    if (strcmp(ns->name, namespace_) == 0)
     {
       found = TRUE;
       break;
@@ -266,7 +266,7 @@ int _yr_compiler_set_namespace(
   {
     result = yr_arena_write_string(
         compiler->sz_arena,
-        namespace,
+        namespace_,
         &ns_name);
 
     if (result == ERROR_SUCCESS)
@@ -295,10 +295,10 @@ int _yr_compiler_set_namespace(
 int yr_compiler_add_file(
     YR_COMPILER* compiler,
     FILE* rules_file,
-    const char* namespace)
+    const char* namespace_)
 {
-  if (namespace != NULL)
-    _yr_compiler_set_namespace(compiler, namespace);
+  if (namespace_ != NULL)
+    _yr_compiler_set_namespace(compiler, namespace_);
   else
     _yr_compiler_set_namespace(compiler, "default");
 
@@ -309,10 +309,10 @@ int yr_compiler_add_file(
 int yr_compiler_add_string(
     YR_COMPILER* compiler,
     const char* rules_string,
-    const char* namespace)
+    const char* namespace_)
 {
-  if (namespace != NULL)
-    _yr_compiler_set_namespace(compiler, namespace);
+  if (namespace_ != NULL)
+    _yr_compiler_set_namespace(compiler, namespace_);
   else
     _yr_compiler_set_namespace(compiler, "default");
 
diff --git a/libyara/yara.h b/libyara/yara.h
index e581b5d..11925bc 100644
--- a/libyara/yara.h
+++ b/libyara/yara.h
@@ -634,13 +634,13 @@ void yr_compiler_destroy(
 int yr_compiler_add_file(
     YR_COMPILER* compiler,
     FILE* rules_file,
-    const char* namespace);
+    const char* namespace_);
 
 
 int yr_compiler_add_string(
     YR_COMPILER* compiler,
     const char* rules_string,
-    const char* namespace);
+    const char* namespace_);
 
 
 int yr_compiler_push_file_name(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git