mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-15 14:59:26 +02:00
* PChar -> PAnsiChar
This commit is contained in:
parent
b1a86854d6
commit
39c29ffae2
@ -92,11 +92,11 @@ type
|
||||
// Asynchronous line reader
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
TLineNotify = procedure(const ALine: String) of object;
|
||||
TLineNotify = procedure(const ALine: AnsiString) of object;
|
||||
|
||||
TGenericLineReader = class
|
||||
protected
|
||||
RealBuffer, FBuffer: PChar;
|
||||
RealBuffer, FBuffer: PAnsiChar;
|
||||
FBytesInBuffer: Integer;
|
||||
FOnLine: TLineNotify;
|
||||
InCallback, DoStopAndFree: Boolean;
|
||||
@ -108,7 +108,7 @@ type
|
||||
destructor Destroy; override;
|
||||
procedure Run; // Process as many lines as possible
|
||||
|
||||
property Buffer: PChar read FBuffer;
|
||||
property Buffer: PAnsiChar read FBuffer;
|
||||
property BytesInBuffer: Integer read FBytesInBuffer;
|
||||
property OnLine: TLineNotify read FOnLine write FOnLine;
|
||||
end;
|
||||
@ -144,7 +144,7 @@ type
|
||||
|
||||
TWriteBuffer = class(TStream)
|
||||
protected
|
||||
FBuffer: PChar;
|
||||
FBuffer: PAnsiChar;
|
||||
FBytesInBuffer: Integer;
|
||||
FBufferSent: Boolean;
|
||||
FOnBufferEmpty: TNotifyEvent;
|
||||
@ -158,11 +158,11 @@ type
|
||||
procedure WantWrite; virtual; abstract;
|
||||
procedure BufferEmpty; virtual;
|
||||
public
|
||||
EndOfLineMarker: String;
|
||||
EndOfLineMarker: AnsiString;
|
||||
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
procedure WriteLine(const line: String);
|
||||
procedure WriteLine(const line: AnsiString);
|
||||
procedure Run; // Write as many data as possible
|
||||
|
||||
property BytesInBuffer: Integer read FBytesInBuffer;
|
||||
@ -498,9 +498,9 @@ end;
|
||||
procedure TGenericLineReader.Run;
|
||||
var
|
||||
NewData: array[0..1023] of Byte;
|
||||
p: PChar;
|
||||
p: PAnsiChar;
|
||||
BytesRead, OldBufSize, CurBytesInBuffer, LastEndOfLine, i, LineLength: Integer;
|
||||
line: String;
|
||||
line: AnsiString;
|
||||
FirstRun: Boolean;
|
||||
begin
|
||||
FirstRun := True;
|
||||
@ -631,7 +631,7 @@ end;
|
||||
|
||||
procedure TAsyncStreamLineReader.NoData;
|
||||
var
|
||||
s: String;
|
||||
s: AnsiString;
|
||||
begin
|
||||
if (FDataStream = FBlockingStream) or (FDataStream.Position = FDataStream.Size) then
|
||||
begin
|
||||
@ -722,18 +722,18 @@ begin
|
||||
Result := Count;
|
||||
end;
|
||||
|
||||
procedure TWriteBuffer.WriteLine(const line: String);
|
||||
procedure TWriteBuffer.WriteLine(const line: AnsiString);
|
||||
var
|
||||
s: String;
|
||||
s: AnsiString;
|
||||
begin
|
||||
s := line + EndOfLineMarker;
|
||||
WriteBuffer(s[1], Length(s));
|
||||
WriteBuffer(s[1], Length(s)*sizeOf(Char));
|
||||
end;
|
||||
|
||||
procedure TWriteBuffer.Run;
|
||||
var
|
||||
Written: Integer;
|
||||
NewBuf: PChar;
|
||||
NewBuf: PAnsiChar;
|
||||
Failed: Boolean;
|
||||
begin
|
||||
Failed := True;
|
||||
|
Loading…
Reference in New Issue
Block a user