core: new AppendShortTwoChars() overload

Author: Arnaud Bouchez

src/core/mormot.core.base.pas

@@ -972,7 +972,12 @@ procedure AppendShortChar(chr: AnsiChar; dest: PAnsiChar);
 
 /// simple concatenation of two characters into a @shorstring
 // - dest is @shortstring and not shortstring to circumvent a Delphi inlining bug
-procedure AppendShortTwoChars(twochars, dest: PAnsiChar);
+procedure AppendShortTwoChars(twochars, dest: PAnsiChar); overload;
+  {$ifdef HASINLINE} inline; {$endif}
+
+/// simple concatenation of two characters (as 16-bit integer) into a @shorstring
+// - dest is @shortstring and not shortstring to circumvent a Delphi inlining bug
+procedure AppendShortTwoChars(twochars: cardinal; dest: PAnsiChar); overload;
   {$ifdef HASINLINE} inline; {$endif}
 
 /// simple concatenation of a #0 ending text into a @shorstring
@@ -5215,6 +5220,12 @@ procedure AppendShortTwoChars(twochars, dest: PAnsiChar);
   inc(dest[0], 2);
 end;
 
+procedure AppendShortTwoChars(twochars: cardinal; dest: PAnsiChar);
+begin
+  PWord(dest + ord(dest[0]) + 1)^ := twochars;
+  inc(dest[0], 2);
+end;
+
 procedure AppendShortBuffer(buf: PAnsiChar; len: PtrInt; dest: PAnsiChar);
 begin
   if len + ord(dest[0]) > 255 then

src/core/mormot.core.os.pas

@@ -8079,7 +8079,7 @@ function GetMemoryInfoText: TShort31;
   AppendShortKB(info.memtotal - info.memfree, info.memtotal, result);
   AppendShortChar('(', @result);
   AppendShortCardinal(info.percent, result);
-  AppendShortTwoChars('%)', @result);
+  AppendShortTwoChars(ord('%') + ord(')') shl 8, @result);
 end;
 
 function GetDiskAvailable(aDriveFolderOrFile: TFileName): QWord;

src/core/mormot.core.os.security.pas

@@ -3192,7 +3192,7 @@ procedure SddlAppendMask(var s: ShortString; mask: TSecAccessMask);
     AppendShortTwoChars(@SAR_SDDL[TSecAccessRight(i)][1], @s)
   else if mask - samWithSddl <> [] then
   begin
-    AppendShortTwoChars('0x', @s);        // we don't have all tokens it needs
+    AppendShortTwoChars('0x', @s);        // we don't have all needed tokens
     AppendShortIntHex(cardinal(mask), s); // store as @x##### hexadecimal
   end
   else
@@ -4792,9 +4792,9 @@ procedure TSecurityDescriptor.AclToText(var sddl: TSynTempBuffer;
   if SCOPE_P[scope] in Flags then
     AppendShortChar('P', @tmp);
   if SCOPE_AR[scope] in Flags then
-    AppendShortTwoChars('AR', @tmp);
+    AppendShortTwoChars(ord('A') + ord('R') shl 8, @tmp);
   if SCOPE_AI[scope] in Flags then
-    AppendShortTwoChars('AI', @tmp);
+    AppendShortTwoChars(ord('A') + ord('I') shl 8, @tmp);
   acl := @Dacl;
   if scope = sasSacl then
     acl := @Sacl;
@@ -4878,12 +4878,12 @@ procedure TSecurityDescriptor.AppendAsText(var sddl: TSynTempBuffer;
   tmp[0] := #0;
   if Owner <> '' then
   begin
-    tmp := 'O:';
+    AppendShortTwoChars(ord('O') + ord(':') shl 8, @tmp);
     SddlAppendSid(tmp, pointer(Owner), dom);
   end;
   if Group <> '' then
   begin
-    AppendShortTwoChars('G:', @tmp);
+    AppendShortTwoChars(ord('G') + ord(':') shl 8, @tmp);
     SddlAppendSid(tmp, pointer(Group), dom);
   end;
   sddl.AddShort(tmp);

src/core/mormot.core.perf.pas

@@ -2610,7 +2610,7 @@ function TSynMonitorOneSize.GetAsText: TShort16;
 function TSynMonitorThroughput.GetAsText: TShort16;
 begin
   AppendKB(fBytesPerSec, result, not fTextNoSpace);
-  AppendShortTwoChars('/s', @result);
+  AppendShortTwoChars(ord('/') + ord('s') shl 8, @result);
 end;
 
 

src/core/mormot.core.text.pas

@@ -9685,10 +9685,12 @@ procedure _TimeToString(value: cardinal; const u: ShortString;
 
 procedure MicroSecToString(Micro: QWord; out result: TShort16);
 begin
-  if Int64(Micro) <= 0 then
-    PCardinal(@result)^ := 3 + ord('0') shl 8 + ord('u') shl 16 + ord('s') shl 24
-  else if Micro < 1000 then
-    FormatShort16('%us', [Micro], result)
+  result[0] := #0;
+  if Micro < 1000 then
+  begin
+    AppendShortCardinal(Micro, result);
+    AppendShortTwoChars(ord('u') + ord('s') shl 8, @result);
+  end
   else if Micro < 1000000 then
     By100ToTwoDigitString(
       {$ifdef CPU32} PCardinal(@Micro)^ {$else} Micro {$endif} div 10, 'ms', result)

src/mormot.commit.inc

@@ -1 +1 @@
-'2.3.10634'
+'2.3.10635'