Rockingcool/ccat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Renamed 'printAndExit' to 'printErrAndExit'

Browse Source
This commit is contained in:
Aadhavan Srinivasan
2024-08-10 11:29:18 -05:00
parent 2a007ba56c
commit 7feac0b5f7
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
color.go
View File

@@ -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. // newColorMust is similar to newColor, but prints an error and exits if the given color isn't valid.
func newColorMust(colorString string) color { func newColorMust(colorString string) color {
if clr, err := newColor(colorString); err != nil { if clr, err := newColor(colorString); err != nil {
printAndExit(err.Error()) printErrAndExit(err.Error())
panic(err) // NEVER REACHED panic(err) // NEVER REACHED
} else { } else {
return clr return clr

2
errors.go
View File

@@ -5,7 +5,7 @@ import (
"os" "os"
) )
func printAndExit(errorStr string) { func printErrAndExit(errorStr string) {
fmt.Printf("ERROR: %s\n", errorStr) fmt.Printf("ERROR: %s\n", errorStr)
os.Exit(1) os.Exit(1)
} }

12
main.go
View File

@@ -15,7 +15,7 @@ func fileExists(filename string) bool {
} else if errors.Is(err, os.ErrNotExist) { } else if errors.Is(err, os.ErrNotExist) {
return false return false
} else { } else {
printAndExit(err.Error()) printErrAndExit(err.Error())
return false // NEVER REACHED return false // NEVER REACHED
} }
} }
@@ -24,7 +24,7 @@ func fileExists(filename string) bool {
// the file doesn't exist. // the file doesn't exist.
func mustExist(filename string) { func mustExist(filename string) {
if fileExists(filename) != true { if fileExists(filename) != true {
printAndExit(os.ErrNotExist.Error()) printErrAndExit(os.ErrNotExist.Error())
} }
} }
@@ -52,7 +52,7 @@ func printFile(fileName string) {
mustExist(fileName) mustExist(fileName)
data, err := os.ReadFile(fileName) data, err := os.ReadFile(fileName)
if err != nil { if err != nil {
printAndExit(err.Error()) printErrAndExit(err.Error())
} }
fmt.Print(string(data)) fmt.Print(string(data))
return return
@@ -62,7 +62,7 @@ func main() {
// Check if user has provided a file name // Check if user has provided a file name
if len(os.Args) != 2 { if len(os.Args) != 2 {
printAndExit("Invalid number of arguments") printErrAndExit("Invalid number of arguments")
} }
fileName := os.Args[1] fileName := os.Args[1]
mustExist(fileName) mustExist(fileName)
@@ -78,13 +78,13 @@ func main() {
// If the given file has a config, load the config into a stack of regColors. // If the given file has a config, load the config into a stack of regColors.
regColorStack, err := loadConfig(configFilename) regColorStack, err := loadConfig(configFilename)
if err != nil { if err != nil {
printAndExit(err.Error()) printErrAndExit(err.Error())
} }
// Load the input file into a colorunit slice (units) and a byte slice (data) // Load the input file into a colorunit slice (units) and a byte slice (data)
units, data, err := loadInputFile(fileName) units, data, err := loadInputFile(fileName)
if err != nil { if err != nil {
printAndExit(err.Error()) printErrAndExit(err.Error())
} }
// For each regular expression in the stack, apply it to the byte slice. Find // For each regular expression in the stack, apply it to the byte slice. Find