Skip to content

Commit 72c3e16

Browse files
committed
refactor(serverHandler): returns new sub items slice instead of mutate pointer
1 parent 2ee09c7 commit 72c3e16

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/serverHandler/responseData.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ func readdir(file *os.File, item os.FileInfo, visitFs bool) (subItems []os.FileI
121121
return file.Readdir(0)
122122
}
123123

124-
func (h *handler) mergeAlias(item os.FileInfo, rawRequestPath string, subItems *[]os.FileInfo) []error {
124+
func (h *handler) mergeAlias(rawRequestPath string, item os.FileInfo, subItems []os.FileInfo) ([]os.FileInfo, []error) {
125125
errs := []error{}
126126

127127
if item == nil || !item.IsDir() {
128-
return errs
128+
return subItems, errs
129129
}
130130

131131
for _, alias := range h.aliases {
@@ -178,20 +178,20 @@ func (h *handler) mergeAlias(item os.FileInfo, rawRequestPath string, subItems *
178178
}
179179

180180
replaced := false
181-
for i, subItem := range *subItems {
181+
for i, subItem := range subItems {
182182
if subItem.Name() == nextName {
183-
(*subItems)[i] = aliasSubItem
183+
subItems[i] = aliasSubItem
184184
replaced = true
185185
break
186186
}
187187
}
188188

189189
if !replaced {
190-
*subItems = append(*subItems, aliasSubItem)
190+
subItems = append(subItems, aliasSubItem)
191191
}
192192
}
193193

194-
return errs
194+
return subItems, errs
195195
}
196196

197197
func getSubItemPrefix(requestPath string, tailSlash bool) (subItemPrefix string) {
@@ -311,7 +311,7 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
311311
status = http.StatusInternalServerError
312312
}
313313

314-
_mergeErrs := h.mergeAlias(item, rawReqPath, &subInfos)
314+
subInfos, _mergeErrs := h.mergeAlias(rawReqPath, item, subInfos)
315315
if len(_mergeErrs) > 0 {
316316
errs = append(errs, _mergeErrs...)
317317
status = http.StatusInternalServerError

0 commit comments

Comments
 (0)