Change error code type to avoid integer overflow conversion warning

navidrome · Sep 1, 2024 · fc5d18f · fc5d18f
1 parent 4612b0a
commit fc5d18f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/server/subsonic/api.go b/server/subsonic/api.go
@@ -281,7  281,7 @@ func sendError(w http.ResponseWriter, r *http.Request, err error) {
 	subErr := mapToSubsonicError(err)
 	response := newResponse()
 	response.Status = responses.StatusFailed
-	response.Error = &responses.Error{Code: int32(subErr.code), Message: subErr.Error()}
 	response.Error = &responses.Error{Code: subErr.code, Message: subErr.Error()}
 
 	sendResponse(w, r, response)
 }

diff --git a/server/subsonic/helpers.go b/server/subsonic/helpers.go
@@ -28,11  28,11 @@ func newResponse() *responses.Subsonic {
 }
 
 type subError struct {
-	code     int
 	code     int32
 	messages []interface{}
 }
 
-func newError(code int, message ...interface{}) error {
 func newError(code int32, message ...interface{}) error {
 	return subError{
 		code:     code,
 		messages: message,

diff --git a/server/subsonic/responses/errors.go b/server/subsonic/responses/errors.go
@@ -1,17  1,17 @@
 package responses
 
 const (
-	ErrorGeneric            = 0
-	ErrorMissingParameter   = 10
-	ErrorClientTooOld       = 20
-	ErrorServerTooOld       = 30
-	ErrorAuthenticationFail = 40
-	ErrorAuthorizationFail  = 50
-	ErrorTrialExpired       = 60
-	ErrorDataNotFound       = 70
 	ErrorGeneric            int32 = 0
 	ErrorMissingParameter   int32 = 10
 	ErrorClientTooOld       int32 = 20
 	ErrorServerTooOld       int32 = 30
 	ErrorAuthenticationFail int32 = 40
 	ErrorAuthorizationFail  int32 = 50
 	ErrorTrialExpired       int32 = 60
 	ErrorDataNotFound       int32 = 70
 )
 
-var errors = map[int]string{
 var errors = map[int32]string{
 	ErrorGeneric:            "A generic error",
 	ErrorMissingParameter:   "Required parameter is missing",
 	ErrorClientTooOld:       "Incompatible Subsonic REST protocol version. Client must upgrade",
@@ -22,7  22,7 @@ var errors = map[int]string{
 	ErrorDataNotFound:       "The requested data was not found",
 }
 
-func ErrorMsg(code int) string {
 func ErrorMsg(code int32) string {
 	if v, found := errors[code]; found {
 		return v
 	}