fix rebase

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

internal/http/services/owncloud/ocdav/propfind.go

@@ -53,9 +53,9 @@ const (
 	// RFC1123 time that mimics oc10. time.RFC1123 would end in "UTC", see https://github.com/golang/go/issues/13781
 	RFC1123 = "Mon, 02 Jan 2006 15:04:05 GMT"
 
-	_propQuotaUncalculated = "-1"
-	_propQuotaUnknown      = "-2"
-	_propQuotaUnlimited    = "-3"
+	//_propQuotaUncalculated = "-1"
+	_propQuotaUnknown = "-2"
+	//_propQuotaUnlimited    = "-3"
 )
 
 // ns is the namespace that is prefixed to the path in the cs3 namespace

internal/http/services/owncloud/ocs/handlers/cloud/cloud.go

@@ -37,12 +37,12 @@ type Handler struct {
 }
 
 // Init initializes this and any contained handlers
-func (h *Handler) Init(c *config.Config) {
+func (h *Handler) Init(c *config.Config) error {
 	h.UserHandler = new(user.Handler)
-	h.UsersHandler = new(users.Handler)
-	h.UsersHandler.Init(c)
 	h.CapabilitiesHandler = new(capabilities.Handler)
 	h.CapabilitiesHandler.Init(c)
+	h.UsersHandler = new(users.Handler)
+	return h.UsersHandler.Init(c)
 }
 
 // Handler routes the cloud endpoints

internal/http/services/owncloud/ocs/v1.go

@@ -37,15 +37,14 @@ type V1Handler struct {
 }
 
 func (h *V1Handler) init(c *config.Config) error {
+	h.ConfigHandler.Init(c)
+	h.CloudHandler = new(cloud.Handler)
 	h.AppsHandler = new(apps.Handler)
 	if err := h.AppsHandler.Init(c); err != nil {
 		return err
 	}
-	h.CloudHandler = new(cloud.Handler)
-	h.CloudHandler.Init(c)
 	h.ConfigHandler = new(configHandler.Handler)
-	h.ConfigHandler.Init(c)
-	return nil
+	return h.CloudHandler.Init(c)
 }
 
 // Handler handles requests

pkg/storage/fs/s3ng/s3ng.go

@@ -139,7 +139,7 @@ func (fs *s3ngfs) Shutdown(ctx context.Context) error {
 	return nil
 }
 
-func (fs *s3ngfs) GetQuota(ctx context.Context) (int, int, error) {
+func (fs *s3ngfs) GetQuota(ctx context.Context) (uint64, uint64, error) {
 	return 0, 0, nil
 }