From bda023911d4cdfb1c04b82cb37f1fc4b23440363 Mon Sep 17 00:00:00 2001 From: joost Date: Fri, 29 May 2015 17:45:22 +0000 Subject: [PATCH] FpDebugServer: Resolved some warnings git-svn-id: trunk@49213 - --- .../fpdebug/app/fpdserver/debuginoutputprocessor.pas | 9 --------- components/fpdebug/app/fpdserver/debugthreadcommand.pas | 7 +++++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/components/fpdebug/app/fpdserver/debuginoutputprocessor.pas b/components/fpdebug/app/fpdserver/debuginoutputprocessor.pas index ad3dfe0ba8..442041edc8 100644 --- a/components/fpdebug/app/fpdserver/debuginoutputprocessor.pas +++ b/components/fpdebug/app/fpdserver/debuginoutputprocessor.pas @@ -14,7 +14,6 @@ uses debugthread, FpDbgClasses, typinfo, - varutils, variants, jsonparser; @@ -44,9 +43,6 @@ type implementation -var - GJSonInOutputProcessor: TJSonInOutputProcessor = nil; - { TCustomInOutputProcessor } constructor TCustomInOutputProcessor.create(AConnectionIdentifier: integer; AnOnLog: TOnLog); @@ -139,7 +135,6 @@ end; function TJSonInOutputProcessor.EventToText(AnEvent: TFpDebugEvent): string; var - s: string; JSonEvent: TJSONObject; JSonLocationRec: TJSONObject; JSonStackArray: TJSONArray; @@ -219,9 +214,7 @@ end; class function TJSonInOutputProcessor.InteractiveInitializationMessage(APort: integer): string; var - s: string; JSonMessage: TJSONObject; - JSonLocationRec: TJSONObject; begin JSonMessage := TJSONObject.Create; try @@ -235,7 +228,5 @@ begin end; end; -finalization - GJSonInOutputProcessor := nil; end. diff --git a/components/fpdebug/app/fpdserver/debugthreadcommand.pas b/components/fpdebug/app/fpdserver/debugthreadcommand.pas index 4c176f68ea..c1af30e00f 100644 --- a/components/fpdebug/app/fpdserver/debugthreadcommand.pas +++ b/components/fpdebug/app/fpdserver/debugthreadcommand.pas @@ -6,7 +6,6 @@ interface uses Classes, - contnrs, FPDbgController, FpDbgClasses, FpDbgUtil, @@ -214,6 +213,7 @@ begin FStackEntryArray[i].Line:=ThreadCallStack[i].Line; FStackEntryArray[i].SourceFile:=ThreadCallStack[i].SourceFile; end; + DoProcessLoop:=false; result := true; end; @@ -249,6 +249,7 @@ var begin Result := False; + DoProcessLoop:=false; ADbgInfo := AController.CurrentProcess.DbgInfo; AContext := ADbgInfo.FindContext(AController.CurrentThread.ID, 0, AController.CurrentProcess.GetInstructionPointerRegisterValue); if AContext = nil then @@ -304,11 +305,13 @@ function TFpDebugThreadQuitDebugServerCommand.PreExecute(AController: TDbgContro begin DoQueueCommand:=false; CustomApplication.Terminate; + result := true; end; function TFpDebugThreadQuitDebugServerCommand.Execute(AController: TDbgController; out DoProcessLoop: boolean): boolean; begin - // Do nothing + result := true; + DoProcessLoop := false; end; class function TFpDebugThreadQuitDebugServerCommand.TextName: string;