Print to first null when outputting payload to string

Author: deslaughter

discon-client/client.go

@@ -118,7 +118,7 @@ func DISCON(avrSwap *C.float, aviFail *C.int, accInFile, avcOutName, avcMsg *C.c
 	ws.WriteMessage(websocket.BinaryMessage, b)
 
 	if debug {
-		log.Println("discon-client: sent payload:", payload)
+		log.Println("discon-client: sent payload:\n", payload)
 	}
 
 	// Read response from server
@@ -134,7 +134,7 @@ func DISCON(avrSwap *C.float, aviFail *C.int, accInFile, avcOutName, avcMsg *C.c
 	}
 
 	if debug {
-		log.Println("discon-client: received payload:", payload)
+		log.Println("discon-client: received payload:\n", payload)
 	}
 
 	// Set fail flag

payload.go

@@ -120,10 +120,26 @@ func (p *Payload) UnmarshalBinary(data []byte) error {
 }
 
 func (p Payload) String() string {
+	i0InFile := bytes.IndexByte(p.InFile, 0)
+	if i0InFile < 0 {
+		i0InFile = len(p.InFile)
+	}
+	i0OutName := bytes.IndexByte(p.OutName, 0)
+	if i0OutName < 0 {
+		i0OutName = len(p.OutName)
+	}
+	i0Msg := bytes.IndexByte(p.Msg, 0)
+	if i0Msg < 0 {
+		i0Msg = len(p.Msg)
+	}
 	return fmt.Sprintf("avrSWAP: 	%v\n"+
 		"aviFAIL: 	%v\n"+
 		"accINFILE:  '%s'\n"+
 		"avcOUTNAME: '%s'\n"+
 		"avcMSG:     '%s'\n",
-		p.Swap[:129], p.Fail, p.InFile, p.OutName, p.Msg)
+		p.Swap[:129],
+		p.Fail,
+		p.InFile[:i0InFile],
+		p.OutName[:i0OutName],
+		p.Msg[:i0Msg])
 }