yuzu-emu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2024-11-24 05:05:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mac upload_system_symbols: use log.Fatalf where formatting is desired

Browse Source 
Change-Id: I5623da3109feeb4b80137fa67501b8fd7aa5c8ec
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1663995
Reviewed-by: Robert Sesek <rsesek@chromium.org>
This commit is contained in:
Mark Mentovai 2019-06-18 10:31:28 -04:00
parent 488566d2dd
commit 9575315d8b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/mac/upload_system_symbols/upload_system_symbols.go
View File

@ -114,7 +114,7 @@ func main() {
if *dumpOnlyPath != "" { if *dumpOnlyPath != "" {
// -dump-to specified, so make sure that the path is a directory. // -dump-to specified, so make sure that the path is a directory.
if fi, err := os.Stat(*dumpOnlyPath); err != nil { if fi, err := os.Stat(*dumpOnlyPath); err != nil {
log.Fatal("-dump-to location: %v", err) log.Fatalf("-dump-to location: %v", err)
} else if !fi.IsDir() { } else if !fi.IsDir() {
log.Fatal("-dump-to location is not a directory") log.Fatal("-dump-to location is not a directory")
} }
@ -127,7 +127,7 @@ func main() {
uq = StartUploadQueue() uq = StartUploadQueue()
if p, err := ioutil.TempDir("", "upload_system_symbols"); err != nil { if p, err := ioutil.TempDir("", "upload_system_symbols"); err != nil {
log.Fatal("Failed to create temporary directory: %v", err) log.Fatalf("Failed to create temporary directory: %v", err)
} else { } else {
dumpPath = p dumpPath = p
defer os.RemoveAll(p) defer os.RemoveAll(p)
@ -266,7 +266,7 @@ func (dq *DumpQueue) worker() {
symfile := fmt.Sprintf("%s_%s.sym", filebase, req.arch) symfile := fmt.Sprintf("%s_%s.sym", filebase, req.arch)
f, err := os.Create(symfile) f, err := os.Create(symfile)
if err != nil { if err != nil {
log.Fatal("Error creating symbol file:", err) log.Fatalf("Error creating symbol file: %v", err)
} }
cmd := exec.Command(dumpSyms, "-a", req.arch, req.path) cmd := exec.Command(dumpSyms, "-a", req.arch, req.path)
@ -288,13 +288,13 @@ func (dq *DumpQueue) worker() {
func uploadFromDirectory(directory string, uq *UploadQueue) { func uploadFromDirectory(directory string, uq *UploadQueue) {
d, err := os.Open(directory) d, err := os.Open(directory)
if err != nil { if err != nil {
log.Fatal("Could not open directory to upload: %v", err) log.Fatalf("Could not open directory to upload: %v", err)
} }
defer d.Close() defer d.Close()
entries, err := d.Readdirnames(0) entries, err := d.Readdirnames(0)
if err != nil { if err != nil {
log.Fatal("Could not read directory: %v", err) log.Fatalf("Could not read directory: %v", err)
} }
for _, entry := range entries { for _, entry := range entries {
@ -335,14 +335,14 @@ func findLibsInRoot(root string, dq *DumpQueue) {
func (fq *findQueue) findLibsInPath(loc string) { func (fq *findQueue) findLibsInPath(loc string) {
d, err := os.Open(loc) d, err := os.Open(loc)
if err != nil { if err != nil {
log.Fatal("Could not open %s: %v", loc, err) log.Fatalf("Could not open %s: %v", loc, err)
} }
defer d.Close() defer d.Close()
for { for {
fis, err := d.Readdir(100) fis, err := d.Readdir(100)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
log.Fatal("Error reading directory %s: %v", loc, err) log.Fatalf("Error reading directory %s: %v", loc, err)
} }
for _, fi := range fis { for _, fi := range fis {