mirror of
https://github.com/wavetermdev/waveterm.git
synced 2025-02-22 02:41:23 +01:00
fix remaining warnings in workspace
This commit is contained in:
parent
8a938744f7
commit
ce4b6d413c
@ -1358,7 +1358,7 @@ func (state RemoteRuntimeState) ExpandHomeDir(pathStr string) (string, error) {
|
|||||||
func (msh *MShellProc) IsCmdRunning(ck base.CommandKey) bool {
|
func (msh *MShellProc) IsCmdRunning(ck base.CommandKey) bool {
|
||||||
msh.Lock.Lock()
|
msh.Lock.Lock()
|
||||||
defer msh.Lock.Unlock()
|
defer msh.Lock.Unlock()
|
||||||
for runningCk, _ := range msh.RunningCmds {
|
for runningCk := range msh.RunningCmds {
|
||||||
if runningCk == ck {
|
if runningCk == ck {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@ -1664,7 +1664,7 @@ func makeDataAckPacket(ck base.CommandKey, fdNum int, ackLen int, err error) *pa
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (msh *MShellProc) notifyHangups_nolock() {
|
func (msh *MShellProc) notifyHangups_nolock() {
|
||||||
for ck, _ := range msh.RunningCmds {
|
for ck := range msh.RunningCmds {
|
||||||
cmd, err := sstore.GetCmdByScreenId(context.Background(), ck.GetGroupId(), ck.GetCmdId())
|
cmd, err := sstore.GetCmdByScreenId(context.Background(), ck.GetGroupId(), ck.GetCmdId())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue
|
continue
|
||||||
@ -2053,7 +2053,7 @@ func (msh *MShellProc) getFullState(stateDiff *packet.ShellStateDiff) (*packet.S
|
|||||||
}
|
}
|
||||||
return &newState, nil
|
return &newState, nil
|
||||||
} else {
|
} else {
|
||||||
fullState, err := sstore.GetFullState(context.Background(), sstore.ShellStatePtr{stateDiff.BaseHash, stateDiff.DiffHashArr})
|
fullState, err := sstore.GetFullState(context.Background(), sstore.ShellStatePtr{BaseHash: stateDiff.BaseHash, DiffHashArr: stateDiff.DiffHashArr})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -2072,7 +2072,7 @@ func (msh *MShellProc) getFeStateFromDiff(stateDiff *packet.ShellStateDiff) (map
|
|||||||
}
|
}
|
||||||
return sstore.FeStateFromShellState(&newState), nil
|
return sstore.FeStateFromShellState(&newState), nil
|
||||||
} else {
|
} else {
|
||||||
fullState, err := sstore.GetFullState(context.Background(), sstore.ShellStatePtr{stateDiff.BaseHash, stateDiff.DiffHashArr})
|
fullState, err := sstore.GetFullState(context.Background(), sstore.ShellStatePtr{BaseHash: stateDiff.BaseHash, DiffHashArr: stateDiff.DiffHashArr})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user