From d0e20a7e0692dcc75c34601237bc9330aa2d74d7 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 22 Oct 2019 15:10:12 +0000 Subject: [PATCH] fpdebug: clean up git-svn-id: trunk@62108 - --- components/fpdebug/fpdbgdwarffreepascal.pas | 4 ---- components/fpdebug/fpdbglinuxclasses.pas | 1 - components/fpdebug/fpdbgsymbols.pas | 4 +++- components/fpdebug/fpdbgwinextra.pp | 2 -- components/fpdebug/fppascalparser.pas | 4 ---- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/components/fpdebug/fpdbgdwarffreepascal.pas b/components/fpdebug/fpdbgdwarffreepascal.pas index 636651b0e1..a1447cad9e 100644 --- a/components/fpdebug/fpdbgdwarffreepascal.pas +++ b/components/fpdebug/fpdbgdwarffreepascal.pas @@ -702,8 +702,6 @@ end; function TFpSymbolDwarfFreePascalTypePointer.DoReadDataSize( const AValueObj: TFpValue; out ADataSize: TFpDbgValueSize): Boolean; -var - Size: TFpDbgValueSize; begin if Kind = skClass then begin // TODO: get/adjust a value object to have the deref address // see ConstRefOrExprFromAttrData @@ -942,8 +940,6 @@ end; function TFpValueDwarfFreePascalArray.DoGetMainStride(out AStride: TFpDbgValueSize): Boolean; -var - ExtraStride: TFpDbgValueSize; begin if (TFpDwarfFreePascalSymbolClassMapDwarf3(TypeInfo.CompilationUnit.DwarfSymbolClassMap).FCompilerVersion >= $030300) then diff --git a/components/fpdebug/fpdbglinuxclasses.pas b/components/fpdebug/fpdbglinuxclasses.pas index 4aaa4f34c0..f89f61f79d 100644 --- a/components/fpdebug/fpdbglinuxclasses.pas +++ b/components/fpdebug/fpdbglinuxclasses.pas @@ -1137,7 +1137,6 @@ end; function TDbgLinuxProcess.WaitForDebugEvent(out ProcessIdentifier, ThreadIdentifier: THandle): boolean; var PID: THandle; - ThreadWithEvent: TDbgLinuxThread; begin ThreadIdentifier:=-1; ProcessIdentifier:=-1; diff --git a/components/fpdebug/fpdbgsymbols.pas b/components/fpdebug/fpdbgsymbols.pas index 11be50a8b6..d78ea30fbd 100644 --- a/components/fpdebug/fpdbgsymbols.pas +++ b/components/fpdebug/fpdbgsymbols.pas @@ -51,10 +51,10 @@ procedure AddSymbols(AParent: TFpSymbol; AModule: THandle); implementation +{$ifdef windows} var DBG_WARNINGS, FPDBG_DWARF_VERBOSE_LOAD: PLazLoggerLogGroup; -{$ifdef windows} procedure AddSymbols(AParent: TFpSymbol; AModule: THandle); var ModulePtr: Pointer; @@ -248,7 +248,9 @@ end; {$endif} initialization + {$ifdef windows} DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} ); FPDBG_DWARF_VERBOSE_LOAD := DebugLogger.FindOrRegisterLogGroup('FPDBG_DWARF_VERBOSE_LOAD' {$IFDEF FPDBG_DWARF_VERBOSE_LOAD} , True {$ENDIF} ); + {$endif} end. diff --git a/components/fpdebug/fpdbgwinextra.pp b/components/fpdebug/fpdbgwinextra.pp index cb44f574fb..a02e9237dd 100644 --- a/components/fpdebug/fpdbgwinextra.pp +++ b/components/fpdebug/fpdbgwinextra.pp @@ -157,8 +157,6 @@ uses function GetLastErrorText: String; -var - i: DWORD; begin {$ifdef windows} i := GetLastError; diff --git a/components/fpdebug/fppascalparser.pas b/components/fpdebug/fppascalparser.pas index 46928db626..6514a149dd 100644 --- a/components/fpdebug/fppascalparser.pas +++ b/components/fpdebug/fppascalparser.pas @@ -1591,9 +1591,6 @@ end; { TFpPascalExpressionPartConstantText } function TFpPascalExpressionPartConstantText.DoGetResultValue: TFpValue; -var - f: Extended; - s: String; begin //s := GetText; Result := TFpValueConstString.Create(FValue); @@ -3083,7 +3080,6 @@ end; function TFpPascalExpressionPartOperatorOr.DoGetResultValue: TFpValue; var tmp1, tmp2: TFpValue; - op: Boolean; begin Result := nil; if Count <> 2 then exit;