diff --git a/ChangeLog.txt b/ChangeLog.txt index 3db72c5..6435dcd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -32,7 +32,7 @@ Version 3.8.5 (2014-12-21) - Fixed user cyl range being ignored when writing extended TRD images - Fixed crash when reading UDI images containing blank tracks - Fixed potential crash when removing duplicate sector copies -- Fixed comment and label propogation from source to target +- Fixed comment and label propagation from source to target Version 3.8.4 (2014-08-26) -------------------------- diff --git a/include/Track.h b/include/Track.h index 70e4133..04a3e19 100644 --- a/include/Track.h +++ b/include/Track.h @@ -58,7 +58,7 @@ class Track private: std::vector m_sectors{}; - // Max bitstream position difference for sectors to be considerd the same. + // Max bitstream position difference for sectors to be considered the same. // Used to match sectors between revolutions, and needs to cope with the // larger sync differences after weak sectors. We still require the header // to match, so only close repeated headers should be a problem. diff --git a/include/ioapi.h b/include/ioapi.h index 99aa61c..c8bd004 100644 --- a/include/ioapi.h +++ b/include/ioapi.h @@ -80,7 +80,7 @@ #include "mz64conf.h" #endif -/* a type choosen by DEFINE */ +/* a type chosen by DEFINE */ #ifdef HAVE_64BIT_INT_CUSTOM typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T; #else diff --git a/include/unzip.h b/include/unzip.h index a9223b7..a84fc3a 100644 --- a/include/unzip.h +++ b/include/unzip.h @@ -157,10 +157,10 @@ extern "C" { int iCaseSensitivity)); /* Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi or strcasecmp) - If iCaseSenisivity = 0, case sensitivity is defaut of your operating system + If iCaseSenisivity = 0, case sensitivity is default of your operating system (like 1 on Unix, 2 on Windows) */ @@ -306,7 +306,7 @@ extern "C" { uLong commentBufferSize)); /* Get Info about the current file - if pfile_info!=NULL, the *pfile_info structure will contain somes info about + if pfile_info!=NULL, the *pfile_info structure will contain some info about the current file if szFileName!=NULL, the filemane string will be copied in szFileName (fileNameBufferSize is the size of the buffer) @@ -386,7 +386,7 @@ extern "C" { buf contain buffer where data must be copied len the size of buf. - return the number of byte copied if somes bytes are copied + return the number of byte copied if some bytes are copied return 0 if the end of file was reached return <0 with error code if there is an error (UNZ_ERRNO for IO error, or zLib error for uncompress error) diff --git a/src/BlockDevice.cpp b/src/BlockDevice.cpp index 35616ab..93429be 100644 --- a/src/BlockDevice.cpp +++ b/src/BlockDevice.cpp @@ -273,7 +273,7 @@ bool BlockDevice::SafetyCheck() std::string sVolume = lVolumes.at(i); std::string sRoot = sVolume + "\\"; - // Only accept drives with a known filesystem, as drive letters exist for removeable + // Only accept drives with a known filesystem, as drive letters exist for removable // media even if no disk is preset, or if the filesystem is unknown if (GetVolumeInformation(sRoot.c_str(), szVolName, sizeof(szVolName), nullptr, nullptr, nullptr, nullptr, 0)) { diff --git a/src/DiskUtil.cpp b/src/DiskUtil.cpp index 59ad3d0..8f97891 100644 --- a/src/DiskUtil.cpp +++ b/src/DiskUtil.cpp @@ -609,7 +609,7 @@ bool RepairTrack(const CylHead& cylhead, Track& track, const Track& src_track) if (src_track.is_repeated(src_sector)) continue; - // In real-world use 250Kbps/300Kbps are interchangable due to 300rpm/360rpm. + // In real-world use 250Kbps/300Kbps are interchangeable due to 300rpm/360rpm. if (!track.empty() && (track[0].datarate == DataRate::_250K || track[0].datarate == DataRate::_300K) && (src_sector.datarate == DataRate::_250K || src_sector.datarate == DataRate::_300K)) diff --git a/src/FluxTrackBuilder.cpp b/src/FluxTrackBuilder.cpp index 5d9ee11..f3fe2dc 100644 --- a/src/FluxTrackBuilder.cpp +++ b/src/FluxTrackBuilder.cpp @@ -43,7 +43,7 @@ void FluxTrackBuilder::addWeakBlock(int length) addRawBit(1); addRawBit(1); - // Approximately 11 ambigious reversals per weak byte. + // Approximately 11 ambiguous reversals per weak byte. length = length * 21 / 2; while (length-- > 0) diff --git a/src/MemFile.cpp b/src/MemFile.cpp index 9178931..ea93722 100644 --- a/src/MemFile.cpp +++ b/src/MemFile.cpp @@ -91,7 +91,7 @@ bool MemFile::open(const std::string& path_, bool uncompress) break; } - // Rememeber the largest uncompressed file size + // Remember the largest uncompressed file size if (sInfo.uncompressed_size > ulMaxSize) ulMaxSize = sInfo.uncompressed_size; } diff --git a/src/Sector.cpp b/src/Sector.cpp index 5009fa0..dc49a4d 100644 --- a/src/Sector.cpp +++ b/src/Sector.cpp @@ -87,7 +87,7 @@ Sector::Merge Sector::add(Data&& new_data, bool bad_crc, uint8_t new_dam) } #endif - // If the exising sector has good data, ignore supplied data if it's bad + // If the existing sector has good data, ignore supplied data if it's bad if (bad_crc && has_good_data()) return Merge::Unchanged; diff --git a/src/cmd_dir.cpp b/src/cmd_dir.cpp index 41760e0..310a9da 100644 --- a/src/cmd_dir.cpp +++ b/src/cmd_dir.cpp @@ -417,7 +417,7 @@ bool DirOpus(Disk& disk) /* -128-191 System variables with format informations (this section is a BIG garbage, only few people can understand it) +128-191 System variables with format information (this section is a BIG garbage, only few people can understand it) 192-201 Name of disk (10 chars) 202,203 randomly generated 16-bit number for recognize two disks with same name 204-207 MDOS identification bytes, here staying text "SDOS", so MDOS can identify his format on disk diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp index b4c2fe2..b244167 100644 --- a/src/cmd_list.cpp +++ b/src/cmd_list.cpp @@ -383,7 +383,7 @@ bool ListDrives(int nVerbose_) else if (!num_opened) #ifdef _WIN32 - util::cout << "No drives found. Run as Adminstrator to list system drives.\n"; + util::cout << "No drives found. Run as Administrator to list system drives.\n"; #else util::cout << "No drives found -- need root?\n"; #endif diff --git a/src/unzip.c b/src/unzip.c index d7fbb93..b198a1e 100644 --- a/src/unzip.c +++ b/src/unzip.c @@ -53,8 +53,8 @@ Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G should only read the compressed/uncompressed size from the Zip64 format if the size from normal header was 0xFFFFFFFF - Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant - Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required) + Oct-2009 - Mathias Svensson - Applied some bug fixes from patches received from Gilles Vollant + Oct-2009 - Mathias Svensson - Applied support to unzip files with compression method BZIP2 (bzip2 lib is required) Patch created by Daniel Borca Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer @@ -156,7 +156,7 @@ typedef struct ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */ ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/ zlib_filefunc64_32_def z_filefunc; - voidpf filestream; /* io structore of the zipfile */ + voidpf filestream; /* io structure of the zipfile */ uLong compression_method; /* compression method (0==store) */ ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ int raw; @@ -169,7 +169,7 @@ typedef struct { zlib_filefunc64_32_def z_filefunc; int is64bitOpenFunction; - voidpf filestream; /* io structore of the zipfile */ + voidpf filestream; /* io structure of the zipfile */ unz_global_info64 gi; /* public global information */ ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ ZPOS64_T num_file; /* number of the current file in the zipfile*/ @@ -203,7 +203,7 @@ typedef struct /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been sucessfully opened for reading. + IN assertion: the stream s has been successfully opened for reading. */ @@ -383,10 +383,10 @@ local int strcmpcasenosensitive_internal(const char* fileName1, const char* file /* Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi or strcasecmp) - If iCaseSenisivity = 0, case sensitivity is defaut of your operating system + If iCaseSenisivity = 0, case sensitivity is default of your operating system (like 1 on Unix, 2 on Windows) */ @@ -594,9 +594,9 @@ local unzFile unzOpenInternal(const void* path, uLong uL; uLong number_disk; /* number of the current dist, used for - spaning ZIP, unsupported, always 0*/ + spanning ZIP, unsupported, always 0*/ uLong number_disk_with_CD; /* number the the disk with central dir, used - for spaning ZIP, unsupported, always 0*/ + for spanning ZIP, unsupported, always 0*/ ZPOS64_T number_entry_CD; /* total number of entries in the central dir (same than number_entry on nospan) */ @@ -850,7 +850,7 @@ extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info3 return UNZ_OK; } /* - Translate date/time from Dos format to tm_unz (readable more easilty) + Translate date/time from Dos format to tm_unz (readable more easily) */ local void unz64local_DosDateToTmuDate(ZPOS64_T ulDosDate, tm_unz* ptm) { @@ -1677,7 +1677,7 @@ extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file) buf contain buffer where data must be copied len the size of buf. - return the number of byte copied if somes bytes are copied + return the number of byte copied if some bytes are copied return 0 if the end of file was reached return <0 with error code if there is an error (UNZ_ERRNO for IO error, or zLib error for uncompress error)