Merge pull request #8 from wheresalice/feature/fix_go_vet

fix go vet by avoiding copying messages

2 files changed, 9 insertions, 8 deletions

diff --git a/examples/mqtt/main.go b/examples/mqtt/main.go
index 0ad9c5f..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,12 +42,15 @@ 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())
+		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)
@@ -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 feda4bd..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"
@@ -44,7 +43,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 +55,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)
@@ -83,5 +82,5 @@ func processMessage(message pb.Data) string {
 		return s.String()
 	}
 
-	return fmt.Sprintf("unknown message type")
+	return "unknown message type"
 }