diff --git a/file.go b/file.go index 1d569572..710241fe 100644 --- a/file.go +++ b/file.go @@ -368,24 +368,21 @@ func (obj *FileType) ApplyDir() bool { func (obj *FileType) Compare(typ Type) bool { switch typ.(type) { case *FileType: - return obj.compare(typ.(*FileType)) + typ := typ.(*FileType) + if obj.Name != typ.Name { + return false + } + if obj.GetPath() != typ.Path { + return false + } + if obj.Content != typ.Content { + return false + } + if obj.State != typ.State { + return false + } default: return false } -} - -func (obj *FileType) compare(typ *FileType) bool { - if obj.Name != typ.Name { - return false - } - if obj.GetPath() != typ.Path { - return false - } - if obj.Content != typ.Content { - return false - } - if obj.State != typ.State { - return false - } return true } diff --git a/service.go b/service.go index 6f86f062..69e94415 100644 --- a/service.go +++ b/service.go @@ -304,21 +304,18 @@ func (obj *ServiceType) Apply() bool { func (obj *ServiceType) Compare(typ Type) bool { switch typ.(type) { case *ServiceType: - return obj.compare(typ.(*ServiceType)) + typ := typ.(*ServiceType) + if obj.Name != typ.Name { + return false + } + if obj.State != typ.State { + return false + } + if obj.Startup != typ.Startup { + return false + } default: return false } -} - -func (obj *ServiceType) compare(typ *ServiceType) bool { - if obj.Name != typ.Name { - return false - } - if obj.State != typ.State { - return false - } - if obj.Startup != typ.Startup { - return false - } return true } diff --git a/types.go b/types.go index 6aa685e3..709154a0 100644 --- a/types.go +++ b/types.go @@ -294,15 +294,12 @@ func (obj *NoopType) Compare(typ Type) bool { switch typ.(type) { // we can only compare NoopType to others of the same type case *NoopType: - return obj.compare(typ.(*NoopType)) + typ := typ.(*NoopType) + if obj.Name != typ.Name { + return false + } default: return false } -} - -func (obj *NoopType) compare(typ *NoopType) bool { - if obj.Name != typ.Name { - return false - } return true }