fix passing value to pointer argument

This commit is contained in:
nytpu
2021-05-11 15:29:09 -06:00
parent 30b5889fc5
commit b977d663da
+5 -5
View File
@@ -54,17 +54,17 @@ func Init(dataPath string, localizer *localizations.Localizer) error {
jsonBytes, err := ioutil.ReadAll(f) jsonBytes, err := ioutil.ReadAll(f)
f.Close() f.Close()
if err != nil { if err != nil {
return fmt.Errorf(localizer.Get("errors.read_file_error", localizations.Replacements{"file": "comitium.json", "error": err})) return fmt.Errorf(localizer.Get("errors.read_file_error", &localizations.Replacements{"file": "comitium.json", "error": err}))
} }
err = json.Unmarshal(jsonBytes, &Data) err = json.Unmarshal(jsonBytes, &Data)
if err != nil { if err != nil {
return fmt.Errorf(localizer.Get("errors.corrupt_json_error", localizations.Replacements{"error": err})) return fmt.Errorf(localizer.Get("errors.corrupt_json_error", &localizations.Replacements{"error": err}))
} }
} }
f.Close() f.Close()
} else if !os.IsNotExist(err) { } else if !os.IsNotExist(err) {
// There's an error opening the file, but it's not bc is doesn't exist // There's an error opening the file, but it's not bc is doesn't exist
return fmt.Errorf(localizer.Get("errors.read_file_error", localizations.Replacements{"file": "comitium.json", "error": err})) return fmt.Errorf(localizer.Get("errors.read_file_error", &localizations.Replacements{"file": "comitium.json", "error": err}))
} }
if Data.Feeds == nil { if Data.Feeds == nil {
@@ -82,13 +82,13 @@ func Init(dataPath string, localizer *localizations.Localizer) error {
headerBytes, err := ioutil.ReadAll(f) headerBytes, err := ioutil.ReadAll(f)
f.Close() f.Close()
if err != nil { if err != nil {
return fmt.Errorf(localizer.Get("errors.read_file_error", localizations.Replacements{"file": "header.gmi", "error": err})) return fmt.Errorf(localizer.Get("errors.read_file_error", &localizations.Replacements{"file": "header.gmi", "error": err}))
} }
Header = string(headerBytes) Header = string(headerBytes)
} }
f.Close() f.Close()
} else if !os.IsNotExist(err) { } else if !os.IsNotExist(err) {
return fmt.Errorf(localizer.Get("errors.read_file_error", localizations.Replacements{"file": "header.gmi", "error": err})) return fmt.Errorf(localizer.Get("errors.read_file_error", &localizations.Replacements{"file": "header.gmi", "error": err}))
} }
if Header == "" { if Header == "" {