ToxicMushroom/tokidoki
1
0
Fork 0
mirror of https://git.sr.ht/~sircmpwn/tokidoki synced 2025-12-12 14:17:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix assignment to shadowed variable

Browse source 
This fixes the request that creates the address book returning an error
even though it was successfully created and read.
This commit is contained in:
Conrad Hoffmann 2022-10-28 12:37:41 +02:00
parent 196503553a
commit b99f38a1b7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
storage/filesystem.go
View file

@ -235,8 +235,8 @@ func (b *filesystemBackend) AddressBook(ctx context.Context) (*carddav.AddressBo
debug.Printf("loading addressbook from %s", path) debug.Printf("loading addressbook from %s", path)
data, err := ioutil.ReadFile(path) data, readErr := ioutil.ReadFile(path)
if os.IsNotExist(err) { if os.IsNotExist(readErr) {
urlPath, err := b.AddressbookHomeSetPath(ctx) urlPath, err := b.AddressbookHomeSetPath(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
@ -246,9 +246,9 @@ func (b *filesystemBackend) AddressBook(ctx context.Context) (*carddav.AddressBo
if err != nil { if err != nil {
return nil, err 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()) return nil, fmt.Errorf("error opening address book: %s", err.Error())
} }
var addressBook carddav.AddressBook 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) debug.Printf("loading calendar from %s", path)
data, err := ioutil.ReadFile(path) data, readErr := ioutil.ReadFile(path)
if os.IsNotExist(err) { if os.IsNotExist(err) {
homeSetPath, err := b.CalendarHomeSetPath(ctx) homeSetPath, err := b.CalendarHomeSetPath(ctx)
if err != nil { if err != nil {
@ -503,9 +503,9 @@ func (b *filesystemBackend) Calendar(ctx context.Context) (*caldav.Calendar, err
if err != nil { if err != nil {
return nil, err 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()) return nil, fmt.Errorf("error opening calendar: %s", err.Error())
} }
var calendar caldav.Calendar var calendar caldav.Calendar