Skip to content

Commit 898aef3

Browse files
committed
Deleted md5 support now that issue #20 is fixed. The md5 support is not required anymore. The application now uses file modified date to detect if input file has changed.
1 parent 1a6134b commit 898aef3

File tree

14 files changed

+0
-600
lines changed

14 files changed

+0
-600
lines changed

msvc/common.vcxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,12 @@
8181
<ClCompile Include="..\src\common.cpp" />
8282
<ClCompile Include="..\src\cppencoder.cpp" />
8383
<ClCompile Include="..\src\logger.cpp" />
84-
<ClCompile Include="..\src\md5.cpp" />
85-
<ClCompile Include="..\src\md5support.cpp" />
86-
<ClCompile Include="..\src\md5Ex.cpp" />
8784
</ItemGroup>
8885
<ItemGroup>
8986
<ClInclude Include="..\src\argumentparser.h" />
9087
<ClInclude Include="..\src\common.h" />
9188
<ClInclude Include="..\src\cppencoder.h" />
9289
<ClInclude Include="..\src\logger.h" />
93-
<ClInclude Include="..\src\md5.h" />
94-
<ClInclude Include="..\src\md5support.h" />
95-
<ClInclude Include="..\src\md5Ex.h" />
9690
</ItemGroup>
9791
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9892
<ImportGroup Label="ExtensionTargets">

msvc/common.vcxproj.filters

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@
2121
<ClInclude Include="..\src\common.h">
2222
<Filter>Header Files</Filter>
2323
</ClInclude>
24-
<ClInclude Include="..\src\md5.h">
25-
<Filter>Header Files</Filter>
26-
</ClInclude>
27-
<ClInclude Include="..\src\md5Ex.h">
28-
<Filter>Header Files</Filter>
29-
</ClInclude>
30-
<ClInclude Include="..\src\md5support.h">
31-
<Filter>Header Files</Filter>
32-
</ClInclude>
3324
<ClInclude Include="..\src\cppencoder.h">
3425
<Filter>Header Files</Filter>
3526
</ClInclude>
@@ -44,15 +35,6 @@
4435
<ClCompile Include="..\src\common.cpp">
4536
<Filter>Source Files</Filter>
4637
</ClCompile>
47-
<ClCompile Include="..\src\md5.cpp">
48-
<Filter>Source Files</Filter>
49-
</ClCompile>
50-
<ClCompile Include="..\src\md5Ex.cpp">
51-
<Filter>Source Files</Filter>
52-
</ClCompile>
53-
<ClCompile Include="..\src\md5support.cpp">
54-
<Filter>Source Files</Filter>
55-
</ClCompile>
5638
<ClCompile Include="..\src\cppencoder.cpp">
5739
<Filter>Source Files</Filter>
5840
</ClCompile>

src/ArrayGenerator.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
#include "common.h"
88
#include "cppencoder.h"
9-
#include "md5support.h"
10-
#include "md5.h"
11-
#include "md5Ex.h"
129

1310
namespace bin2cpp
1411
{
@@ -80,10 +77,6 @@ namespace bin2cpp
8077
fprintf(cpp, " {\n");
8178
fprintf(cpp, " static const unsigned char buffer[] = {\n");
8279

83-
//Compute MD5 while generating cpp code
84-
MD5_CTX context;
85-
MD5Init(&context);
86-
8780
//create buffer for each chunks from input buffer
8881
int numLinePrinted = 0;
8982
unsigned char * buffer = new unsigned char[iChunkSize];
@@ -102,9 +95,6 @@ namespace bin2cpp
10295
fprintf(cpp, ",\n");
10396
}
10497

105-
//send to MD5 for analysist
106-
MD5Update(&context, buffer, readSize);
107-
10898
//output
10999
fprintf(cpp, " %s", toCppCharactersArray(buffer, readSize).c_str());
110100
numLinePrinted++;
@@ -120,15 +110,9 @@ namespace bin2cpp
120110
delete[] buffer;
121111
buffer = NULL;
122112

123-
//compute final digest
124-
MD5DIGEST digest;
125-
MD5Final(digest.bytes, &context);
126-
std::string md5String = toString(digest);
127-
128113
//write cpp file footer
129114
fprintf(cpp, " return (const char *)buffer;\n");
130115
fprintf(cpp, " }\n");
131-
fprintf(cpp, " virtual const char * getMd5() const { return \"%s\"; }\n", md5String.c_str() );
132116
fprintf(cpp, "%s", getSaveMethodImplementation().c_str());
133117
fprintf(cpp, " };\n");
134118
fprintf(cpp, " const File & %s() { static %s _instance; return _instance; }\n", getterFunctionName.c_str(), className.c_str());

src/BaseGenerator.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ namespace bin2cpp
9797
fprintf(header, " virtual size_t getSize() const = 0;\n");
9898
fprintf(header, " virtual const char * getFilename() const = 0;\n");
9999
fprintf(header, " virtual const char * getBuffer() const = 0;\n");
100-
fprintf(header, " virtual const char * getMd5() const = 0;\n");
101100
fprintf(header, " virtual bool save(const char * iFilename) const = 0;\n");
102101
fprintf(header, " };\n");
103102
fprintf(header, " #endif\n");

src/SegmentGenerator.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
#include "common.h"
88
#include "cppencoder.h"
9-
#include "md5support.h"
10-
#include "md5.h"
11-
#include "md5Ex.h"
129

1310
namespace bin2cpp
1411
{
@@ -84,10 +81,6 @@ namespace bin2cpp
8481
fprintf(cpp, " mBuffer.clear();\n");
8582
fprintf(cpp, " mBuffer.reserve(getSize()); //allocate all required memory at once to prevent reallocations\n");
8683

87-
//Compute MD5 while generating cpp code
88-
MD5_CTX context;
89-
MD5Init(&context);
90-
9184
//create buffer for each chunks from input buffer
9285
unsigned char * buffer = new unsigned char[iChunkSize];
9386
while(!feof(input))
@@ -100,23 +93,14 @@ namespace bin2cpp
10093
if (readSize == 0)
10194
continue; //nothing to output if nothing was read
10295

103-
//send to MD5 for analysist
104-
MD5Update(&context, buffer, readSize);
105-
10696
//output
10797
fprintf(cpp, " mBuffer.append(\"%s\", %d);\n", toCppString(buffer, readSize).c_str(), readSize);
10898
}
10999
delete[] buffer;
110100
buffer = NULL;
111101

112-
//compute final digest
113-
MD5DIGEST digest;
114-
MD5Final(digest.bytes, &context);
115-
std::string md5String = toString(digest);
116-
117102
//write cpp file footer
118103
fprintf(cpp, " }\n");
119-
fprintf(cpp, " virtual const char * getMd5() const { return \"%s\"; }\n", md5String.c_str() );
120104
fprintf(cpp, "%s", getSaveMethodImplementation().c_str());
121105
fprintf(cpp, " private:\n");
122106
fprintf(cpp, " std::string mBuffer;\n");

src/StringGenerator.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
#include "common.h"
88
#include "cppencoder.h"
9-
#include "md5support.h"
10-
#include "md5.h"
11-
#include "md5Ex.h"
129

1310
namespace bin2cpp
1411
{
@@ -80,10 +77,6 @@ namespace bin2cpp
8077
fprintf(cpp, " {\n");
8178
fprintf(cpp, " const char * buffer = ""\n");
8279

83-
//Compute MD5 while generating cpp code
84-
MD5_CTX context;
85-
MD5Init(&context);
86-
8780
//create buffer for each chunks from input buffer
8881
int numLinePrinted = 0;
8982
unsigned char * buffer = new unsigned char[iChunkSize];
@@ -102,9 +95,6 @@ namespace bin2cpp
10295
fprintf(cpp, "\n");
10396
}
10497

105-
//send to MD5 for analysist
106-
MD5Update(&context, buffer, readSize);
107-
10898
//output
10999
fprintf(cpp, " \"%s\"", toCppString(buffer, readSize).c_str());
110100
numLinePrinted++;
@@ -119,15 +109,9 @@ namespace bin2cpp
119109
delete[] buffer;
120110
buffer = NULL;
121111

122-
//compute final digest
123-
MD5DIGEST digest;
124-
MD5Final(digest.bytes, &context);
125-
std::string md5String = toString(digest);
126-
127112
//write cpp file footer
128113
fprintf(cpp, " return buffer;\n");
129114
fprintf(cpp, " }\n");
130-
fprintf(cpp, " virtual const char * getMd5() const { return \"%s\"; }\n", md5String.c_str() );
131115
fprintf(cpp, "%s", getSaveMethodImplementation().c_str());
132116
fprintf(cpp, " };\n");
133117
fprintf(cpp, " const File & %s() { static %s _instance; return _instance; }\n", getterFunctionName.c_str(), className.c_str());

src/main.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "common.h"
1515
#include "argumentparser.h"
1616
#include "logger.h"
17-
#include "md5support.h"
1817

1918
//#define ENABLE_BREAKPOINT_DEBUGGING
2019

0 commit comments

Comments
 (0)