No unnecessary *ln() calls

diff --git a/cleanup.go b/cleanup.go
index d0b508d44201a7645717f77192b653cd5f4f30ef..0f779972fd8d8dfe4d6dec453bb06e2372e733d4 100644 (file)
--- a/cleanup.go
+++ b/cleanup.go
@@ -95,7 +95,7 @@ func redoDirClean(root, what string) error {
                                        }
                                }
                        default:
-                               log.Fatalln("unknown cleanup target")
+                               log.Fatal("unknown cleanup target")
                        }
                }
        }

diff --git a/js.go b/js.go
index 56566e444d1c9391b38e113aa796011435fcc6a8..e79e2983caa9df96d16776deb547ebce5e8b341d 100644 (file)
--- a/js.go
+++ b/js.go
@@ -99,7 +99,7 @@ func jsStart(jobsEnv string) {
        }
        JSR, JSW, err = os.Pipe()
        if err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        tracef(CJS, "initial fill with %d", jobs)
        jsTokens[BMakeGoodToken] = int(jobs)
@@ -153,7 +153,7 @@ func jsInit() {
        func() {
                defer func() {
                        if err := recover(); err != nil {
-                               log.Fatalln(err)
+                               log.Fatal(err)
                        }
                }()
                JSR = mustParseFd(match[2], "JSR")

diff --git a/main.go b/main.go
index 0fb48d6819911eed9647a20611bf9c50580c61a1..b54baadb1fe7e376d7e68eed57112d461e83e969 100644 (file)
--- a/main.go
+++ b/main.go
@@ -128,7 +128,7 @@ func main() {
                        fmt.Println(os.Args[0], "<-", cmdName)
                        if err := os.Symlink(os.Args[0], cmdName); err != nil {
                                rc = 1
-                               log.Println(err)
+                               log.Print(err)
                        }
                }
                os.Exit(rc)
@@ -141,7 +141,7 @@ func main() {
        var err error
        Cwd, err = os.Getwd()
        if err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 
        TopDir = os.Getenv(EnvTopDir)
@@ -218,17 +218,17 @@ func main() {
        // Those are internal envs
        FdOODTgts, err = os.CreateTemp("", "ood-tgts")
        if err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if err = os.Remove(FdOODTgts.Name()); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        FdOODTgtsLock, err = os.CreateTemp("", "ood-tgts.lock")
        if err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if err = os.Remove(FdOODTgtsLock.Name()); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 
        if v := os.Getenv(EnvOODTgtsFd); v != "" {
@@ -239,18 +239,18 @@ func main() {
                        Whence: io.SeekStart,
                }
                if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                if _, err = fd.Seek(0, io.SeekStart); err != nil {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                tgtsRaw, err := io.ReadAll(bufio.NewReader(fd))
                if err != nil {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                flock.Type = unix.F_UNLCK
                if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLK, &flock); err != nil {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                OODTgts = map[string]struct{}{}
                for _, tgtRaw := range bytes.Split(tgtsRaw, []byte{0}) {
@@ -286,7 +286,7 @@ func main() {
                IsTopRedo = true
                raw := new([16]byte)
                if _, err = io.ReadFull(rand.Reader, raw[:]); err != nil {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                raw[6] = (raw[6] & 0x0F) | uint8(4<<4) // version 4
                BuildUUID = fmt.Sprintf(
@@ -381,13 +381,13 @@ CmdSwitch:
                err = stamp(fdDep, os.Stdin)
        case CmdNameRedoLog:
                if len(tgts) != 1 {
-                       log.Fatalln("single target expected")
+                       log.Fatal("single target expected")
                }
                d, t := cwdAndTgt(tgts[0])
                err = showBuildLog(d, t, nil, 0)
        case CmdNameRedoWhichdo:
                if len(tgts) != 1 {
-                       log.Fatalln("single target expected")
+                       log.Fatal("single target expected")
                }
                var fdTmp *os.File
                fdTmp, err = os.CreateTemp("", "whichdo")
@@ -446,7 +446,7 @@ CmdSwitch:
                }
        case CmdNameRedoAffects:
                if tgtsWasEmpty {
-                       log.Fatalln("no targets specified")
+                       log.Fatal("no targets specified")
                }
                var tgtsKnown []string
                tgtsKnown, err = targetsWalker([]string{Cwd})
@@ -521,7 +521,7 @@ CmdSwitch:
                log.Fatalln("unknown command", cmdName)
        }
        if err != nil {
-               log.Println(err)
+               log.Print(err)
        }
        rc := 0
        if !ok || err != nil {

diff --git a/ood.go b/ood.go
index b499041abe5edc91a0d859f590a9d23251d013ec..2000f4405ab499d0f7efe04d6de38642fd182ec4 100644 (file)
--- a/ood.go
+++ b/ood.go
@@ -301,17 +301,17 @@ RecordOODTgt:
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err = FdOODTgts.Seek(0, io.SeekEnd); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err := FdOODTgts.WriteString(p + "\x00"); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        return true, nil
 }
@@ -323,13 +323,13 @@ func oodTgtsClear() {
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if err = FdOODTgts.Truncate(0); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 }

diff --git a/run.go b/run.go
index 0bc3155661143249eef83b592e69d0506c980090..bb1efb0ad2526d4e7e6f05c2881dea55429ee2e8 100644 (file)
--- a/run.go
+++ b/run.go
@@ -236,7 +236,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                tracef(CDebug, "waiting: %s (pid=%d)", tgtOrig, flock.Pid)
                if FdStatus != nil {
                        if _, err = FdStatus.Write([]byte{StatusWait}); err != nil {
-                               log.Fatalln(err)
+                               log.Fatal(err)
                        }
                }
                go func() {
@@ -254,7 +254,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        tracef(CDebug, "waiting done: %s", tgtOrig)
                        if FdStatus != nil {
                                if _, err = FdStatus.Write([]byte{StatusWaited}); err != nil {
-                                       log.Fatalln(err)
+                                       log.Fatal(err)
                                }
                        }
                        var depInfo *DepInfo
@@ -477,7 +477,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
 
                if FdStatus != nil {
                        if _, err = FdStatus.Write([]byte{StatusRun}); err != nil {
-                               log.Fatalln(err)
+                               log.Fatal(err)
                        }
                }
 
@@ -583,7 +583,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                        err = w.Flush()
                                Err:
                                        if err != nil {
-                                               log.Println(err)
+                                               log.Print(err)
                                                os.Remove(logRecPath)
                                        }
                                        fdStderr.Close()
@@ -597,7 +597,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        os.Remove(tmpPath)
                        if FdStatus != nil {
                                if _, err = FdStatus.Write([]byte{StatusDone}); err != nil {
-                                       log.Fatalln(err)
+                                       log.Fatal(err)
                                }
                        }
                        Jobs.Done()

diff --git a/sources.go b/sources.go
index f57dbaf3b37f49324ec5a54dac3008051dad16ff..040ea97bfb4c4996283c8387bbac63cae3d60d69 100644 (file)
--- a/sources.go
+++ b/sources.go
@@ -55,7 +55,7 @@ func sourcesWalker(tgts []string) ([]string, error) {
                        } else if depTgtAbsPath != tgtAbsPath {
                                subSrcs, err := sourcesWalker([]string{cwdMustRel(depTgtAbsPath)})
                                if err != nil {
-                                       log.Fatalln(err)
+                                       log.Fatal(err)
                                }
                                for _, p := range subSrcs {
                                        seen[p] = struct{}{}

diff --git a/status.go b/status.go
index a75108e1a03879ab0f40a9f5fde013f42766818f..adfbecb6f2781d1504d2b10d48d4927a4d768571 100644 (file)
--- a/status.go
+++ b/status.go
@@ -66,7 +66,7 @@ func statusInit() {
        var err error
        r, FdStatus, err = os.Pipe()
        if err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        go func() {
                running := 0