From d5fab3630c4824c5d6648bf1ecd928855f5281a6 Mon Sep 17 00:00:00 2001
From: Anton Novojilov <andy@essentialkaos.com>
Date: Tue, 17 Dec 2024 11:34:08 +0300
Subject: [PATCH] Code refactoring

---
 beans.go                             |  2 +-
 cmd/zabbix-jmx-get/zabbix-jmx-get.go | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/beans.go b/beans.go
index ccca0ce..8cf6354 100644
--- a/beans.go
+++ b/beans.go
@@ -32,7 +32,7 @@ type jmxBeans struct {
 
 // ParseBeans parses beans data
 func ParseBeans(data string) ([]*Bean, error) {
-	data = strings.Replace(data, `\"`, `"`, -1)
+	data = strings.ReplaceAll(data, `\"`, `"`)
 
 	beans := &jmxBeans{}
 	err := json.Unmarshal([]byte(data), beans)
diff --git a/cmd/zabbix-jmx-get/zabbix-jmx-get.go b/cmd/zabbix-jmx-get/zabbix-jmx-get.go
index 23d8ba7..2749628 100644
--- a/cmd/zabbix-jmx-get/zabbix-jmx-get.go
+++ b/cmd/zabbix-jmx-get/zabbix-jmx-get.go
@@ -241,12 +241,6 @@ func makeRequest(serverHost string, serverPort int, keys []string) *jmx.Request
 	return r
 }
 
-// printErrorAndExit print error message and exit with exit code 1
-func printErrorAndExit(f string, a ...interface{}) {
-	terminal.Error(f, a...)
-	os.Exit(1)
-}
-
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // printCompletion prints completion for given shell
@@ -255,11 +249,11 @@ func printCompletion() int {
 
 	switch options.GetS(OPT_COMPLETION) {
 	case "bash":
-		fmt.Printf(bash.Generate(info, APP))
+		fmt.Print(bash.Generate(info, APP))
 	case "fish":
-		fmt.Printf(fish.Generate(info, APP))
+		fmt.Print(fish.Generate(info, APP))
 	case "zsh":
-		fmt.Printf(zsh.Generate(info, optMap, APP))
+		fmt.Print(zsh.Generate(info, optMap, APP))
 	default:
 		return 1
 	}