Skip to content

Commit 97ce785

Browse files
committed
Fix more linter issues.
Signed-off-by: SuperQ <[email protected]>
1 parent 75296b4 commit 97ce785

File tree

7 files changed

+9
-20
lines changed

7 files changed

+9
-20
lines changed

config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package kvm
33
import (
44
"encoding/json"
55
"fmt"
6-
"kvm/internal/usbgadget"
76
"os"
87
"sync"
8+
9+
"github.com/jetkvm/kvm/internal/usbgadget"
910
)
1011

1112
type WakeOnLanDevice struct {

jiggler.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ import (
66

77
var lastUserInput = time.Now()
88

9-
func resetUserInputTime() {
10-
lastUserInput = time.Now()
11-
}
12-
139
var jigglerEnabled = false
1410

1511
func rpcSetJigglerState(enabled bool) {

jsonrpc.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/json"
66
"errors"
77
"fmt"
8-
"kvm/internal/usbgadget"
98
"os"
109
"os/exec"
1110
"path/filepath"
@@ -15,6 +14,8 @@ import (
1514

1615
"github.com/pion/webrtc/v4"
1716
"go.bug.st/serial"
17+
18+
"github.com/jetkvm/kvm/internal/usbgadget"
1819
)
1920

2021
type JSONRPCRequest struct {

log.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ import "github.com/pion/logging"
55
// we use logging framework from pion
66
// ref: https://github.com/pion/webrtc/wiki/Debugging-WebRTC
77
var logger = logging.NewDefaultLoggerFactory().NewLogger("jetkvm")
8-
var usbLogger = logging.NewDefaultLoggerFactory().NewLogger("usb")
98
var cloudLogger = logging.NewDefaultLoggerFactory().NewLogger("cloud")

native.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/json"
66
"fmt"
77
"io"
8-
"kvm/resource"
98
"net"
109
"os"
1110
"os/exec"

usb.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kvm
22

33
import (
4-
"kvm/internal/usbgadget"
4+
"github.com/jetkvm/kvm/internal/usbgadget"
55
"time"
66
)
77

@@ -37,10 +37,6 @@ func rpcWheelReport(wheelY int8) error {
3737
return gadget.AbsMouseWheelReport(wheelY)
3838
}
3939

40-
func rpcRelMouseReport(mx, my int8, buttons uint8) error {
41-
return gadget.RelMouseReport(mx, my, buttons)
42-
}
43-
4440
var usbState = "unknown"
4541

4642
func rpcGetUSBState() (state string) {

usb_mass_storage.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"errors"
66
"fmt"
77
"io"
8-
"kvm/resource"
98
"net/http"
109
"os"
1110
"path"
@@ -16,14 +15,12 @@ import (
1615
"time"
1716

1817
"github.com/gin-gonic/gin"
19-
2018
"github.com/psanford/httpreadat"
21-
2219
"github.com/google/uuid"
2320
"github.com/pion/webrtc/v4"
24-
)
2521

26-
const massStorageName = "mass_storage.usb0"
22+
"github.com/jetkvm/kvm/resource"
23+
)
2724

2825
func writeFile(path string, data string) error {
2926
return os.WriteFile(path, []byte(data), 0644)
@@ -65,11 +62,11 @@ func onDiskMessage(msg webrtc.DataChannelMessage) {
6562
func mountImage(imagePath string) error {
6663
err := setMassStorageImage("")
6764
if err != nil {
68-
return fmt.Errorf("Remove Mass Storage Image Error", err)
65+
return fmt.Errorf("Remove Mass Storage Image Error: %w", err)
6966
}
7067
err = setMassStorageImage(imagePath)
7168
if err != nil {
72-
return fmt.Errorf("Set Mass Storage Image Error", err)
69+
return fmt.Errorf("Set Mass Storage Image Error: %w", err)
7370
}
7471
return nil
7572
}

0 commit comments

Comments
 (0)