Merge pull request #46 from fgouget/spelling

Assorted spelling and typo fixes.

PORTING

@@ -5,13 +5,13 @@ compilers and operating systems:
   gcc 3.2               on  CygWin 1.3.22
   gcc 3.2.2             on  Red Hat Linux 9.0
 
-If you wish to compile par2cmdline under a different environent, then you
+If you wish to compile par2cmdline under a different enviromnent, then you
 should start by trying to compile with the supplied Makefile.
 
 If you get compile errors, then the most likely place you will need to make
 changes will be in par2cmdline.h, diskfile.h, and diskfile.cpp.
 
 See the file ROADMAP for details of what each of the source files is used for.
 
-If you succesfully port par2cmdline, it would be appreciated if you could post
+If you successfully port par2cmdline, it would be appreciated if you could post
 the details on the parchive web site at http://sourceforge.net/parchive.

commandline.h

@@ -128,7 +128,7 @@ class CommandLine
   u32 firstblock;              // What the exponent value for the first
                                // recovery block will be.
 
-  Scheme recoveryfilescheme;   // How the the size of the recovery files should
+  Scheme recoveryfilescheme;   // How the size of the recovery files should
                                // be calculated.
 
   u32 recoveryfilecount;       // How many recovery files should be created.
@@ -162,7 +162,7 @@ class CommandLine
                                // for the output buffer when creating
                                // or repairing.
 
-  bool purgefiles;             // purge backup and par files on successfull
+  bool purgefiles;             // purge backup and par files on success
                                // recovery
   bool recursive;              // recurse into subdirectories
 };

criticalpacket.h

@@ -35,7 +35,7 @@ class CriticalPacket
   // Write a copy of the packet to the specified file at the specified offset
   bool    WritePacket(DiskFile &diskfile, u64 fileoffset) const;
 
-  // Obtain the lenght of the packet.
+  // Obtain the length of the packet.
   size_t  PacketLength(void) const;
 
   // Allocate some memory for the packet (plus some extra padding).

depcomp

@@ -286,7 +286,7 @@ icc)
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # At least on Alpha/Red Hat 6.1, Compaq CCC V6.2-504 seems to put
    # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`

descriptionpacket.h

@@ -94,7 +94,7 @@ inline const MD5Hash& DescriptionPacket::HashFull(void) const
   return ((const FILEDESCRIPTIONPACKET*)packetdata)->hashfull;
 }
 
-// The the hash of the first 16k of the file from the packet
+// The hash of the first 16k of the file from the packet
 inline const MD5Hash& DescriptionPacket::Hash16k(void) const
 {
   assert(packetdata != 0);

par1repairer.cpp

@@ -529,7 +529,7 @@ bool Par1Repairer::LoadOtherRecoveryFiles(string filename)
     {
       string tail = filename.substr(where+1);
 
-      // Check the the file extension is the correct form
+      // Check the file extension is the correct form
       if ((tail[0] == 'P' || tail[0] == 'p') &&
           (
             ((tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r'))
@@ -560,7 +560,7 @@ bool Par1Repairer::LoadExtraRecoveryFiles(const list<CommandLine::ExtraFile> &ex
     {
       string tail = filename.substr(where+1);
 
-      // Check the the file extension is the correct form
+      // Check the file extension is the correct form
       if ((tail[0] == 'P' || tail[0] == 'p') &&
           (
             ((tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r'))
@@ -668,7 +668,7 @@ bool Par1Repairer::VerifyExtraFiles(const list<CommandLine::ExtraFile> &extrafil
     {
       string tail = filename.substr(where+1);
 
-      // Check the the file extension is the correct form
+      // Check the file extension is the correct form
       if ((tail[0] == 'P' || tail[0] == 'p') &&
           (
             ((tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r'))

par2cmdline.h

@@ -233,7 +233,7 @@ typedef enum Result
                                      // still appear to be damaged.
 
 
-  eFileIOError                 = 6,  // An error occured when accessing files
+  eFileIOError                 = 6,  // An error occurred when accessing files
   eLogicError                  = 7,  // In internal error occurred
   eMemoryError                 = 8,  // Out of memory
 

par2creator.cpp

@@ -227,7 +227,7 @@ bool Par2Creator::ComputeBlockSizeAndBlockCount(const list<CommandLine::ExtraFil
       // The block count cannot be less than the number of files.
 
       cerr << "Block count (" << sourceblockcount <<
-              ") can not be smaller than the number of files(" << extrafiles.size() << "). " << endl;
+              ") cannot be smaller than the number of files(" << extrafiles.size() << "). " << endl;
       return false;
     }
     else if (sourceblockcount == extrafiles.size())

par2creator.h

@@ -102,7 +102,7 @@ class Par2Creator
 
   u32 sourcefilecount;   // Number of source files for which recovery data will be computed.
   u32 sourceblockcount;  // Total number of data blocks that the source files will be
-                         // virtualy sliced into.
+                         // virtually sliced into.
 
   u64 largestfilesize;   // The size of the largest source file
 

par2repairer.cpp

@@ -740,7 +740,7 @@ bool Par2Repairer::LoadPacketsFromOtherFiles(string filename)
       }
     }
 
-    // If we matched then retain only what preceeds the "."
+    // If we matched then retain only what precedes the "."
     if (p == tail.end())
     {
       name = name.substr(0,where);

recoverypacket.cpp

@@ -67,7 +67,7 @@ void RecoveryPacket::Create(DiskFile      *_diskfile,
   packetcontext->Update(&packet.header.setid, 
                         sizeof(RECOVERYBLOCKPACKET)-offsetof(RECOVERYBLOCKPACKET, header.setid));
 
-  // Set the data block to immediatly follow the header on disk
+  // Set the data block to immediately follow the header on disk
   datablock.SetLocation(_diskfile, _offset + sizeof(packet));
   datablock.SetLength(_blocksize);
 }
@@ -118,7 +118,7 @@ bool RecoveryPacket::Load(DiskFile      *_diskfile,
   // Save the fixed header
   packet.header = _header;
 
-  // Set the data block to immediatly follow the header on disk
+  // Set the data block to immediately follow the header on disk
   datablock.SetLocation(diskfile, offset + sizeof(packet));
   datablock.SetLength(packet.header.length - sizeof(packet));
 

recoverypacket.h

@@ -54,10 +54,10 @@ class RecoveryPacket
   bool Load(DiskFile *diskfile, u64 offset, PACKET_HEADER &header);
 
 public:
-  // Get the lenght of the packet.
+  // Get the length of the packet.
   u64 PacketLength(void) const;
 
-  // The the exponent of the packet.
+  // The exponent of the packet.
   u32 Exponent(void) const;
 
   // The length of the recovery data

tests/test16

@@ -9,7 +9,7 @@ mkdir run$testname && cd run$testname || { echo "ERROR: Could not change to test
 
 tar -xf ../flatdata.tar.gz || { echo "ERROR: Could not extract data test files" ; exit 1; } >&2
 
-banner="dont allow files outside par2 basedir, (issue #34, #36)"
+banner="don't allow files outside par2 basedir, (issue #34, #36)"
 dashes=`echo "$banner" | sed s/./-/g`
 
 echo $dashes

verificationhashtable.cpp

@@ -73,7 +73,7 @@ void VerificationHashTable::Load(Par2RepairerSourceFile *sourcefile, u64 blocksi
   VerificationPacket *verificationpacket = sourcefile->GetVerificationPacket();
   u32 blockcount                         = verificationpacket->BlockCount();
 
-  // Iterate throught the data blocks for the source file and the verification
+  // Iterate through the data blocks for the source file and the verification
   // entries in the verification packet.
   vector<DataBlock>::iterator sourceblocks       = sourcefile->SourceBlocks();
   const FILEVERIFICATIONENTRY *verificationentry = verificationpacket->VerificationEntry(0);