paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-04 18:50:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Removal of memory unit by Wayne Sherman

Browse Source 
git-svn-id: trunk@3430 -
This commit is contained in:
daniel 2006-05-06 11:02:46 +00:00
parent 8ddd329b17
commit b1be8ffd32
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fv/editors.pas
View File

@ -403,7 +403,7 @@ procedure RegisterEditors;
implementation implementation
uses uses
Memory, Dos, App, StdDlg, MsgBox, Resource; Dos, App, StdDlg, MsgBox, Resource;
type type
pword = ^word; pword = ^word;
@ -1217,6 +1217,7 @@ end;
destructor TLineInfo.Done; destructor TLineInfo.Done;
begin begin
FreeMem(Info,MaxPos*sizeof(TLineInfoRec)); FreeMem(Info,MaxPos*sizeof(TLineInfoRec));
Info := nil;
end; end;
@ -1593,11 +1594,7 @@ end; { TEditor.DeleteSelect }
procedure TEditor.DoneBuffer; procedure TEditor.DoneBuffer;
begin begin
if assigned(Buffer) then ReAllocMem(Buffer, 0);
begin
FreeMem (Buffer, BufSize);
Buffer := nil;
end;
end; { TEditor.DoneBuffer } end; { TEditor.DoneBuffer }
@ -2151,7 +2148,8 @@ end; { TEditor.HideSelect }
procedure TEditor.InitBuffer; procedure TEditor.InitBuffer;
begin begin
Buffer := MemAlloc (BufSize); Assert(Buffer = nil, 'TEditor.InitBuffer: Buffer is not nil');
ReAllocMem(Buffer, BufSize);
end; { TEditor.InitBuffer } end; { TEditor.InitBuffer }
@ -2946,8 +2944,9 @@ end; { TEditor.SetBufLen }
function TEditor.SetBufSize (NewSize : Sw_Word) : Boolean; function TEditor.SetBufSize (NewSize : Sw_Word) : Boolean;
begin begin
// SetBufSize := NewSize <= BufSize; ReAllocMem(Buffer, NewSize);
SetBufSize := SetBufferSize(Buffer, NewSize); BufSize := NewSize;
SetBufSize := True;
end; { TEditor.SetBufSize } end; { TEditor.SetBufSize }
@ -3436,8 +3435,7 @@ end; { TFileEditor.Load }
procedure TFileEditor.DoneBuffer; procedure TFileEditor.DoneBuffer;
begin begin
if assigned(Buffer) then ReAllocMem(Buffer, 0);
DisposeBuffer (Buffer);
end; { TFileEditor.DoneBuffer } end; { TFileEditor.DoneBuffer }
@ -3463,7 +3461,9 @@ end; { TFileEditor.HandleEvent }
procedure TFileEditor.InitBuffer; procedure TFileEditor.InitBuffer;
begin begin
NewBuffer(Pointer(Buffer), MinBufLength); Assert(Buffer = nil, 'TFileEditor.InitBuffer: Buffer is not nil');
ReAllocMem(Buffer, MinBufLength);
BufSize := MinBufLength;
end; { TFileEditor.InitBuffer } end; { TFileEditor.InitBuffer }
@ -3579,13 +3579,10 @@ begin
NewSize := (NewSize + (MinBufLength-1)) and (MaxBufLength and (not (MinBufLength-1))); NewSize := (NewSize + (MinBufLength-1)) and (MaxBufLength and (not (MinBufLength-1)));
if NewSize <> BufSize then if NewSize <> BufSize then
begin begin
if NewSize > BufSize then if NewSize > BufSize then ReAllocMem(Buffer, NewSize);
if not SetBufferSize(pointer(Buffer), NewSize) then
Exit;
N := BufLen - CurPtr + DelCount; N := BufLen - CurPtr + DelCount;
Move(Buffer^[BufSize - N], Buffer^[NewSize - N], N); Move(Buffer^[BufSize - N], Buffer^[NewSize - N], N);
if NewSize < BufSize then if NewSize < BufSize then ReAllocMem(Buffer, NewSize);
SetBufferSize(pointer(Buffer), NewSize);
BufSize := NewSize; BufSize := NewSize;
GapLen := BufSize - BufLen; GapLen := BufSize - BufLen;
end; end;