all: normalized ShortString type casing

Author: Arnaud Bouchez

src/core/mormot.core.base.pas

@@ -958,7 +958,7 @@ procedure AppendShortCurr64(const value: Int64; var dest: ShortString;
   fixeddecimals: PtrInt = 0);
 
 /// simple concatenation of no banker rounding floating point value as TwoDigits()
-procedure AppendShortTwoDigits(const Value: double; var Dest: shortstring);
+procedure AppendShortTwoDigits(const Value: double; var Dest: ShortString);
 
 /// simple concatenation of a character into a @shorstring, checking its length
 // - dest is @shortstring and not shortstring to circumvent a Delphi inlining bug
@@ -4418,7 +4418,7 @@   TSynMemoryStream = class(TCustomMemoryStream)
   end;
 
 /// raise a EStreamError exception - e.g. from TSynMemoryStream.Write
-function RaiseStreamError(Caller: TObject; const Context: shortstring): PtrInt;
+function RaiseStreamError(Caller: TObject; const Context: ShortString): PtrInt;
 
 
 { ************ Raw Shared Constants / Types Definitions }
@@ -5392,7 +5392,7 @@ procedure AppendShortCurr64(const value: Int64; var dest: ShortString;
   AppendShortBuffer(p, l, @dest);
 end;
 
-procedure AppendShortTwoDigits(const Value: double; var Dest: shortstring);
+procedure AppendShortTwoDigits(const Value: double; var Dest: ShortString);
 var
   v: Int64;
 begin
@@ -12920,8 +12920,8 @@ function SortDynArrayPUtf8Char(const A, B): integer;
 
 function SortDynArrayShortString(const A, B): integer;
 var
-  sa: shortstring absolute A;
-  sb: shortstring absolute B;
+  sa: ShortString absolute A;
+  sb: ShortString absolute B;
   la, lb: PtrInt;
 begin
   la := ord(sa[0]);
@@ -13051,7 +13051,7 @@ procedure Exchg(P1, P2: PAnsiChar; count: PtrInt);
 
 { ************ Some Convenient TStream descendants }
 
-function {%H-}RaiseStreamError(Caller: TObject; const Context: shortstring): PtrInt;
+function {%H-}RaiseStreamError(Caller: TObject; const Context: ShortString): PtrInt;
 begin
   raise EStreamError.CreateFmt('Unexpected %s.%s', [ClassNameShort(Caller)^, Context]);
 end;

src/core/mormot.core.buffers.pas

@@ -215,7 +215,7 @@   TAlgoCompress = class
     fAlgoID: byte;
     fAlgoHasForcedFormat: boolean;
     fAlgoFileExt: TFileName;
-    procedure EnsureAlgoHasNoForcedFormat(const caller: shortstring);
+    procedure EnsureAlgoHasNoForcedFormat(const caller: ShortString);
   public
     /// computes by default the crc32c() digital signature of the buffer
     function AlgoHash(Previous: cardinal;
@@ -691,7 +691,7 @@   TFastReader = record
     /// raise a EFastReader with "Incorrect Data: ...." error message
     procedure ErrorData(const fmt: RawUtf8; const args: array of const); overload;
     /// raise a EFastReader with "Incorrect Data: ...." error message
-    procedure ErrorData(const msg: shortstring); overload;
+    procedure ErrorData(const msg: ShortString); overload;
     /// read the next 32-bit signed value from the buffer
     function VarInt32: integer;
       {$ifdef HASINLINE}inline;{$endif}
@@ -2784,7 +2784,7 @@   TRawByteStringBuffer = record
       {$ifdef HASINLINE}inline;{$endif}
     /// add some number as text content to the Buffer, resizing it if needed
     procedure Append(Value: QWord); overload;
-    /// add some UTF-8 shortstring content to the Buffer, resizing it if needed
+    /// add some UTF-8 ShortString content to the Buffer, resizing it if needed
     procedure AppendShort(const Text: ShortString);
       {$ifdef HASINLINE}inline;{$endif}
     /// just after Append/AppendShort, append a #13#10 end of line
@@ -3554,7 +3554,7 @@ procedure TFastReader.ErrorData(const fmt: RawUtf8; const args: array of const);
     raise EFastReader.CreateUtf8('Incorrect Data: ' + fmt, args);
 end;
 
-procedure TFastReader.ErrorData(const msg: shortstring);
+procedure TFastReader.ErrorData(const msg: ShortString);
 begin
   ErrorData('%', [msg]);
 end;
@@ -5300,7 +5300,7 @@ function TAlgoCompress.AlgoName: TShort16;
   end;
 end;
 
-procedure TAlgoCompress.EnsureAlgoHasNoForcedFormat(const caller: shortstring);
+procedure TAlgoCompress.EnsureAlgoHasNoForcedFormat(const caller: ShortString);
 begin
   if fAlgoHasForcedFormat then
     EAlgoCompress.RaiseUtf8('%.% is unsupported', [self, caller]);

src/core/mormot.core.data.pas

@@ -1883,7 +1883,7 @@   TDynArrayHasher = record
       {$ifdef HASINLINE}inline;{$endif}
     procedure HashAdd(aHashCode: cardinal; var result: PtrInt);
     procedure HashDelete(aArrayIndex, aHashTableIndex: PtrInt; aHashCode: cardinal);
-    function RaiseFatalCollision(const caller: shortstring; aHashCode: cardinal): integer;
+    function RaiseFatalCollision(const caller: ShortString; aHashCode: cardinal): integer;
     procedure RaiseNoHasher;
     procedure HashTableInit(aHasher: THasher);
     procedure SetEventCompare(const Value: TOnDynArraySortCompare);
@@ -9793,7 +9793,7 @@ function TDynArrayHasher.FindBeforeDelete(Item: pointer): PtrInt;
     result := -1;
 end;
 
-function TDynArrayHasher.RaiseFatalCollision(const caller: shortstring;
+function TDynArrayHasher.RaiseFatalCollision(const caller: ShortString;
   aHashCode: cardinal): integer;
 begin   // a dedicated sub-procedure reduces code size
   result := 0; // make compiler happy

src/core/mormot.core.datetime.pas

@@ -527,7 +527,7 @@   TSynSystemTime = record
     // - returns the number of chars added to P, i.e. always 21
     function ToNcsaText(P: PUtf8Char): PtrInt;
     /// convert the stored date and time to its text in apache-like format
-    procedure ToNcsaShort(var text: shortstring; const tz: RawUtf8 = 'GMT');
+    procedure ToNcsaShort(var text: ShortString; const tz: RawUtf8 = 'GMT');
     /// convert the stored date and time to its text in HTTP-like format
     // - i.e. "Tue, 15 Nov 1994 12:45:26 GMT" to be used as a value of
     // "Date", "Expires" or "Last-Modified" HTTP header
@@ -536,12 +536,12 @@   TSynSystemTime = record
       const prefix: RawUtf8 = '');
     /// convert the stored date and time to its text in HTTP-like format
     // - e.g. "Tue, 15 Nov 1994 12:45:26 GMT"
-    procedure ToHttpDateShort(var text: shortstring; const tz: RawUtf8 = 'GMT';
+    procedure ToHttpDateShort(var text: ShortString; const tz: RawUtf8 = 'GMT';
       const prefix: RawUtf8 = '');
     /// convert the stored date into its '19 Sep 2023' English-readable date text
     procedure ToTextDateShort(var text: TShort15);
     /// convert the stored date and time into its Iso-8601 text, with no Milliseconds
-    procedure ToIsoDateTimeShort(var text: shortstring; FirstTimeChar: AnsiChar = 'T');
+    procedure ToIsoDateTimeShort(var text: ShortString; FirstTimeChar: AnsiChar = 'T');
     /// convert the stored date and time into its Iso-8601 text, with no Milliseconds
     procedure ToIsoDateTime(out text: RawUtf8; FirstTimeChar: AnsiChar = 'T');
     /// convert the stored date into its Iso-8601 text with no time part
@@ -2544,7 +2544,7 @@ procedure TSynSystemTime.AddNcsaText(WR: TTextWriter; const TZD: RawUtf8);
 
 procedure TSynSystemTime.AddHttpDate(WR: TTextWriter; const TZD: RawUtf8);
 var
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   ToHttpDateShort(tmp, TZD);
   WR.AddShort(tmp);
@@ -2580,22 +2580,22 @@ function TSynSystemTime.ToNcsaText(P: PUtf8Char): PtrInt;
   result := 21;
 end;
 
-procedure TSynSystemTime.ToNcsaShort(var text: shortstring; const tz: RawUtf8);
+procedure TSynSystemTime.ToNcsaShort(var text: ShortString; const tz: RawUtf8);
 begin
   text[0] := AnsiChar(ToNcsaText(@text[1]));
   AppendShortAnsi7String(tz, text);
 end;
 
 procedure TSynSystemTime.ToHttpDate(out text: RawUtf8; const tz, prefix: RawUtf8);
 var
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   ToHttpDateShort(tmp, tz, prefix);
   FastSetString(text, @tmp[1], ord(tmp[0]));
 end;
 
 procedure TSynSystemTime.ToHttpDateShort(
-  var text: shortstring; const tz, prefix: RawUtf8);
+  var text: ShortString; const tz, prefix: RawUtf8);
 begin
   if DayOfWeek = 0 then
     PSynDate(@self)^.ComputeDayOfWeek; // first 4 fields do match
@@ -2620,13 +2620,13 @@ procedure TSynSystemTime.ToTextDateShort(var text: TShort15);
 
 procedure TSynSystemTime.ToIsoDateTime(out text: RawUtf8; FirstTimeChar: AnsiChar);
 var
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   ToIsoDateTimeShort(tmp, FirstTimeChar);
   ShortStringToAnsi7String(tmp, text);
 end;
 
-procedure TSynSystemTime.ToIsoDateTimeShort(var text: shortstring;
+procedure TSynSystemTime.ToIsoDateTimeShort(var text: ShortString;
   FirstTimeChar: AnsiChar);
 begin
   FormatShort('%-%-%%%:%:%', [
@@ -2945,7 +2945,7 @@ function HttpDateNowUtc(Tix64: Int64): THttpDateNowUtc;
 var
   c: cardinal;
   T: TSynSystemTime;
-  now: shortstring; // use a temp variable for _HttpDateNowUtc atomic set
+  now: ShortString; // use a temp variable for _HttpDateNowUtc atomic set
 begin
   if Tix64 = 0 then
     Tix64 := GetTickCount64;

src/core/mormot.core.fpcx64mm.pas

@@ -2985,7 +2985,7 @@ function SetSmallBlockContention(var res: TResArray; maxcount: integer): integer
   WrStrPos: PtrInt;
   WrStrOnSameLine: boolean;
 
-procedure W(const txt: shortstring);
+procedure W(const txt: ShortString);
 var
   p, n: PtrInt;
 begin
@@ -3004,11 +3004,11 @@ procedure W(const txt: shortstring);
   K_: array[0..4] of string[1] = (
     'P', 'T', 'G', 'M', 'K');
 
-procedure K(const txt: shortstring; i: PtrUInt);
+procedure K(const txt: ShortString; i: PtrUInt);
 var
   j, n: PtrUInt;
   kk: PShortString;
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   W(txt);
   kk := nil;
@@ -3028,16 +3028,16 @@ procedure K(const txt: shortstring; i: PtrUInt);
     W(kk^);
 end;
 
-procedure S(const txt: shortstring; i: PtrUInt);
+procedure S(const txt: ShortString; i: PtrUInt);
 var
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   W(txt);
   str(i, tmp);
   W(tmp);
 end;
 
-procedure LF(const txt: shortstring = '');
+procedure LF(const txt: ShortString = '');
 begin
   if txt[0] <> #0 then
     W(txt);
@@ -3048,7 +3048,7 @@ procedure LF(const txt: shortstring = '');
 end;
 
 procedure WriteHeapStatusDetail(const arena: TMMStatusArena;
-  const name: shortstring);
+  const name: ShortString);
 begin
   K(name, arena.CurrentBytes);
   K('B/', arena.CumulativeBytes);
@@ -3063,7 +3063,7 @@ procedure WriteHeapStatusDetail(const arena: TMMStatusArena;
   LF;
 end;
 
-function GetHeapStatus(const context: shortstring; smallblockstatuscount,
+function GetHeapStatus(const context: ShortString; smallblockstatuscount,
   smallblockcontentioncount: integer; compilationflags, onsameline: boolean): PAnsiChar;
 var
   res: TResArray; // no heap allocation involved
@@ -3160,7 +3160,7 @@ function GetHeapStatus(const context: shortstring; smallblockstatuscount,
   result := @WrStrBuf;
 end;
 
-procedure WriteHeapStatus(const context: shortstring; smallblockstatuscount,
+procedure WriteHeapStatus(const context: ShortString; smallblockstatuscount,
   smallblockcontentioncount: integer; compilationflags: boolean);
 begin
   GetHeapStatus(context,  smallblockstatuscount, smallblockcontentioncount,

src/core/mormot.core.interfaces.pas

@@ -2582,7 +2582,7 @@ function PerThreadRunningContextAddress: pointer;
     [optExecInMainThread, optFreeInMainThread]);
 
 /// return the interface execution options set as text
-function ToText(opt: TInterfaceMethodOptions): shortstring; overload;
+function ToText(opt: TInterfaceMethodOptions): ShortString; overload;
 
 
 { ************ SetWeak and SetWeakZero Weak Interface Reference }
@@ -6624,7 +6624,7 @@ function PerThreadRunningContextAddress: pointer;
   result := @PerThreadRunningContext;
 end;
 
-function ToText(opt: TInterfaceMethodOptions): shortstring;
+function ToText(opt: TInterfaceMethodOptions): ShortString;
 begin
   GetSetNameShort(TypeInfo(TInterfaceMethodOptions), opt, result);
 end;

src/core/mormot.core.json.pas

@@ -4618,7 +4618,7 @@ function GetSetNameValue(Names: PShortString; MinValue, MaxValue: integer;
   var P: PUtf8Char; out EndOfObject: AnsiChar): QWord;
 var
   info: TGetJsonField;
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   result := 0;
   if (P = nil) or
@@ -11705,7 +11705,7 @@ function RecordLoadJson(var Rec; const Json: RawUtf8; TypeInfo: PRttiInfo;
     JSONPARSER_DEFAULTORTOLERANTOPTIONS[Tolerant], CustomVariantOptions, Interning);
 end;
 
-function EnsureDynArray(const Ctxt: shortstring;
+function EnsureDynArray(const Ctxt: ShortString;
   TypeInfo: PRttiInfo; Tolerant, GuessCount: boolean): TJsonParserOptions;
 begin
   if (TypeInfo = nil) or

src/core/mormot.core.log.pas

@@ -5480,7 +5480,7 @@ procedure TSynLog.AddErrorMessage(Error: cardinal);
 
 procedure TSynLog.AddSysInfo;
 var
-  tmp: shortstring;
+  tmp: ShortString;
 begin
   fWriter.AddDirect(' ', '{');
   RetrieveSysInfoText(tmp);