[Forensics-changes] [yara] 249/407: Fix some issues while compiling in Windows

[Hilko Bengen]

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 a43071876024f24a226df487830970bd86e87b62
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Tue Dec 2 11:09:33 2014 +0100

    Fix some issues while compiling in Windows
---
 args.c | 2 +-
 yara.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/args.c b/args.c
index 45f11ec..ccfd983 100755
--- a/args.c
+++ b/args.c
@@ -54,7 +54,7 @@ args_option_t* args_get_long_option(
   {
     if (options->long_name != NULL)
     {
-      int l = strlen(options->long_name);
+      size_t l = strlen(options->long_name);
 
       if ((arg[l] == '\0' || arg[l] == '=') &&
           strstr(arg, options->long_name) == arg)
diff --git a/yara.c b/yara.c
index 75a6a5c..6302522 100644
--- a/yara.c
+++ b/yara.c
@@ -19,7 +19,6 @@ limitations under the License.
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <time.h>
 #include <inttypes.h>
 
 #else
@@ -30,6 +29,7 @@ limitations under the License.
 
 #endif
 
+#include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -640,7 +640,7 @@ void* scanning_thread(void* param)
 
   while (file_path != NULL)
   {
-    double elapsed_time = difftime(time(NULL), args->start_time);
+    int elapsed_time = (int) difftime(time(NULL), args->start_time);
 
     if (elapsed_time < timeout)
     {

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