[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3841300

The following commit has been merged in the master branch:
commit 3841300980e611eb11470562a8ab992c7178be33
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Feb 15 04:17:19 2004 +0000

    Changed localtime_r to localtime for portability
---
 src/actions.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 1dc752b..71c952a 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Name:  $ $Revision: 1.3 $
+  Version:   $Name:  $ $Revision: 1.4 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.3 $ $RCSfile: actions.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: actions.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -344,19 +344,17 @@ namespace {
 
     std::string time2Str(time_t time)
     {
-        struct tm tm;
-        ::memset(&tm, 0x0, sizeof(struct tm));
-
-        if (0 == ::localtime_r(&time, &tm)) return "";
+        struct tm* tm = localtime(&time);
+        if (0 == tm) return "";
 
         std::ostringstream os;
         os << std::setfill('0') 
-           << tm.tm_year + 1900 << ":"
-           << std::setw(2) << tm.tm_mon + 1 << ":"
-           << std::setw(2) << tm.tm_mday << " "
-           << std::setw(2) << tm.tm_hour << ":"
-           << std::setw(2) << tm.tm_min << ":"
-           << std::setw(2) << tm.tm_sec;
+           << tm->tm_year + 1900 << ":"
+           << std::setw(2) << tm->tm_mon + 1 << ":"
+           << std::setw(2) << tm->tm_mday << " "
+           << std::setw(2) << tm->tm_hour << ":"
+           << std::setw(2) << tm->tm_min << ":"
+           << std::setw(2) << tm->tm_sec;
 
         return os.str();
     } // time2Str

-- 
exiv2 packaging