From 8487ec272eaadcb60b778d440eba9e108282bf63 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 17 Nov 2009 16:37:34 +0100 Subject: Fix some compiler warnings and hints --- UChmod.pas | 29 ++++++++++++++--------------- UConnectionManager.pas | 2 +- UCore.pas | 1 + UCoreUtils.pas | 2 +- UMain.pas | 37 +++++++++++++++++++------------------ UProperties.pas | 2 +- USearch.pas | 1 - libgtk_kylix/GTKMenus.pas | 4 ++-- vfs/UVFSCore.pas | 1 + 9 files changed, 40 insertions(+), 39 deletions(-) diff --git a/UChmod.pas b/UChmod.pas index cf41d3e..7601e08 100644 --- a/UChmod.pas +++ b/UChmod.pas @@ -177,22 +177,21 @@ end; procedure TFChmod.PermissionsCheckBoxToggle(Sender: TObject); var Mode: Cardinal; begin - if Busy then Exit; Busy := True; + if Busy then Exit; + Busy := True; Mode := 0; - { $WARNINGS OFF} - Mode := Mode or (Ord(cbSUID.Checked) * __S_ISUID); - Mode := Mode or (Ord(cbSGID.Checked) * __S_ISGID); - Mode := Mode or (Ord(cbSticky.Checked) * __S_ISVTX); - Mode := Mode or (Ord(cbUSRRead.Checked) * S_IRUSR); - Mode := Mode or (Ord(cbUSRWrite.Checked) * S_IWUSR); - Mode := Mode or (Ord(cbUSRExec.Checked) * S_IXUSR); - Mode := Mode or (Ord(cbGRPRead.Checked) * S_IRGRP); - Mode := Mode or (Ord(cbGRPWrite.Checked) * S_IWGRP); - Mode := Mode or (Ord(cbGRPExec.Checked) * S_IXGRP); - Mode := Mode or (Ord(cbALLRead.Checked) * S_IROTH); - Mode := Mode or (Ord(cbALLWrite.Checked) * S_IWOTH); - Mode := Mode or (Ord(cbALLExec.Checked) * S_IXOTH); - { $WARNINGS ON} + Mode := Mode or (Cardinal(Ord(cbSUID.Checked)) * __S_ISUID); + Mode := Mode or (Cardinal(Ord(cbSGID.Checked)) * __S_ISGID); + Mode := Mode or (Cardinal(Ord(cbSticky.Checked)) * __S_ISVTX); + Mode := Mode or (Cardinal(Ord(cbUSRRead.Checked)) * S_IRUSR); + Mode := Mode or (Cardinal(Ord(cbUSRWrite.Checked)) * S_IWUSR); + Mode := Mode or (Cardinal(Ord(cbUSRExec.Checked)) * S_IXUSR); + Mode := Mode or (Cardinal(Ord(cbGRPRead.Checked)) * S_IRGRP); + Mode := Mode or (Cardinal(Ord(cbGRPWrite.Checked)) * S_IWGRP); + Mode := Mode or (Cardinal(Ord(cbGRPExec.Checked)) * S_IXGRP); + Mode := Mode or (Cardinal(Ord(cbALLRead.Checked)) * S_IROTH); + Mode := Mode or (Cardinal(Ord(cbALLWrite.Checked)) * S_IWOTH); + Mode := Mode or (Cardinal(Ord(cbALLExec.Checked)) * S_IXOTH); LastMode := Mode; TextLabel.Caption := Format(LANGFChmod_TextLabel, [AttrToStr(Mode, False)]);; TextLabel.UseMarkup := True; diff --git a/UConnectionManager.pas b/UConnectionManager.pas index 72574b5..62b34b9 100644 --- a/UConnectionManager.pas +++ b/UConnectionManager.pas @@ -518,8 +518,8 @@ var AFQuickConnect: TFQuickConnect; begin ConfConnMgrDoNotSavePasswords := DoNotSavePasswordsCheckBox.Checked; ConfConnMgrDoNotSynchronizeKeyring := DoNotSynchronizeKeyringCheckBox.Checked; + AFQuickConnect := TFQuickConnect.Create(Self); try - AFQuickConnect := TFQuickConnect.Create(Self); AFQuickConnect.SourcePanelEngine := SourcePanelEngine; AFQuickConnect.ConnectionManager := Self; if (AFQuickConnect.Run = mbOK) and (AFQuickConnect.ConnectedEngine <> nil) then begin diff --git a/UCore.pas b/UCore.pas index dd9cd9e..89af1a2 100644 --- a/UCore.pas +++ b/UCore.pas @@ -794,6 +794,7 @@ end; function CopyFilesWorker_ErrorFunc(Sender: Pointer; ErrorType, ErrorNum: integer; FileName: string): boolean; cdecl; var s, s2, s3: string; begin + Result := False; with TWorkerThread(Sender) do begin if ParamBool2 then begin Result := True; diff --git a/UCoreUtils.pas b/UCoreUtils.pas index b095db1..95ca5a8 100644 --- a/UCoreUtils.pas +++ b/UCoreUtils.pas @@ -136,7 +136,7 @@ var ChildExitStatus: sig_atomic_t; NormalItemGDKColor, ActiveItemGDKColor, InactiveItemGDKColor, SelectedItemGDKColor, DotFileItemGDKColor, LinkItemGDKColor, NormalItemGDKBackground, ActiveItemGDKBackground, InactiveItemGDKBackground: PGdkColor; - InactiveItemBGColorNum: LongWord; + InactiveItemBGColorNum: Cardinal; implementation diff --git a/UMain.pas b/UMain.pas index d80bafd..6bba15b 100644 --- a/UMain.pas +++ b/UMain.pas @@ -1130,8 +1130,9 @@ procedure TFMain.FormClose(Sender: TObject; var Action: TCloseAction); end; var i: integer; - b, DontShowAgain: boolean; - res: TMessageButton; + b: boolean; +(* DontShowAgain: boolean; + res: TMessageButton; *) s: string; begin // Find all opened connections and warn user @@ -1732,7 +1733,7 @@ end; procedure TFMain.ChangingDir(LeftPanel: boolean; NewPath: string; HiliString1: string = ''; HiliString2: string = ''; const PreserveSelection: boolean = False; const AutoFallback: boolean = False; Plugin: TVFSPlugin = nil); var ListView: TGTKListView; Engine: TPanelEngine; - s, ss: string; + s: string; i, Sel: integer; b: boolean; tt: TDateTime; @@ -2610,7 +2611,7 @@ var i: integer; NewPath, NewPathx, SelSingle, NextItem1, NextItem2: string; AWorkingThread: TWorkerThread; AFProgress: TFProgress; - CurrentEngine, OppositeEngine: TPanelEngine; + OppositeEngine: TPanelEngine; p: PChar; BypassSelAll: boolean; begin @@ -2635,10 +2636,8 @@ begin end; if LeftPanel then begin - CurrentEngine := LeftPanelEngine; OppositeEngine := RightPanelEngine; end else begin - CurrentEngine := RightPanelEngine; OppositeEngine := LeftPanelEngine; end; @@ -4051,6 +4050,7 @@ var LeftPanel: boolean; begin try InternalLock; + Stat := nil; if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; @@ -4148,6 +4148,7 @@ var LeftPanel: boolean; begin try InternalLock; + Stat := nil; if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; @@ -5931,16 +5932,16 @@ function TFMain.NotebookMoveTabToAnotherNotebook(Sender: TObject; Destination: T var LeftPanel: boolean; ATargetEngine, ASrcEngine: TPanelEngine; ATargetTabList, ASrcTabList: TStringList; - ATargetPathsHighlight, ASrcPathsHighlight: TStringList; - ATargetTabEngines, ASrcTabEngines: TList; - ATargetTabSortIDs, ASrcTabSortIDs: TList; +(* ATargetPathsHighlight, ASrcPathsHighlight: TStringList; + ATargetTabEngines, *) ASrcTabEngines: TList; +(* ATargetTabSortIDs, ASrcTabSortIDs: TList; ATargetTabSortTypes, ASrcTabSortTypes: TList; + DontShowAgain: boolean; *) APath: string; - DontShowAgain: boolean; dst_no: integer; begin Result := False; - DontShowAgain := False; +(* DontShowAgain := False; *) DebugMsg([' *** NotebookMoveTabToAnotherNotebook(SourceTabNo = ', SourceTabNo, ', DestTabNo = ', DestTabNo, ')']); LeftPanel := Sender = LeftPanelNotebook; if LeftPanel then begin @@ -5948,27 +5949,27 @@ begin ATargetTabList := RightPanelTabs; ASrcEngine := LeftPanelEngine; ASrcTabList := LeftPanelTabs; - ATargetPathsHighlight := RightPathsHighlight; + ASrcTabEngines := LeftTabEngines; +(* ATargetPathsHighlight := RightPathsHighlight; ATargetTabEngines := RightTabEngines; ATargetTabSortIDs := RightTabSortIDs; ATargetTabSortTypes := RightTabSortTypes; ASrcPathsHighlight := LeftPathsHighlight; - ASrcTabEngines := LeftTabEngines; ASrcTabSortIDs := LeftTabSortIDs; - ASrcTabSortTypes := LeftTabSortTypes; + ASrcTabSortTypes := LeftTabSortTypes; *) end else begin ATargetEngine := LeftPanelEngine; ATargetTabList := LeftPanelTabs; ASrcEngine := RightPanelEngine; ASrcTabList := RightPanelTabs; - ATargetPathsHighlight := LeftPathsHighlight; + ASrcTabEngines := RightTabEngines; +(* ATargetPathsHighlight := LeftPathsHighlight; ATargetTabEngines := LeftTabEngines; ATargetTabSortIDs := LeftTabSortIDs; ATargetTabSortTypes := LeftTabSortTypes; ASrcPathsHighlight := RightPathsHighlight; - ASrcTabEngines := RightTabEngines; ASrcTabSortIDs := RightTabSortIDs; - ASrcTabSortTypes := RightTabSortTypes; + ASrcTabSortTypes := RightTabSortTypes; *) end; if (SourceTabNo < 0) or (SourceTabNo > ASrcTabList.Count - 1) then begin @@ -6333,6 +6334,7 @@ var LeftPanel: boolean; begin try InternalLock; + Stat := nil; if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; @@ -6562,7 +6564,6 @@ var s: string; DataList: TList; err: integer; begin - Result := False; s := IncludeTrailingPathDelimiter(ConfTempPath) + 'tuxcmd-XXXXXX'; tmp := strdup(PChar(s)); tmp := mkdtemp(tmp); diff --git a/UProperties.pas b/UProperties.pas index 371f7a6..d951264 100644 --- a/UProperties.pas +++ b/UProperties.pas @@ -56,7 +56,7 @@ uses ULocale, UFileAssoc, UCoreUtils, UConfig; procedure TFProperties.FormCreate(Sender: TObject); -var i: integer; +// var i: integer; begin SetDefaultSize(450, 500); Caption := Format('%s Properties', [DisplayFileName]); diff --git a/USearch.pas b/USearch.pas index d59db48..ce9416c 100644 --- a/USearch.pas +++ b/USearch.pas @@ -908,7 +908,6 @@ var LocalList: TList; begin try if CancelIt then Exit; - Plugin := nil; if Length(StartDir) < 1 then StartDir := '/'; DebugMsg(['++ Entering directory ', StartDir]); diff --git a/libgtk_kylix/GTKMenus.pas b/libgtk_kylix/GTKMenus.pas index 7b1b9a8..2534f4c 100644 --- a/libgtk_kylix/GTKMenus.pas +++ b/libgtk_kylix/GTKMenus.pas @@ -366,8 +366,8 @@ begin if FItemType = itTearOff then g_object_get(FWidget, 'tearoff-state', @b, nil) else if Assigned(FMenu) and (Count > 0) then g_object_get(FMenu, 'tearoff-state', @b, nil); end else begin - if FItemType = itTearOff then Result := Boolean(torn_off(PGTKTearOffMenuItem(FWidget)^)) else - if Assigned(FMenu) and (Count > 0) then Result := Boolean(torn_off(PGTKMenu(FMenu)^)); + if FItemType = itTearOff then b := Boolean(torn_off(PGTKTearOffMenuItem(FWidget)^)) else + if Assigned(FMenu) and (Count > 0) then b := Boolean(torn_off(PGTKMenu(FMenu)^)); end; Result := b; end; diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas index bf2cd9d..a4bedf0 100644 --- a/vfs/UVFSCore.pas +++ b/vfs/UVFSCore.pas @@ -599,6 +599,7 @@ end; function TVFSEngine.ChangeDirEx(const NewPath: string; AskQuestionCallback: PVFSAskQuestionCallback; AskPasswordCallback: PVFSAskPasswordCallback; ProgressCallback: PVFSProgressCallback; CallbackData: Pointer): integer; begin + Result := ERRNoAccess; if (FGlobs <> nil) and (@FSourcePlugin.FVFSChangeDir <> nil) then begin if @FSourcePlugin.FVFSSetCallbacks <> nil then FSourcePlugin.FVFSSetCallbacks(FGlobs, AskQuestionCallback, AskPasswordCallback, ProgressCallback, CallbackData); -- cgit v1.2.3