Fix const correctness and add additional includes. Refs #229.

git-svn-id: https://svn.nexusformat.org/code/trunk@1471 ff5d1e40-2be0-497f-93bd-dc18237bd3c7
nexusformat · May 9, 2010 · 15f9c52 · 15f9c52
1 parent e30c4c6
commit 15f9c52
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 7 deletions.
diff --git a/contrib/applications/NXextract/src/base.cpp b/contrib/applications/NXextract/src/base.cpp
@@ -831,7 +831,7 @@ int String::ExtractTokenRight(char cLeft, char cRight, String *pstrToken)
 //---------------------------------------------------------------------------
 // String::RemoveEnclosure
 //---------------------------------------------------------------------------
-bool String::RemoveEnclosure(psz pszLeft, psz pszRight)
+bool String::RemoveEnclosure(pcsz pszLeft, pcsz pszRight)
 {
   // pcszLeft & pcszRight must have the same length
   if( strlen(pszLeft) != strlen(pszRight) )

diff --git a/contrib/applications/NXextract/src/base.h b/contrib/applications/NXextract/src/base.h
@@ -236,7 +236,7 @@ class String : public string
   /// @param pcszLeft list of possible left enclosure chars
   /// @param pcszRight list of possible right enclosure chars
   /// @return true if enclosure was removed
-  bool RemoveEnclosure(psz pszLeft, psz pszRight);
+  bool RemoveEnclosure(pcsz pszLeft, pcsz pszRight);
   bool RemoveEnclosure(char cLeft, char cRight);
 
   /// Match string with mask containing '*' and '?' jokers

diff --git a/contrib/applications/NXextract/src/bmp.cpp b/contrib/applications/NXextract/src/bmp.cpp
@@ -15,6 +15,9 @@
 //
 //*****************************************************************************
 
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include "base.h"
 #include "file.h"
 #include "membuf.h"

diff --git a/contrib/applications/NXextract/src/extractor.cpp b/contrib/applications/NXextract/src/extractor.cpp
@@ -31,6 +31,8 @@
 #include <fstream>
 #include <sstream>  
 #include <vector>
+#include <cstring>
+#include <cstdlib>
 
 #include "nexusevaluator.h"
 #include "extractor.h"

diff --git a/contrib/applications/NXextract/src/extractorapp.cpp b/contrib/applications/NXextract/src/extractorapp.cpp
@@ -25,6 +25,8 @@
 #include <fstream>
 #include <sstream>  
 #include <vector>
+#include <cstdlib>
+#include <cstring>
 
 #include "nexusevaluator.h"
 #include "extractor.h"

diff --git a/contrib/applications/NXextract/src/file.cpp b/contrib/applications/NXextract/src/file.cpp
@@ -517,7 +517,7 @@ void FileName::MkDir(mode_t mode, uid_t uid, gid_t gid) const
   if( str.empty() )
     return;
 
-  char   *p;
+  const char   *p;
 #ifdef __WIN32__
   // Skeep UNC starting if it exists
   if( str[0u] == SEP_PATH && str[1u] == SEP_PATH )
@@ -574,7 +574,7 @@ void FileName::MkDir(mode_t mode, uid_t uid, gid_t gid) const
 
   do
   {
-    *p = 0;
+    str[p - PSZ(str)] = '\0';  // *p = 0;
     struct stat st;
     if( ::stat(PSZ(str), &st) )
     {
@@ -633,7 +633,7 @@ void FileName::MkDir(mode_t mode, uid_t uid, gid_t gid) const
       // Directory : ok
     }
     // Next path component
-    *p = SEP_PATH;
+    str[p - PSZ(str)] = SEP_PATH;   // *p = SEP_PATH;
     p = strchr(p+1, SEP_PATH);
   } while( p );
 }

diff --git a/contrib/applications/NXextract/src/jpegwrap.cpp b/contrib/applications/NXextract/src/jpegwrap.cpp
@@ -15,6 +15,9 @@
 //
 //*****************************************************************************
 
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include "base.h"
 #include "file.h"
 #include "membuf.h"

diff --git a/contrib/applications/NXextract/src/membuf.cpp b/contrib/applications/NXextract/src/membuf.cpp
@@ -642,7 +642,7 @@ CMemBuf& CMemBuf::operator<<(const CMemBuf& membuf)
 //---------------------------------------------------------------------------
 String CMemBuf::HexString() const
 {
-  static char *pszHexa = "0123456789ABCDEF";
+  static const char *pszHexa = "0123456789ABCDEF";
   ostringstream oss;
   String str;
   str.reserve(2 * m_uiLen);

diff --git a/contrib/applications/NXextract/src/nexusevaluator.cpp b/contrib/applications/NXextract/src/nexusevaluator.cpp
@@ -22,10 +22,12 @@
 #include "membuf.h"
 #include "variant.h"
 
+#include <sstream>
+#include <cstdlib>
+#include <cstring>
 #include "nexusevaluator.h"
 #include "extractor.h"
 #include "templateparsor.h"
-#include <sstream>
 
 // special attributes
 const char SIZE_ATTR[] = "_size_";

diff --git a/contrib/applications/NXextract/src/templateparsor.cpp b/contrib/applications/NXextract/src/templateparsor.cpp
@@ -25,6 +25,8 @@
 #include <fstream>
 #include <sstream>  
 #include <vector>
+#include <cstring>
+#include <cstdlib>
 
 #include "nexusevaluator.h"
 #include "extractor.h"