Changeset 391

Timestamp:

Apr 30, 2016, 7:53:55 PM (9 years ago)

Author:

RBRi

Message:

more char utils (merged from old 2.20)

Location:

trunk

Files:

• Library/CharUtilsUnit.pas (modified) (5 diffs)
• unittests/CharUtilsUnitTests.pas (modified) (1 diff)

trunk/Library/CharUtilsUnit.pas

@@ -2 +2 @@
 
 // NewView - a new OS/2 Help Viewer
-// Copyright 2006-2007 Ronald Brill (rbri at rbri dot de)
+// Copyright 2003-2006 Aaron Lawrence
+// Copyright 2006-2009 Ronald Brill (rbri at rbri dot de)
 // This software is released under the GNU Public License - see readme.txt
 
@@ -34 +35 @@
   // ---------------
 
-  
+
+  // Allocates enough memory for a copy of aString as a PChar
+  // and copies aString to it.
+  Function NewPCharAsCopyOfStr(const aString: String) : PChar;
+
   // Converts a PChar into a String like StrPas
   // but conversts at least the first aLength chars
@@ -41 +46 @@
   // Returns the difference of the pointers
   Function PCharPointerDiff(const aMinuend: PChar; const aSubtrahend : PChar)  : Longword;
+
+  // Concatentate AddText to Text. Reallocate and expand
+  // Text if necessary. This is a size-safe StrCat
+  Procedure AddAndResize(var aText: PChar; const aTextToAdd: PChar);
+
 
 Implementation
@@ -63 +73 @@
 
 
-  // Converts a PChar into a String like StrPas
-  // but conversts at least the first aLength chars
   Function StrPasWithLength(const aPChar: PChar; const aLength: integer) : String;
   var
@@ -85 +93 @@
 
 
+  Procedure CheckPCharSize(Var aText: PChar; const aNeededSize: longword);
+  var
+    tmpPChar: PChar;
+    tmpNewBufferSize: longword;
+  begin
+    if (aNeededSize + 1) // + 1 to allow for null terminator
+       > StrBufSize(aText) then
+    begin
+      // allocate new buffer, double the size...
+      tmpNewBufferSize := StrBufSize(aText) * 2;
+      // or if that's not enough...
+      if tmpNewBufferSize < (aNeededSize + 1) then
+      begin
+        // double what we are going to need
+        tmpNewBufferSize:= aNeededSize * 2;
+      end;
+
+      tmpPChar := StrAlloc(tmpNewBufferSize);
+
+      // copy string to new buffer
+      StrCopy(tmpPChar, aText);
+      StrDispose(aText);
+      aText:= tmpPChar;
+    end;
+  end;
+
+
+  Procedure AddAndResize(var aText: PChar; const aTextToAdd: PChar);
+  begin
+    CheckPCharSize(aText, strlen(aText) + strlen(aTextToAdd));
+    StrCat(aText, aTextToAdd);
+  end;
+
+  Function NewPCharAsCopyOfStr(const aString: String) : PChar;
+  begin
+    Result := StrAlloc(length(aString) + 1);
+    StrPCopy(Result, aString);
+  end;
+
 END.

trunk/unittests/CharUtilsUnitTests.pas

@@ -1 +1 @@
 Unit CharUtilsUnitTests;
+
+// NewView - a new OS/2 Help Viewer
+// Copyright 2006-2009 Ronald Brill (rbri at rbri dot de)
+// This software is released under the GNU Public License - see readme.txt
+
+// UnitTests for CharUtilsUnit
 
 Interface