[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=89c796a

The following commit has been merged in the master branch:
commit 89c796a3ab8d7bbf16555fcb91c5b82110a2afee
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Dec 28 03:41:01 2013 +0000

    Issue: #940.  Fix compilation warnings.
---
 src/Makefile                     |  2 +-
 src/futils.cpp                   | 28 +++++++++++++++-------------
 src/makernote.cpp                |  4 ++--
 src/tiffvisitor.cpp              |  4 ++--
 xmpsdk/include/XMP_Environment.h |  2 ++
 xmpsdk/src/MD5.cpp               |  2 +-
 xmpsdk/src/XMPIterator.cpp       |  6 +++---
 xmpsdk/src/XMPMeta-GetSet.cpp    |  2 +-
 xmpsdk/src/XMPMeta.cpp           |  4 ++--
 xmpsdk/src/XMPUtils-FileInfo.cpp |  2 +-
 xmpsdk/src/XMPUtils.cpp          |  2 +-
 11 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index bb1ddf9..a42ba90 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -231,7 +231,7 @@ lib: $(OBJ)
 	@touch lib
 
 $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
-	-mkdir ../bin >/dev/null 2>&1
+	-mkdir -p ../bin >/dev/null 2>&1
 	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
 
 install-header:
diff --git a/src/futils.cpp b/src/futils.cpp
index fbd718e..b6305c5 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -86,23 +86,25 @@ namespace Exiv2 {
     } // fileExists
 
 #endif
+
+#define UNUSED(x) (void)(x)
+
     std::string strError()
     {
-        int error = errno;
+        int   error = errno;
         std::ostringstream os;
-#ifdef EXV_HAVE_STRERROR_R
+#ifdef  EXV_HAVE_STRERROR_R
         const size_t n = 1024;
-// _GNU_SOURCE: See Debian bug #485135
-# if defined EXV_STRERROR_R_CHAR_P && defined _GNU_SOURCE
-        char *buf = 0;
-        char buf2[n];
-        std::memset(buf2, 0x0, n);
-        buf = strerror_r(error, buf2, n);
-# else
-        char buf[n];
-        std::memset(buf, 0x0, n);
-        strerror_r(error, buf, n);
-# endif
+        char  buff[n];
+        std::memset(buff, 0x0, n);
+        // _GNU_SOURCE: See Debian bug #485135
+#ifdef  STRERROR_R_CHAR_P
+        char* buf = strerror_r(error, buff, n);
+#else
+        char* buf   = buff;
+        int   dummy = strerror_r(error, buff, n);
+        UNUSED(dummy);
+#endif
         os << buf;
         // Issue# 908.
         // report strerror() if strerror_r() returns empty
diff --git a/src/makernote.cpp b/src/makernote.cpp
index f6be4f9..31f6e2e 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -1026,10 +1026,10 @@ namespace Exiv2 {
 
     TiffComponent* newCasioMn(uint16_t    tag,
                              IfdId       group,
-                             IfdId       mnGroup,
+                             IfdId    /* mnGroup*/,
                              const byte* pData,
                              uint32_t    size,
-                             ByteOrder   byteOrder)
+                             ByteOrder/* byteOrder */ )
     {
         if (size > 6 && std::string(reinterpret_cast<const char*>(pData), 6)
                         == std::string("QVC

-- 
exiv2 packaging