[Forensics-changes] [guymager] 02/04: New upstream version 0.8.4

[Michael Prokop]

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

mika pushed a commit to branch master
in repository guymager.

commit 9190fe23ef840088cfda501e04f14e67adf0a23f
Author: Michael Prokop <mika at debian.org>
Date:   Thu Aug 17 09:19:14 2017 +0200

    New upstream version 0.8.4
---
 aaff.cpp        |  2 +-
 changelog       |  5 +++++
 device.cpp      | 14 +++++++-------
 threadwrite.cpp |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/aaff.cpp b/aaff.cpp
index c62403c..bf9a024 100644
--- a/aaff.cpp
+++ b/aaff.cpp
@@ -79,7 +79,7 @@ typedef struct
    unsigned int NameLen;
    unsigned int DataLen;
    unsigned int Argument;          // Named "flags" in original aff source, named "arg" in afinfo output.
-   char         Name[];            //lint !e1501
+   char         Name[0];
 } __attribute__ ((packed)) t_AffSegmentHeader;
 
 // Between header and footer lie the segment name and the data
diff --git a/changelog b/changelog
index 0c26d57..9f4caaa 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+guymager-beta (0.8.4-1) unstable; urgency=low
+   * Removed bug that occurred if remaining time was longer than 99 hours
+   * Adapted to gcc7
+ -- Guy Voncken <develop at faert.net>  Fri, 02 Feb 2017 09:00:00 +0100
+
 guymager-beta (0.8.3-1) unstable; urgency=low
    * Corrected bug where Guymager not always recognised if duplicate image or
      info file was the same as first one.
diff --git a/device.cpp b/device.cpp
index 70a324e..2bdcaad 100644
--- a/device.cpp
+++ b/device.cpp
@@ -718,12 +718,12 @@ QVariant t_Device::GetAverageSpeed (t_pDevice pDevice)
 
 QVariant t_Device::GetRemaining (t_pDevice pDevice)
 {
-   QString Result;
-   char    Buff[10];
-   int     TotalSeconds;
-   time_t  Now;
-   int     hh, mm, ss;
-   quint64 Current, Total;
+   QString      Result;
+   char         Buff[20];
+   int          TotalSeconds;
+   time_t       Now;
+   unsigned int hh, mm, ss;
+   quint64      Current, Total;
 
    if (!pDevice->Error.Abort() && ((pDevice->State == Acquire) || // Don't display anything if no acquisition is running
                                    (pDevice->State == Verify )))
@@ -737,7 +737,7 @@ QVariant t_Device::GetRemaining (t_pDevice pDevice)
       else
       {
          DeviceGetProgress (pDevice, &Current, &Total);
-         ss  = (int) ((double)Total / Current * TotalSeconds); // Estimated total time
+         ss  = (unsigned int) ((double)Total / Current * TotalSeconds); // Estimated total time
          ss -= TotalSeconds;                                   // Estimated remaining time
          hh = ss / SECONDS_PER_HOUR;   ss %= SECONDS_PER_HOUR;
          mm = ss / SECONDS_PER_MINUTE; ss %= SECONDS_PER_MINUTE;
diff --git a/threadwrite.cpp b/threadwrite.cpp
index c5ea1be..6996e19 100644
--- a/threadwrite.cpp
+++ b/threadwrite.cpp
@@ -220,7 +220,7 @@ class t_OutputFileDD: public t_OutputFile
                oFileFlags &= ~O_NOATIME;
                oFile = open64 (QSTR_TO_PSZ (Filename), oFileFlags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
             }
-            off64_t FileSize;
+            off64_t FileSize=0;
             bool    Err = (oFile < 0);
             if (!Err) Err = ((FileSize = lseek64 (oFile,0,SEEK_END)) == -1);
             if (!Err) Err = (lseek64 (oFile, 0, SEEK_SET) != 0);
@@ -1287,7 +1287,8 @@ void t_ThreadWrite::run (void)
    {
       case t_File::EWF : if (CONFIG(EwfFormat) == t_File::AEWF)
                               pOutputFile = new t_OutputFileAEWF(this);
-                         else pOutputFile = new t_OutputFileEWF (this); break;
+                         else pOutputFile = new t_OutputFileEWF (this); 
+                         break;
       case t_File::DD  :      pOutputFile = new t_OutputFileDD  (this); break;
       case t_File::AAFF:      pOutputFile = new t_OutputFileAAFF(this); break;
       default: CHK_EXIT (ERROR_THREADWRITE_INVALID_FORMAT)

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