Changeset 1471

Timestamp:

09/05/10 13:37:48 (21 months ago)

Author:

Freddie Akeroyd

Message:

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

Location:

trunk/contrib/applications/NXextract/src

Files:

• base.cpp (modified) (1 diff)
• base.h (modified) (1 diff)
• bmp.cpp (modified) (1 diff)
• extractor.cpp (modified) (1 diff)
• extractorapp.cpp (modified) (1 diff)
• file.cpp (modified) (3 diffs)
• jpegwrap.cpp (modified) (1 diff)
• membuf.cpp (modified) (1 diff)
• nexusevaluator.cpp (modified) (1 diff)
• templateparsor.cpp (modified) (1 diff)

trunk/contrib/applications/NXextract/src/base.cpp

@@ -832 +832 @@
 // String::RemoveEnclosure
 //---------------------------------------------------------------------------
-bool String::RemoveEnclosure(psz pszLeft, psz pszRight)
+bool String::RemoveEnclosure(pcsz pszLeft, pcsz pszRight)
 {
   // pcszLeft & pcszRight must have the same length

trunk/contrib/applications/NXextract/src/base.h

@@ -237 +237 @@
   /// @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);
 

trunk/contrib/applications/NXextract/src/bmp.cpp

@@ -16 +16 @@
 //*****************************************************************************
 
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include "base.h"
 #include "file.h"

trunk/contrib/applications/NXextract/src/extractor.cpp

@@ -32 +32 @@
 #include <sstream>  
 #include <vector>
+#include <cstring>
+#include <cstdlib>
 
 #include "nexusevaluator.h"

trunk/contrib/applications/NXextract/src/extractorapp.cpp

@@ -26 +26 @@
 #include <sstream>  
 #include <vector>
+#include <cstdlib>
+#include <cstring>
 
 #include "nexusevaluator.h"

trunk/contrib/applications/NXextract/src/file.cpp

@@ -518 +518 @@
     return;
 
-  char   *p;
+  const char   *p;
 #ifdef __WIN32__
   // Skeep UNC starting if it exists
@@ -575 +575 @@
   do
   {
-    *p = 0;
+    str[p - PSZ(str)] = '\0';  // *p = 0;
     struct stat st;
     if( ::stat(PSZ(str), &st) )
@@ -634 +634 @@
     }
     // Next path component
-    *p = SEP_PATH;
+    str[p - PSZ(str)] = SEP_PATH;   // *p = SEP_PATH;
     p = strchr(p+1, SEP_PATH);
   } while( p );

trunk/contrib/applications/NXextract/src/jpegwrap.cpp

@@ -16 +16 @@
 //*****************************************************************************
 
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include "base.h"
 #include "file.h"

trunk/contrib/applications/NXextract/src/membuf.cpp

@@ -643 +643 @@
 String CMemBuf::HexString() const
 {
-  static char *pszHexa = "0123456789ABCDEF";
+  static const char *pszHexa = "0123456789ABCDEF";
   ostringstream oss;
   String str;

trunk/contrib/applications/NXextract/src/nexusevaluator.cpp

@@ -23 +23 @@
 #include "variant.h"
 
+#include <sstream>
+#include <cstdlib>
+#include <cstring>
 #include "nexusevaluator.h"
 #include "extractor.h"
 #include "templateparsor.h"
-#include <sstream>
 
 // special attributes

trunk/contrib/applications/NXextract/src/templateparsor.cpp

@@ -26 +26 @@
 #include <sstream>  
 #include <vector>
+#include <cstring>
+#include <cstdlib>
 
 #include "nexusevaluator.h"