From 7feac0b5f72ed9d86d219b651da77b7ec1f2c6cc Mon Sep 17 00:00:00 2001 From: Rockingcool Date: Sat, 10 Aug 2024 11:29:18 -0500 Subject: [PATCH] Renamed 'printAndExit' to 'printErrAndExit' --- color.go | 2 +- errors.go | 2 +- main.go | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/color.go b/color.go index 5518c16..11ccf88 100644 --- a/color.go +++ b/color.go @@ -52,7 +52,7 @@ func newColor(colorString string) (color, error) { // newColorMust is similar to newColor, but prints an error and exits if the given color isn't valid. func newColorMust(colorString string) color { if clr, err := newColor(colorString); err != nil { - printAndExit(err.Error()) + printErrAndExit(err.Error()) panic(err) // NEVER REACHED } else { return clr diff --git a/errors.go b/errors.go index 12faec6..75967a9 100644 --- a/errors.go +++ b/errors.go @@ -5,7 +5,7 @@ import ( "os" ) -func printAndExit(errorStr string) { +func printErrAndExit(errorStr string) { fmt.Printf("ERROR: %s\n", errorStr) os.Exit(1) } diff --git a/main.go b/main.go index 2eb4b70..f899bf6 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ func fileExists(filename string) bool { } else if errors.Is(err, os.ErrNotExist) { return false } else { - printAndExit(err.Error()) + printErrAndExit(err.Error()) return false // NEVER REACHED } } @@ -24,7 +24,7 @@ func fileExists(filename string) bool { // the file doesn't exist. func mustExist(filename string) { if fileExists(filename) != true { - printAndExit(os.ErrNotExist.Error()) + printErrAndExit(os.ErrNotExist.Error()) } } @@ -52,7 +52,7 @@ func printFile(fileName string) { mustExist(fileName) data, err := os.ReadFile(fileName) if err != nil { - printAndExit(err.Error()) + printErrAndExit(err.Error()) } fmt.Print(string(data)) return @@ -62,7 +62,7 @@ func main() { // Check if user has provided a file name if len(os.Args) != 2 { - printAndExit("Invalid number of arguments") + printErrAndExit("Invalid number of arguments") } fileName := os.Args[1] mustExist(fileName) @@ -78,13 +78,13 @@ func main() { // If the given file has a config, load the config into a stack of regColors. regColorStack, err := loadConfig(configFilename) if err != nil { - printAndExit(err.Error()) + printErrAndExit(err.Error()) } // Load the input file into a colorunit slice (units) and a byte slice (data) units, data, err := loadInputFile(fileName) if err != nil { - printAndExit(err.Error()) + printErrAndExit(err.Error()) } // For each regular expression in the stack, apply it to the byte slice. Find