From 8e3158d9652dabaadb0045af88375a1e8213deee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Sat, 30 Oct 2021 18:15:26 +0200
Subject: [PATCH] * Some improvements/fix based on remarks of Alexey Torgashin

---
 packages/fcl-base/fpmake.pp       |  1 +
 packages/fcl-base/src/basenenc.pp | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp
index f7a3f8270f..c529120131 100644
--- a/packages/fcl-base/fpmake.pp
+++ b/packages/fcl-base/fpmake.pp
@@ -137,6 +137,7 @@ begin
     P.Sources.AddSrcFiles('src/win/fclel.*', P.Directory);
     // Install windows resources
     P.InstallFiles.Add('src/win/fclel.res',AllWindowsOSes,'$(unitinstalldir)');
+    T:=P.Targets.AddUnit('basenenc.pp');
 
     // Examples
     P.ExamplePath.Add('examples');
diff --git a/packages/fcl-base/src/basenenc.pp b/packages/fcl-base/src/basenenc.pp
index 4deed36ed1..ef00c6c0d0 100644
--- a/packages/fcl-base/src/basenenc.pp
+++ b/packages/fcl-base/src/basenenc.pp
@@ -37,7 +37,7 @@ Type
         '0123456789ABCDEF',
         'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567',
         '0123456789ABCDEFGHIJKLMNOPQRSTUV',
-        '0123456789ABCDEFGHJKMNPQRSTVWZYZ',
+        '0123456789ABCDEFGHJKMNPQRSTVWXYZ',
         'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
         'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_');
   Private
@@ -49,7 +49,7 @@ Type
     class function GetStdEncoder(AIndex: Integer): TAlphabetEncoder; static;
   public
     // Construct an encoder with alphabet, bits per letter, padding size in bits
-    Constructor Create(aAlphabet : AnsiString; aBits : Byte; aPadding : Integer); virtual;
+    Constructor Create(Const aAlphabet : AnsiString; aBits : Byte; aPadding : Integer); virtual;
     // Destroy all standard encoders
     Class Destructor Done;
     // Create a standard encoder. You must free the result
@@ -59,7 +59,7 @@ Type
     // Encode data in buffer aBuffer. If doPad is true, add padding if needed.
     Function Encode(aBuffer : TBytes; doPad : Boolean = True) : AnsiString; overload;
     // Encode data in string aBuffer. If doPad is true, add padding if needed.
-    Function Encode(aBuffer : AnsiString; doPad : Boolean = True) : AnsiString; overload;
+    Function Encode(const aBuffer : AnsiString; doPad : Boolean = True) : AnsiString; overload;
     // Decode aSrcBuffer with length aLen.
     // Buffer must have enough room. Calculate maximum needed room with GetDecodeLen
     Function Decode(const aSrcBuffer : PByte; aLen : Integer; ABuffer : PByte) : Integer; virtual; overload;
@@ -107,14 +107,14 @@ begin
 end;
 
 
-function TAlphabetEncoder.Encode(aBuffer: AnsiString; doPad : Boolean = True): AnsiString;
+function TAlphabetEncoder.Encode(Const aBuffer: AnsiString; doPad : Boolean = True): AnsiString;
 
 begin
   Result:=Encode(TEncoding.UTF8.GetAnsiBytes(aBuffer),DoPad);
 end;
 
 
-Constructor TAlphabetEncoder.Create(aAlphabet: AnsiString; aBits: Byte; aPadding: Integer);
+Constructor TAlphabetEncoder.Create(const aAlphabet: AnsiString; aBits: Byte; aPadding: Integer);
 
 Var
   I : Integer;