* Extention -> extension (By Reinier, bug ID #25979)

git-svn-id: trunk@27757 -

tests/utils/avx/avxtestfilecmp.pp

@@ -24,9 +24,9 @@ begin
         writeln('');
         writeln('-h  help');
         writeln('-m  sourcefile mask');
-        writeln('-n  sourcefile extention');
+        writeln('-n  sourcefile extension');
         writeln('-d  destination path');
-        writeln('-e  destinationfile extention');
+        writeln('-e  destinationfile extension');
         writeln('-s  silent');
         writeln('');
         {$IFDEF WINDOWS}
@@ -44,25 +44,25 @@ begin
 
         if ExtractFileExt(sm) = '' then
         begin
-          if trim(SourceFileExtention) <> '' then
+          if trim(SourceFileExtension) <> '' then
           begin
-            if copy(SourceFileExtention, 1, 1) <> '.' then sm := sm + '.' + SourceFileExtention
-             else sm := sm + SourceFileExtention;
+            if copy(SourceFileExtension, 1, 1) <> '.' then sm := sm + '.' + SourceFileExtension
+             else sm := sm + SourceFileExtension;
           end;
         end;
 
         if (ExtractFilePath(sm) = DestPath) and
-           (DestFileExtention = '') then
+           (DestFileExtension = '') then
         begin
           writeln(format('Do you want compare the same files (sourcepath: "%s"  destination path: "%s"). [Y/N]',
                          [ExtractFilePath(sm), DestPath]));
 
           read(ch);
-          if ch in ['Y', 'y', 'J', 'N'] then CompareFiles(NoSourceFileExtention, NoDestFileExtention, Silent,
-                                                          sm, DestPath, DestFileExtention);
+          if ch in ['Y', 'y', 'J', 'N'] then CompareFiles(NoSourceFileExtension, NoDestFileExtension, Silent,
+                                                          sm, DestPath, DestFileExtension);
         end
-        else CompareFiles(NoSourceFileExtention, NoDestFileExtention, Silent,
-                          sm, DestPath, DestFileExtention);
+        else CompareFiles(NoSourceFileExtension, NoDestFileExtension, Silent,
+                          sm, DestPath, DestFileExtension);
       end;
     finally
       Free;

tests/utils/avx/cmpoptions.pas

@@ -11,12 +11,12 @@ type
   TOptions = class(TObject)
   private
     FHelp: boolean;
-    FNoDestFileExtention: boolean;
-    FNoSourceFileExtention: boolean;
+    FNoDestFileExtension: boolean;
+    FNoSourceFileExtension: boolean;
     FSilent: boolean;
-    FSourceFileExtention: String;
+    FSourceFileExtension: String;
     FSourceMask: String;
-    FDestFileExtention: String;
+    FDestFileExtension: String;
     FDestPath: String;
   public
     constructor Create;
@@ -25,12 +25,12 @@ type
 
     property Help                 : boolean read FHelp write FHelp;
     property SourceMask           : String read FSourceMask write FSourceMask;
-    property SourceFileExtention  : String read FSourceFileExtention write FSourceFileExtention;
-    property NoSourceFileExtention: boolean read FNoSourceFileExtention;
+    property SourceFileExtension  : String read FSourceFileExtension write FSourceFileExtension;
+    property NoSourceFileExtension: boolean read FNoSourceFileExtension;
 
     property DestPath             : String read FDestPath write FDestPath;
-    property DestFileExtention    : String read FDestFileExtention write FDestFileExtention;
-    property NoDestFileExtention  : boolean read FNoDestFileExtention;
+    property DestFileExtension    : String read FDestFileExtension write FDestFileExtension;
+    property NoDestFileExtension  : boolean read FNoDestFileExtension;
     property Silent               : boolean read FSilent;
   end;
 
@@ -44,8 +44,8 @@ constructor TOptions.Create;
 begin
   FHelp                     := false;
   FSourceMask               := '';
-  FNoSourceFileExtention    := false;
-  FDestFileExtention        := '';
+  FNoSourceFileExtension    := false;
+  FDestFileExtension        := '';
   FDestPath                 := '';
   FSilent                   := false;
 end;
@@ -61,12 +61,12 @@ begin
    else FHelp := false;
 
   FSourceMask            := IncludeTrailingBackslash(GetCurrentDir) + '*.*';
-  FSourceFileExtention   := '';
-  FNoSourceFileExtention := false;
+  FSourceFileExtension   := '';
+  FNoSourceFileExtension := false;
 
   FDestPath              := IncludeTrailingBackslash(GetCurrentDir);
-  FDestFileExtention     := '';
-  FNoDestFileExtention   := false;
+  FDestFileExtension     := '';
+  FNoDestFileExtension   := false;
 
   FSilent := false;
 
@@ -89,8 +89,8 @@ begin
                 if ExtractFileName(FSourceMask) = '' then FSourceMask := FSourceMask + '*';
               end;
          'n': begin
-                FSourceFileExtention   := sValue;
-                FNoSourceFileExtention := FSourceFileExtention = '';
+                FSourceFileExtension   := sValue;
+                FNoSourceFileExtension := FSourceFileExtension = '';
               end;
          'd': begin
                 FDestPath := sValue;
@@ -99,8 +99,8 @@ begin
                  else FDestPath := ExpandFileName(FDestPath);
               end;
          'e': begin
-                FDestFileExtention := sValue;
-                FNoDestFileExtention := FDestFileExtention = '';
+                FDestFileExtension := sValue;
+                FNoDestFileExtension := FDestFileExtension = '';
               end;
          's': FSilent := true;
          else begin
@@ -111,17 +111,17 @@ begin
     end
     else IsInvalidParam := true;
 
-    if (FNoSourceFileExtention = false) and
-       (FSourceFileExtention = '') then
+    if (FNoSourceFileExtension = false) and
+       (FSourceFileExtension = '') then
     begin
-      FSourceFileExtention := ExtractFileExt(FSourceMask);
+      FSourceFileExtension := ExtractFileExt(FSourceMask);
     end
     else if (ExtractFileExt(FSourceMask) <> '') and
-            (FSourceFileExtention <> '') and
-            (ExtractFileExt(FSourceMask) <> FSourceFileExtention) then
+            (FSourceFileExtension <> '') and
+            (ExtractFileExt(FSourceMask) <> FSourceFileExtension) then
     begin
-      writeln(format('parameter conflict: different sourcefile extention "%s" and "%s"',
-                     [ExtractFileExt(FSourceMask), FSourceFileExtention]));
+      writeln(format('parameter conflict: different sourcefile extension "%s" and "%s"',
+                     [ExtractFileExt(FSourceMask), FSourceFileExtension]));
       FHelp := true;
     end;
 

tests/utils/avx/filecomparer.pas

@@ -16,7 +16,7 @@ type
 
     function Compare(const aFileName1, aFilename2: String; var aMsg: String): boolean;
   public
-    procedure CompareFiles(aNoSourcefileExt, aNoDestfileExt, aSilent: boolean; const aSourceMask, aDestPath, aDestFileExtention: String);
+    procedure CompareFiles(aNoSourcefileExt, aNoDestfileExt, aSilent: boolean; const aSourceMask, aDestPath, aDestFileExtension: String);
   end;
 
 
@@ -80,7 +80,7 @@ begin
   end;
 end;
 
-procedure TFileComparer.CompareFiles(aNoSourcefileExt, aNoDestfileExt, aSilent: boolean; const aSourceMask, aDestPath, aDestFileExtention: String);
+procedure TFileComparer.CompareFiles(aNoSourcefileExt, aNoDestfileExt, aSilent: boolean; const aSourceMask, aDestPath, aDestFileExtension: String);
 var
   i: integer;
   sl: TStringList;
@@ -89,16 +89,16 @@ var
   FileName: String;
   SourceFileName: String;
   DestFileName: String;
-  DestFileExtention: String;
+  DestFileExtension: String;
   Msg: String;
 begin
   Path := IncludeTrailingBackslash(ExtractFilePath(aSourceMask));
-  DestFileExtention := aDestFileExtention;
+  DestFileExtension := aDestFileExtension;
 
-  if (DestFileExtention <> '') and
-     (copy(DestFileExtention, 1, 1) <> '.') then
+  if (DestFileExtension <> '') and
+     (copy(DestFileExtension, 1, 1) <> '.') then
   begin
-    DestFileExtention := '.' + DestFileExtention;
+    DestFileExtension := '.' + DestFileExtension;
   end;
 
   sl := TStringList.Create;
@@ -113,7 +113,7 @@ begin
     begin
       sl.Sort;
 
-      if aDestFileExtention <> '' then
+      if aDestFileExtension <> '' then
       begin
         FileName := copy(sl[i], 1, length(sl[i]) - length(ExtractFileExt(sl[i])));
 
@@ -133,7 +133,7 @@ begin
       end;
 
       SourceFileName := Path + sl[i];
-      DestFileName := IncludeTrailingBackslash(aDestpath) + FileName + DestFileExtention;
+      DestFileName := IncludeTrailingBackslash(aDestpath) + FileName + DestFileExtension;
 
       if FileExists(SourceFileName) then
       begin