From e0d8bc4eafc6bbe17d62fd559110b842325d9931 Mon Sep 17 00:00:00 2001 From: WheresAlice Date: Mon, 8 Apr 2024 19:55:46 +0100 Subject: fix go vet by avoiding copying messages --- examples/mqtt/main.go | 4 ++-- examples/radio/main.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/mqtt/main.go b/examples/mqtt/main.go index 0ad9c5f..35058d4 100644 --- a/examples/mqtt/main.go +++ b/examples/mqtt/main.go @@ -44,11 +44,11 @@ func channelHandler(channel string) mqtt.HandlerFunc { var message pb.Data err = proto.Unmarshal(decodedMessage, &message) - log.Info(processMessage(message), "topic", m.Topic, "channel", channel, "portnum", message.Portnum.String()) + log.Info(processMessage(&message), "topic", m.Topic, "channel", channel, "portnum", message.Portnum.String()) } } -func processMessage(message pb.Data) string { +func processMessage(message *pb.Data) string { if message.Portnum == pb.PortNum_NODEINFO_APP { var user = pb.User{} proto.Unmarshal(message.Payload, &user) diff --git a/examples/radio/main.go b/examples/radio/main.go index feda4bd..5b438f1 100644 --- a/examples/radio/main.go +++ b/examples/radio/main.go @@ -44,7 +44,7 @@ func main() { client.Handle(new(pb.MeshPacket), func(msg proto.Message) { pkt := msg.(*pb.MeshPacket) data := pkt.GetDecoded() - log.Info("Received message from radio", "msg", processMessage(*data), "from", pkt.From, "portnum", data.Portnum.String()) + log.Info("Received message from radio", "msg", processMessage(data), "from", pkt.From, "portnum", data.Portnum.String()) }) ctxTimeout, cancelTimeout := context.WithTimeout(ctx, 10*time.Second) defer cancelTimeout() @@ -56,7 +56,7 @@ func main() { <-ctx.Done() } -func processMessage(message pb.Data) string { +func processMessage(message *pb.Data) string { if message.Portnum == pb.PortNum_NODEINFO_APP { var user = pb.User{} proto.Unmarshal(message.Payload, &user) -- cgit v1.2.3 From 26ac8e38f37f8b3f5fb4f884558b2ee4670f07bd Mon Sep 17 00:00:00 2001 From: WheresAlice Date: Mon, 8 Apr 2024 19:59:58 +0100 Subject: fix static checks --- examples/mqtt/main.go | 6 ++++-- examples/radio/main.go | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/mqtt/main.go b/examples/mqtt/main.go index 35058d4..742c396 100644 --- a/examples/mqtt/main.go +++ b/examples/mqtt/main.go @@ -3,7 +3,6 @@ package main import ( "encoding/base64" "encoding/hex" - "fmt" "github.com/charmbracelet/log" pb "github.com/meshnet-gophers/meshtastic-go/meshtastic" "github.com/meshnet-gophers/meshtastic-go/mqtt" @@ -43,6 +42,9 @@ func channelHandler(channel string) mqtt.HandlerFunc { } var message pb.Data err = proto.Unmarshal(decodedMessage, &message) + if err != nil { + log.Error(err) + } log.Info(processMessage(&message), "topic", m.Topic, "channel", channel, "portnum", message.Portnum.String()) } @@ -75,7 +77,7 @@ func processMessage(message *pb.Data) string { return s.String() } - return fmt.Sprintf("unknown message type") + return "unknown message type" } func generateKey(key string) ([]byte, error) { diff --git a/examples/radio/main.go b/examples/radio/main.go index 5b438f1..0d83d79 100644 --- a/examples/radio/main.go +++ b/examples/radio/main.go @@ -2,7 +2,6 @@ package main import ( "context" - "fmt" "github.com/charmbracelet/log" pb "github.com/meshnet-gophers/meshtastic-go/meshtastic" "github.com/meshnet-gophers/meshtastic-go/transport" @@ -83,5 +82,5 @@ func processMessage(message *pb.Data) string { return s.String() } - return fmt.Sprintf("unknown message type") + return "unknown message type" } -- cgit v1.2.3