Improved code quality for logic that shrinks the message size when header injection is turned off.

Bumped minor revision number.

git-svn-id: https://svn.microneil.com/svn/SNFMulti/trunk@43 dc71a809-1921-45c4-985c-09c81d0142d9

SNFMulti.cpp

@@ -23,7 +23,7 @@ using namespace std;
 
 //// Version Info
 
-const char* SNF_ENGINE_VERSION = "SNFMulti Engine Version 3.0.21 Build: " __DATE__ " " __TIME__;
+const char* SNF_ENGINE_VERSION = "SNFMulti Engine Version 3.0.22 Build: " __DATE__ " " __TIME__;
 
 //// Script Caller Methods
 
@@ -983,10 +983,10 @@ int snf_EngineHandler::scanMessageFile(
         throw FileError("snf_EngineHandler::scanMessageFile() FileEmpty!");
     }
 
-    bool NoNeedToReadFullFile = (false == MyScanData.XHeaderInjectOn);
-    bool FileSizeLargerThanScanHorizon = (MessageFileSize > snf_ScanHorizon);
-    if(NoNeedToReadFullFile && FileSizeLargerThanScanHorizon) {
-        MessageFileSize = snf_ScanHorizon;
+    bool isXHeaderInjectionOn = (MyScanData.XHeaderInjectOn);
+    bool isNoNeedToReadFullFile = (false == isXHeaderInjectionOn);
+    if(isNoNeedToReadFullFile) {
+        MessageFileSize = min(MessageFileSize, snf_ScanHorizon);
     }
 
     vector<unsigned char> MessageBuffer;                                        // Allocate a buffer and size
@@ -1021,7 +1021,7 @@ int snf_EngineHandler::scanMessageFile(
 
     // Inject headers if required.
 
-    if(MyScanData.XHeaderInjectOn) {                                            // If we are to inject headers:
+    if(isXHeaderInjectionOn) {                                                  // If we are to inject headers:
         const char* XHDRInjStage = "Begin";                                     // Keep track of what we're doing.
         try {