From a49663371d3d25085316daeb5921a1491483f4bf Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 8 Jan 2019 10:14:43 +0200 Subject: [PATCH] Moved error definition --- agents/diamclient.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/agents/diamclient.go b/agents/diamclient.go index e3383c3b4..e8b035851 100644 --- a/agents/diamclient.go +++ b/agents/diamclient.go @@ -35,7 +35,7 @@ import ( var dictOnce sync.Once func NewDiameterClient(addr, originHost, originRealm string, vendorId int, productName string, - firmwareRev int, dictsDir string, network string) (*DiameterClient, error) { + firmwareRev int, dictsDir string, network string) (dc *DiameterClient, err error) { cfg := &sm.Settings{ OriginHost: datatype.DiameterIdentity(originHost), OriginRealm: datatype.DiameterIdentity(originRealm), @@ -77,8 +77,6 @@ func NewDiameterClient(addr, originHost, originRealm string, vendorId int, produ }, } if len(dictsDir) != 0 { - var err error - err = nil dictOnce.Do(func() { err = loadDictionaries(dictsDir, "DiameterClient") }) if err != nil { return nil, err @@ -88,7 +86,7 @@ func NewDiameterClient(addr, originHost, originRealm string, vendorId int, produ if err != nil { return nil, err } - dc := &DiameterClient{conn: conn, handlers: dSM, received: make(chan *diam.Message)} + dc = &DiameterClient{conn: conn, handlers: dSM, received: make(chan *diam.Message)} dSM.HandleFunc("ALL", dc.handleALL) return dc, nil }