From b99f38a1b730097a453b9490a99a67e6db75867f Mon Sep 17 00:00:00 2001 From: Conrad Hoffmann Date: Fri, 28 Oct 2022 12:37:41 +0200 Subject: [PATCH] Fix assignment to shadowed variable This fixes the request that creates the address book returning an error even though it was successfully created and read. --- storage/filesystem.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/storage/filesystem.go b/storage/filesystem.go index 7aac265..53f3882 100644 --- a/storage/filesystem.go +++ b/storage/filesystem.go @@ -235,8 +235,8 @@ func (b *filesystemBackend) AddressBook(ctx context.Context) (*carddav.AddressBo debug.Printf("loading addressbook from %s", path) - data, err := ioutil.ReadFile(path) - if os.IsNotExist(err) { + data, readErr := ioutil.ReadFile(path) + if os.IsNotExist(readErr) { urlPath, err := b.AddressbookHomeSetPath(ctx) if err != nil { return nil, err @@ -246,9 +246,9 @@ func (b *filesystemBackend) AddressBook(ctx context.Context) (*carddav.AddressBo if err != nil { return nil, err } - data, err = ioutil.ReadFile(path) + data, readErr = ioutil.ReadFile(path) } - if err != nil { + if readErr != nil { return nil, fmt.Errorf("error opening address book: %s", err.Error()) } var addressBook carddav.AddressBook @@ -492,7 +492,7 @@ func (b *filesystemBackend) Calendar(ctx context.Context) (*caldav.Calendar, err debug.Printf("loading calendar from %s", path) - data, err := ioutil.ReadFile(path) + data, readErr := ioutil.ReadFile(path) if os.IsNotExist(err) { homeSetPath, err := b.CalendarHomeSetPath(ctx) if err != nil { @@ -503,9 +503,9 @@ func (b *filesystemBackend) Calendar(ctx context.Context) (*caldav.Calendar, err if err != nil { return nil, err } - data, err = ioutil.ReadFile(path) + data, readErr = ioutil.ReadFile(path) } - if err != nil { + if readErr != nil { return nil, fmt.Errorf("error opening calendar: %s", err.Error()) } var calendar caldav.Calendar