[Libreoffice-commits] libmspub.git: src/lib

[Julien Nabet]

 src/lib/MSPUBCollector.cpp |    2 +-
 src/lib/MSPUBDocument.cpp  |    3 ++-
 src/lib/MSPUBParser.cpp    |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6aa8753461a537aadd2180ebc3d98962bd2224cb
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Nov 3 11:38:25 2013 +0100

    Some cppcheck cleaning

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 8836376..2d6b819 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1503,7 +1503,7 @@ bool libmspub::MSPUBCollector::addImage(unsigned index, ImgType type, WPXBinaryD
   }
   if (index > 0)
   {
-    MSPUB_DEBUG_MSG(("Image at index %d and of type 0x%x added.\n", index, type));
+    MSPUB_DEBUG_MSG(("Image at index %u and of type 0x%x added.\n", index, type));
     m_images[index - 1] = std::pair<ImgType, WPXBinaryData>(type, img);
   }
   else
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
index e4ed768..2ca247d 100644
--- a/src/lib/MSPUBDocument.cpp
+++ b/src/lib/MSPUBDocument.cpp
@@ -52,7 +52,6 @@ enum MSPUBVersion
 
 MSPUBVersion getVersion(WPXInputStream *input)
 {
-  MSPUBVersion version = MSPUB_UNKNOWN_VERSION;
   try
   {
     if (!input->isOLEStream())
@@ -69,6 +68,8 @@ MSPUBVersion getVersion(WPXInputStream *input)
 
     if (0x00 != libmspub::readU8(contentsStream.get()))
       return MSPUB_UNKNOWN_VERSION;
+
+    MSPUBVersion version = MSPUB_UNKNOWN_VERSION;
     switch(magicVersionByte)
     {
     case 0x2C:
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index a812ea9..09d43cf 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -752,7 +752,7 @@ bool libmspub::MSPUBParser::parseShape(WPXInputStream *input,
       }
       if (!index)
       {
-        MSPUB_DEBUG_MSG(("WARNING: Couldn't find cells of seqnum %u corresponding to table of seqnum %d.\n",
+        MSPUB_DEBUG_MSG(("WARNING: Couldn't find cells of seqnum %u corresponding to table of seqnum %u.\n",
                          csn, chunk.seqNum));
         return false;
       }