InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/server/httputils: remove badParameterError

Browse Source 
The "param" field was only used to generate the error-message, and the
produced error-message was missing a space so we may as well just inline it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2026-01-05 13:51:59 +01:00
parent 9f92b72f2f
commit d85c1a258a
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/server/httputils/form.go
View File

@@ -114,16 +114,6 @@ type ArchiveOptions struct {
Path string Path string
} }
type badParameterError struct {
param string
}
func (e badParameterError) Error() string {
return "bad parameter: " + e.param + "cannot be empty"
}
func (e badParameterError) InvalidParameter() {}
// ArchiveFormValues parses form values and turns them into ArchiveOptions. // ArchiveFormValues parses form values and turns them into ArchiveOptions.
// It fails if the archive name and path are not in the request. // It fails if the archive name and path are not in the request.
func ArchiveFormValues(r *http.Request, vars map[string]string) (ArchiveOptions, error) { func ArchiveFormValues(r *http.Request, vars map[string]string) (ArchiveOptions, error) {
@@ -133,11 +123,11 @@ func ArchiveFormValues(r *http.Request, vars map[string]string) (ArchiveOptions,
name := vars["name"] name := vars["name"]
if name == "" { if name == "" {
return ArchiveOptions{}, badParameterError{"name"} return ArchiveOptions{}, errdefs.InvalidParameter(errors.New("bad parameter: name cannot be empty"))
} }
path := r.Form.Get("path") path := r.Form.Get("path")
if path == "" { if path == "" {
return ArchiveOptions{}, badParameterError{"path"} return ArchiveOptions{}, errdefs.InvalidParameter(errors.New("bad parameter: path cannot be empty"))
} }
return ArchiveOptions{name, path}, nil return ArchiveOptions{name, path}, nil
} }