From 642190a4732569e219c722a9696ec3d9a4025f76 Mon Sep 17 00:00:00 2001
From: Ondrej Fabry <ondrej@fabry.email>
Date: Sat, 4 Jan 2025 19:11:22 +0100
Subject: [PATCH] Code cleanup

Signed-off-by: Ondrej Fabry <ondrej@fabry.email>
---
 dot.go                            | 10 +++++-----
 dot_cgo.go => graphviz_cgo.go     | 11 +++++------
 dot_nocgo.go => graphviz_nocgo.go |  1 -
 3 files changed, 10 insertions(+), 12 deletions(-)
 rename dot_cgo.go => graphviz_cgo.go (70%)
 rename dot_nocgo.go => graphviz_nocgo.go (92%)

diff --git a/dot.go b/dot.go
index 87145d7..0e3863b 100644
--- a/dot.go
+++ b/dot.go
@@ -167,18 +167,18 @@ func runDotToImageCallSystemGraphviz(outfname string, format string, dot []byte)
 		dotSystemBinary = dot
 	}
 
-	var img string
+	var path string
 	if outfname == "" {
-		img = filepath.Join(os.TempDir(), fmt.Sprintf("go-callvis_export.%s", format))
+		path = filepath.Join(os.TempDir(), fmt.Sprintf("go-callvis_export.%s", format))
 	} else {
-		img = fmt.Sprintf("%s.%s", outfname, format)
+		path = fmt.Sprintf("%s.%s", outfname, format)
 	}
-	cmd := exec.Command(dotSystemBinary, fmt.Sprintf("-T%s", format), "-o", img)
+	cmd := exec.Command(dotSystemBinary, fmt.Sprintf("-T%s", format), "-o", path)
 	cmd.Stdin = bytes.NewReader(dot)
 	var stderr bytes.Buffer
 	cmd.Stderr = &stderr
 	if err := cmd.Run(); err != nil {
 		return "", fmt.Errorf("command '%v': %v\n%v", cmd, err, stderr.String())
 	}
-	return img, nil
+	return path, nil
 }
diff --git a/dot_cgo.go b/graphviz_cgo.go
similarity index 70%
rename from dot_cgo.go
rename to graphviz_cgo.go
index 4821bdc..baf7887 100644
--- a/dot_cgo.go
+++ b/graphviz_cgo.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package main
 
@@ -26,14 +25,14 @@ func runDotToImage(outfname string, format string, dot []byte) (string, error) {
             log.Printf("error closing graphviz: %v", err)
         }
     }()
-    var img string
+    var path string
     if outfname == "" {
-        img = filepath.Join(os.TempDir(), fmt.Sprintf("go-callvis_export.%s", format))
+        path = filepath.Join(os.TempDir(), fmt.Sprintf("go-callvis_export.%s", format))
     } else {
-        img = fmt.Sprintf("%s.%s", outfname, format)
+        path = fmt.Sprintf("%s.%s", outfname, format)
     }
-    if err := g.RenderFilename(graph, graphviz.Format(format), img); err != nil {
+    if err := g.RenderFilename(graph, graphviz.Format(format), path); err != nil {
         return "", err
     }
-    return img, nil
+    return path, nil
 }
diff --git a/dot_nocgo.go b/graphviz_nocgo.go
similarity index 92%
rename from dot_nocgo.go
rename to graphviz_nocgo.go
index bfde541..0585331 100644
--- a/dot_nocgo.go
+++ b/graphviz_nocgo.go
@@ -1,5 +1,4 @@
 //go:build !cgo
-// +build !cgo
 
 package main