Renamed par2cmdline.h to libpar2internal.h.

In the process, removed the reference to par2cmline.h from commandline.cpp, and fixed up the resulting breakage.
Parchive · May 31, 2019 · 19429f8 · 19429f8
1 parent 79cb819
commit 19429f8
Show file tree

Hide file tree

Showing 39 changed files with 71 additions and 50 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -46,13 +46,13 @@ libpar2_a_SOURCES = src/crc.cpp src/crc.h \
 	src/reedsolomon.cpp src/reedsolomon.h \
 	src/verificationhashtable.cpp src/verificationhashtable.h \
 	src/verificationpacket.cpp src/verificationpacket.h \
-	src/libpar2.cpp src/libpar2.h
+	src/libpar2.cpp src/libpar2.h src/libpar2internal.h
 
 
 bin_PROGRAMS = par2
 man_MANS = man/par2.1
 
-par2_SOURCES = src/par2cmdline.cpp src/par2cmdline.h \
+par2_SOURCES = src/par2cmdline.cpp \
 	src/commandline.cpp src/commandline.h
 par2_LDADD = libpar2.a
 

diff --git a/par2cmdline.vcxproj b/par2cmdline.vcxproj
@@ -93,7 +93,7 @@
       <OpenMPSupport>true</OpenMPSupport>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>src/par2cmdline.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\libpar2internal.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
@@ -114,7 +114,7 @@
       <OpenMPSupport>true</OpenMPSupport>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>src/par2cmdline.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\libpar2internal.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
@@ -137,7 +137,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>par2cmdline.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\libpar2internal.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <OpenMPSupport>true</OpenMPSupport>
@@ -163,7 +163,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderFile>par2cmdline.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>src\libpar2internal.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <OpenMPSupport>true</OpenMPSupport>
@@ -215,12 +215,12 @@
     <ClInclude Include="src\galois.h" />
     <ClInclude Include="src\letype.h" />
     <ClInclude Include="src\libpar2.h" />
+    <ClInclude Include="src\libpar2internal.h" />
     <ClInclude Include="src\mainpacket.h" />
     <ClInclude Include="src\md5.h" />
     <ClInclude Include="src\par1fileformat.h" />
     <ClInclude Include="src\par1repairer.h" />
     <ClInclude Include="src\par1repairersourcefile.h" />
-    <ClInclude Include="src\par2cmdline.h" />
     <ClInclude Include="src\par2creator.h" />
     <ClInclude Include="src\par2creatorsourcefile.h" />
     <ClInclude Include="src\par2fileformat.h" />

diff --git a/par2cmdline.vcxproj.filters b/par2cmdline.vcxproj.filters
@@ -87,6 +87,9 @@
     <ClCompile Include="src\verificationpacket.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\libpar2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\commandline.h">
@@ -134,9 +137,6 @@
     <ClInclude Include="src\par1repairersourcefile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\par2cmdline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\par2creator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -164,6 +164,12 @@
     <ClInclude Include="src\verificationpacket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\libpar2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\libpar2internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="AUTHORS" />

diff --git a/src/commandline.cpp b/src/commandline.cpp
@@ -18,15 +18,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
-
 // This is included here, so that cout and cerr are not used elsewhere.
 #include<iostream>
-
+#include<algorithm>
 #include "commandline.h"
-
-
-
+using namespace std;
 
 #ifdef _MSC_VER
 #ifdef _DEBUG
@@ -36,6 +32,10 @@ static char THIS_FILE[]=__FILE__;
 #endif
 #endif
 
+// OpenMP
+#ifdef _OPENMP
+# include <omp.h>
+#endif
 
 CommandLine::CommandLine(void)
 : filesize_cache()

diff --git a/src/commandline.h b/src/commandline.h
@@ -27,8 +27,25 @@ using std::string;
 // This is needed by diskfile.h
 #ifdef _WIN32
 #include <windows.h>
+
+// Heap checking
+#ifdef _MSC_VER
+#define _CRTDBG_MAP_ALLOC
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK, THIS_FILE, __LINE__)
 #endif
 
+#define stricmp  _stricmp
+
+#else
+
+#include <string.h>
+#define stricmp strcasecmp
+
+#endif
+
+#define _FILE_THREADS 2
+
 #include "libpar2.h"
 #include "diskfile.h"
 

diff --git a/src/commandline_test.cpp b/src/commandline_test.cpp
@@ -22,9 +22,8 @@
 #include <fstream>
 #include <stdlib.h>
 
-#include "par2cmdline.h"
 #include "commandline.h"
-
+using namespace std;
 
 // ComputeRecoveryBlockCount
 // recoveryblockset = true

diff --git a/src/crc.cpp b/src/crc.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/crc_test.cpp b/src/crc_test.cpp
@@ -25,7 +25,7 @@
 //    g++ -DHAVE_CONFIG_H -I.. crc_test.cpp crc.cpp 
 
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #include <iostream>
 #include <stdlib.h>

diff --git a/src/creatorpacket.cpp b/src/creatorpacket.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/criticalpacket.cpp b/src/criticalpacket.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/criticalpacket_test.cpp b/src/criticalpacket_test.cpp
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 // CriticalPacket::CompareLess
 int test1() {

diff --git a/src/datablock.cpp b/src/datablock.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/descriptionpacket.cpp b/src/descriptionpacket.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/descriptionpacket_test.cpp b/src/descriptionpacket_test.cpp
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 // The file separator
 #ifdef _WIN32

diff --git a/src/diskfile.cpp b/src/diskfile.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/diskfile_test.cpp b/src/diskfile_test.cpp
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 
 // The file separator

diff --git a/src/filechecksummer.cpp b/src/filechecksummer.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/galois.cpp b/src/galois.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/galois_test.cpp b/src/galois_test.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 #include "galois.h"
 
 

diff --git a/src/letype_test.cpp b/src/letype_test.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 #include "letype.h"
 
 

diff --git a/src/libpar2.cpp b/src/libpar2.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 Result par2create(std::ostream &sout,
 		  std::ostream &serr,

diff --git a/src/par2cmdline.h → src/libpar2internal.h b/src/par2cmdline.h → src/libpar2internal.h
diff --git a/src/mainpacket.cpp b/src/mainpacket.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/md5.cpp b/src/md5.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/md5_test.cpp b/src/md5_test.cpp
@@ -21,7 +21,7 @@
 // This is just a simple set of tests on md5 hash.
 // The initial version just showed it was self-consistent, not accurate.
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #include <iostream>
 #include <stdlib.h>

diff --git a/src/par1fileformat.cpp b/src/par1fileformat.cpp
@@ -17,6 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 PAR1MAGIC    par1_magic                = {{'P', 'A', 'R', '\0', '\0', '\0', '\0', '\0'}};
diff --git a/src/par1repairer.cpp b/src/par1repairer.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/par1repairersourcefile.cpp b/src/par1repairersourcefile.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/par2cmdline.cpp b/src/par2cmdline.cpp
@@ -20,7 +20,6 @@
 
 #include "libpar2.h"
 #include "commandline.h"
-#include "par2cmdline.h"
 
 // This is included here, so that cout and cerr are not used elsewhere.
 #include <iostream>

diff --git a/src/par2creator.cpp b/src/par2creator.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/par2creatorsourcefile.cpp b/src/par2creatorsourcefile.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG

diff --git a/src/par2fileformat.cpp b/src/par2fileformat.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 MAGIC      packet_magic                = {{'P', 'A', 'R', '2', '\0','P', 'K', 'T'}};
 PACKETTYPE fileverificationpacket_type = {{'P', 'A', 'R', ' ', '2', '.', '0', '\0', 'I', 'F', 'S', 'C', '\0','\0','\0','\0'}};

diff --git a/src/par2repairer.cpp b/src/par2repairer.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#include "par2cmdline.h"
+#include "libpar2internal.h"
 
 #ifdef _MSC_VER
 #ifdef _DEBUG