Fix nil pointer: convert findNote to method
This commit is contained in:
parent
e362662175
commit
7b32240415
|
|
@ -120,10 +120,10 @@ func GetDenoteDir() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// findNote finds a note by identifier in the in-memory collection
|
// findNote finds a note by identifier in the in-memory collection
|
||||||
func findNote(identifier string) (*metadata.Metadata, error) {
|
func (s *server) findNote(identifier string) (*metadata.Metadata, error) {
|
||||||
srv.mu.RLock()
|
s.mu.RLock()
|
||||||
defer srv.mu.RUnlock()
|
defer s.mu.RUnlock()
|
||||||
for _, n := range srv.notes {
|
for _, n := range s.notes {
|
||||||
if n.Identifier == identifier {
|
if n.Identifier == identifier {
|
||||||
return n, nil
|
return n, nil
|
||||||
}
|
}
|
||||||
|
|
@ -138,7 +138,7 @@ func UpdateMetadataFromDisk(identifier, title, keywords, signature string) error
|
||||||
return fmt.Errorf("server not running")
|
return fmt.Errorf("server not running")
|
||||||
}
|
}
|
||||||
|
|
||||||
note, err := findNote(identifier)
|
note, err := srv.findNote(identifier)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
@ -634,7 +634,7 @@ func (s *server) dispatchWrite(f *fid, tag uint16) *plan9.Fcall {
|
||||||
noteID := parts[1]
|
noteID := parts[1]
|
||||||
fieldName := parts[2]
|
fieldName := parts[2]
|
||||||
|
|
||||||
note, err := findNote(noteID)
|
note, err := s.findNote(noteID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errorFcall(fc, err.Error())
|
return errorFcall(fc, err.Error())
|
||||||
}
|
}
|
||||||
|
|
@ -968,7 +968,7 @@ func (s *server) getFileContent(path string) string {
|
||||||
noteID := parts[1]
|
noteID := parts[1]
|
||||||
fileName := parts[2]
|
fileName := parts[2]
|
||||||
|
|
||||||
note, err := findNote(noteID)
|
note, err := s.findNote(noteID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue