Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: improve errors.As usage (#18794)

Browse source
This commit is contained in:
andig 2025-02-14 14:19:25 +01:00 • committed by GitHub
parent 6eef37131b
commit 760b65761d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/modbus/handler.go
View file

@ -44,9 +44,8 @@ func (h *handler) logResult(op string, b []byte, err error) {
func (h *handler) exceptionToUint16AndError(op string, b []byte, err error) ([]uint16, error) {
h.logResult(op, b, err)
var modbusError *gridx.Error
if errors.As(err, &modbusError) {
err = mbserver.MapExceptionCodeToError(modbusError.ExceptionCode)
if me := new(gridx.Error); errors.As(err, &me) {
err = mbserver.MapExceptionCodeToError(me.ExceptionCode)
}
return bytesAsUint16(b), err
@ -75,9 +74,8 @@ func coilsToBytes(b []bool) []byte {
func (h *handler) bytesToBoolResult(op string, qty uint16, b []byte, err error) ([]bool, error) {
h.logResult(op, b, err)
var modbusError *gridx.Error
if errors.As(err, &modbusError) {
err = mbserver.MapExceptionCodeToError(modbusError.ExceptionCode)
if me := new(gridx.Error); errors.As(err, &me) {
err = mbserver.MapExceptionCodeToError(me.ExceptionCode)
}
var res []bool