fix build after rebase

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jul 6, 2022 · 9c7fe92 · 9c7fe92
1 parent b887045
commit 9c7fe92
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind.go b/internal/http/services/owncloud/ocdav/propfind/propfind.go
@@ -404,7 +404,7 @@ func (p *Handler) propfindResponse(ctx context.Context, w http.ResponseWriter, r
 	}
 
 	/*propRes, err :=*/
-	RenderMultistatusResponse(ctx, w, &pf, resourceInfos, p.PublicURL, namespace, spaceType, linkshares, sendTusHeaders)
+	RenderMultistatusResponse(ctx, w, &pf, resourceInfos, p.PublicURL, namespace, linkshares, sendTusHeaders)
 	/*
 		if err != nil {
 			log.Error().Err(err).Msg("error formatting propfind")
@@ -891,7 +891,7 @@ func RenderMultistatusFooter(_ context.Context, w http.ResponseWriter, sendTusHe
 }
 
 // RenderMultistatusResponse converts a list of resource infos into a multistatus response string
-func RenderMultistatusResponse(ctx context.Context, w http.ResponseWriter, pf *XML, mds []*provider.ResourceInfo, publicURL, ns, spaceType string, linkshares map[string]struct{}, sendTusHeaders bool) {
+func RenderMultistatusResponse(ctx context.Context, w http.ResponseWriter, pf *XML, mds []*provider.ResourceInfo, publicURL, ns string, linkshares map[string]struct{}, sendTusHeaders bool) {
 	log := appctx.GetLogger(ctx)
 	if err := RenderMultistatusHeader(ctx, w, sendTusHeaders); err != nil {
 		log.Err(err).Msg("error writing xml header")

diff --git a/internal/http/services/owncloud/ocdav/publicfile.go b/internal/http/services/owncloud/ocdav/publicfile.go
@@ -112,7 +112,7 @@ func (s *svc) handlePropfindOnToken(w http.ResponseWriter, r *http.Request, ns s
 	infos := s.getPublicFileInfos(onContainer, depth == net.DepthZero, tokenStatInfo)
 
 	/*propRes, err :=*/
-	propfind.RenderMultistatusResponse(ctx, w, &pf, infos, s.c.PublicURL, ns, "", nil, false) // TODO why not announce TUS by sending the headers?
+	propfind.RenderMultistatusResponse(ctx, w, &pf, infos, s.c.PublicURL, ns, nil, false) // TODO why not announce TUS by sending the headers?
 	/*
 		if err != nil {
 			sublog.Error().Err(err).Msg("error formatting propfind")

diff --git a/internal/http/services/owncloud/ocdav/report.go b/internal/http/services/owncloud/ocdav/report.go
@@ -110,7 +110,7 @@ func (s *svc) doFilterFiles(w http.ResponseWriter, r *http.Request, ff *reportFi
 		}
 
 		/*responsesXML, err :=*/
-		propfind.RenderMultistatusResponse(ctx, w, &propfind.XML{Prop: ff.Prop}, infos, s.c.PublicURL, namespace, "", nil, false) // TODO why not announce TUS by sending headers?
+		propfind.RenderMultistatusResponse(ctx, w, &propfind.XML{Prop: ff.Prop}, infos, s.c.PublicURL, namespace, nil, false) // TODO why not announce TUS by sending headers?
 		/*
 			if err != nil {
 				log.Error().Err(err).Msg("error formatting propfind")

diff --git a/internal/http/services/owncloud/ocdav/versions.go b/internal/http/services/owncloud/ocdav/versions.go
@@ -190,7 +190,7 @@ func (h *VersionsHandler) doListVersions(w http.ResponseWriter, r *http.Request,
 	}
 
 	/*propRes, err :=*/
-	propfind.RenderMultistatusResponse(ctx, w, &pf, infos, s.c.PublicURL, "", "", nil, false)
+	propfind.RenderMultistatusResponse(ctx, w, &pf, infos, s.c.PublicURL, "", nil, false)
 	/*
 		if err != nil {
 			sublog.Error().Err(err).Msg("error formatting propfind")