Skip to content

Commit a7e5fda

Browse files
tejzprtejzpr
committed
Refactor logging statements to fix unused return values
1 parent 02f3cbb commit a7e5fda

37 files changed

Lines changed: 180 additions & 180 deletions

‎calling/call.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ func (c *Call) postCall(roapMsg *RoapMessage) (*MobiusCallResponse, error) {
648648
if err != nil {
649649
return nil, fmt.Errorf("error making call request: %w", err)
650650
}
651-
defer resp.Body.Close()
651+
defer func() { _ = resp.Body.Close() }()
652652

653653
body, err := io.ReadAll(resp.Body)
654654
if err != nil {
@@ -703,7 +703,7 @@ func (c *Call) deleteCall() error {
703703
if err != nil {
704704
return fmt.Errorf("error making delete request: %w", err)
705705
}
706-
defer resp.Body.Close()
706+
defer func() { _ = resp.Body.Close() }()
707707

708708
return nil
709709
}
@@ -740,7 +740,7 @@ func (c *Call) postToMobius(url string, payload interface{}) error {
740740
if err != nil {
741741
return fmt.Errorf("error making request: %w", err)
742742
}
743-
defer resp.Body.Close()
743+
defer func() { _ = resp.Body.Close() }()
744744

745745
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
746746
body, _ := io.ReadAll(resp.Body)

‎calling/callcontrol_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func TestMediaEngine(t *testing.T) {
177177
if err != nil {
178178
t.Fatalf("Unexpected error: %v", err)
179179
}
180-
defer me.Close()
180+
defer func() { _ = me.Close() }()
181181

182182
state := me.GetConnectionState()
183183
if state.String() == "" {
@@ -190,7 +190,7 @@ func TestMediaEngine(t *testing.T) {
190190
if err != nil {
191191
t.Fatalf("Unexpected error: %v", err)
192192
}
193-
defer me.Close()
193+
defer func() { _ = me.Close() }()
194194

195195
called := false
196196
me.OnRemoteTrack(func(track *webrtc.TrackRemote) {
@@ -584,7 +584,7 @@ func TestCall(t *testing.T) {
584584
DeviceID: "dev-1",
585585
LineID: "line-1",
586586
})
587-
defer call.GetMedia().Close()
587+
defer func() { _ = call.GetMedia().Close() }()
588588

589589
err := call.Resume()
590590
if err == nil {
@@ -617,7 +617,7 @@ func TestCall(t *testing.T) {
617617
DeviceID: "dev-1",
618618
LineID: "line-1",
619619
})
620-
defer call.GetMedia().Close()
620+
defer func() { _ = call.GetMedia().Close() }()
621621

622622
err := call.SendDigit("5")
623623
if err == nil {
@@ -632,7 +632,7 @@ func TestCall(t *testing.T) {
632632
DeviceID: "dev-1",
633633
LineID: "line-1",
634634
})
635-
defer call.GetMedia().Close()
635+
defer func() { _ = call.GetMedia().Close() }()
636636

637637
err := call.CompleteTransfer(TransferTypeBlind, "", "+15551234567")
638638
if err == nil {
@@ -647,7 +647,7 @@ func TestCall(t *testing.T) {
647647
DeviceID: "dev-1",
648648
LineID: "line-1",
649649
})
650-
defer call.GetMedia().Close()
650+
defer func() { _ = call.GetMedia().Close() }()
651651

652652
call.mu.Lock()
653653
call.state = CallStateConnected
@@ -666,7 +666,7 @@ func TestCall(t *testing.T) {
666666
DeviceID: "dev-1",
667667
LineID: "line-1",
668668
})
669-
defer call.GetMedia().Close()
669+
defer func() { _ = call.GetMedia().Close() }()
670670

671671
reason := call.GetDisconnectReason()
672672
if reason.Code != DisconnectCodeNormal {
@@ -681,7 +681,7 @@ func TestCall(t *testing.T) {
681681
DeviceID: "dev-1",
682682
LineID: "line-1",
683683
})
684-
defer call.GetMedia().Close()
684+
defer func() { _ = call.GetMedia().Close() }()
685685

686686
call.HandleMobiusEvent(nil) // should not panic
687687
})
@@ -693,7 +693,7 @@ func TestCall(t *testing.T) {
693693
DeviceID: "dev-1",
694694
LineID: "line-1",
695695
})
696-
defer call.GetMedia().Close()
696+
defer func() { _ = call.GetMedia().Close() }()
697697

698698
call.mu.Lock()
699699
call.state = CallStateProceeding
@@ -726,7 +726,7 @@ func TestCall(t *testing.T) {
726726
DeviceID: "dev-1",
727727
LineID: "line-1",
728728
})
729-
defer call.GetMedia().Close()
729+
defer func() { _ = call.GetMedia().Close() }()
730730

731731
connectEmitted := false
732732
call.Emitter.On(string(CallEventConnect), func(data interface{}) {

‎calling/callhistory.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (c *CallHistoryClient) GetCallHistoryData(days, limit int, sort Sort, sortB
6060
if err != nil {
6161
return nil, fmt.Errorf("error making request: %w", err)
6262
}
63-
defer resp.Body.Close()
63+
defer func() { _ = resp.Body.Close() }()
6464

6565
body, err := io.ReadAll(resp.Body)
6666
if err != nil {
@@ -123,7 +123,7 @@ func (c *CallHistoryClient) UpdateMissedCalls(endTimeSessionIDs []EndTimeSession
123123
if err != nil {
124124
return nil, fmt.Errorf("error making request: %w", err)
125125
}
126-
defer resp.Body.Close()
126+
defer func() { _ = resp.Body.Close() }()
127127

128128
body, err := io.ReadAll(resp.Body)
129129
if err != nil {
@@ -180,7 +180,7 @@ func (c *CallHistoryClient) DeleteCallHistoryRecords(deleteSessionIDs []EndTimeS
180180
if err != nil {
181181
return nil, fmt.Errorf("error making request: %w", err)
182182
}
183-
defer resp.Body.Close()
183+
defer func() { _ = resp.Body.Close() }()
184184

185185
body, err := io.ReadAll(resp.Body)
186186
if err != nil {

‎calling/callingclient.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (cc *CallingClient) DiscoverMobiusServers() error {
154154
}
155155

156156
body, _ := io.ReadAll(resp.Body)
157-
resp.Body.Close()
157+
_ = resp.Body.Close()
158158

159159
if resp.StatusCode != http.StatusOK {
160160
log.Printf("Mobius discovery returned %d for host %s: %s", resp.StatusCode, host, string(body))
@@ -246,7 +246,7 @@ func (cc *CallingClient) getRegionInfo() (*regionInfoResult, error) {
246246
if err != nil {
247247
return nil, err
248248
}
249-
defer resp.Body.Close()
249+
defer func() { _ = resp.Body.Close() }()
250250

251251
if resp.StatusCode != http.StatusOK {
252252
body, _ := io.ReadAll(resp.Body)
@@ -310,7 +310,7 @@ func (cc *CallingClient) registerWDMDevice() ([]string, error) {
310310
if err != nil {
311311
return nil, fmt.Errorf("error making WDM request: %w", err)
312312
}
313-
defer resp.Body.Close()
313+
defer func() { _ = resp.Body.Close() }()
314314

315315
body, err := io.ReadAll(resp.Body)
316316
if err != nil {
@@ -505,7 +505,7 @@ func (cc *CallingClient) DeregisterAllDevices() (int, error) {
505505
return 0, err
506506
}
507507
body, _ := io.ReadAll(resp.Body)
508-
resp.Body.Close()
508+
_ = resp.Body.Close()
509509

510510
if resp.StatusCode == http.StatusForbidden {
511511
var errResp struct {

‎calling/callsettings.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (c *CallSettingsClient) doSettingsRequest(method, url string, body interfac
5555
if err != nil {
5656
return nil, fmt.Errorf("error making request: %w", err)
5757
}
58-
defer resp.Body.Close()
58+
defer func() { _ = resp.Body.Close() }()
5959

6060
respBody, err := io.ReadAll(resp.Body)
6161
if err != nil {

‎calling/contacts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (c *ContactsClient) doContactsRequest(method, url string, body interface{})
5454
if err != nil {
5555
return nil, fmt.Errorf("error making request: %w", err)
5656
}
57-
defer resp.Body.Close()
57+
defer func() { _ = resp.Body.Close() }()
5858

5959
respBody, err := io.ReadAll(resp.Body)
6060
if err != nil {

‎calling/line.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (l *Line) attemptRegistration(mobiusURL string) error {
179179
if err != nil {
180180
return fmt.Errorf("error making registration request: %w", err)
181181
}
182-
defer resp.Body.Close()
182+
defer func() { _ = resp.Body.Close() }()
183183
log.Printf("Registration: received response status %d from %s", resp.StatusCode, url)
184184

185185
body, err := io.ReadAll(resp.Body)
@@ -256,7 +256,7 @@ func (l *Line) deleteDevice(mobiusURL string, deviceID string) error {
256256
if err != nil {
257257
return fmt.Errorf("error making delete request: %w", err)
258258
}
259-
defer resp.Body.Close()
259+
defer func() { _ = resp.Body.Close() }()
260260

261261
body, _ := io.ReadAll(resp.Body)
262262
if resp.StatusCode >= 200 && resp.StatusCode < 300 {
@@ -314,7 +314,7 @@ func (l *Line) Deregister() error {
314314
if err != nil {
315315
log.Printf("Deregister request failed: %v", err)
316316
} else {
317-
resp.Body.Close()
317+
_ = resp.Body.Close()
318318
}
319319

320320
l.mu.Lock()
@@ -441,7 +441,7 @@ func (l *Line) sendKeepalive() {
441441
log.Printf("Keepalive request failed: %v", err)
442442
return
443443
}
444-
defer resp.Body.Close()
444+
defer func() { _ = resp.Body.Close() }()
445445

446446
if resp.StatusCode == http.StatusNotFound {
447447
log.Printf("Keepalive returned 404, device may have been deregistered")

‎calling/voicemail.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *VoicemailClient) doRequest(method, url string) ([]byte, int, error) {
4545
if err != nil {
4646
return nil, 0, fmt.Errorf("error making request: %w", err)
4747
}
48-
defer resp.Body.Close()
48+
defer func() { _ = resp.Body.Close() }()
4949

5050
body, err := io.ReadAll(resp.Body)
5151
if err != nil {

‎contents/contents.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (c *Client) DownloadWithOptions(contentID string, opts *DownloadOptions) (*
9999
if err != nil {
100100
return nil, fmt.Errorf("error fetching content: %w", err)
101101
}
102-
defer resp.Body.Close()
102+
defer func() { _ = resp.Body.Close() }()
103103

104104
if resp.StatusCode >= 400 {
105105
body, _ := io.ReadAll(resp.Body)
@@ -151,7 +151,7 @@ func (c *Client) DownloadFromURLWithOptions(contentURL string, opts *DownloadOpt
151151
if err != nil {
152152
return nil, fmt.Errorf("error fetching content: %w", err)
153153
}
154-
defer resp.Body.Close()
154+
defer func() { _ = resp.Body.Close() }()
155155

156156
if resp.StatusCode >= 400 {
157157
body, _ := io.ReadAll(resp.Body)

‎device/device.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (c *Client) Register() error {
151151
if err != nil {
152152
return fmt.Errorf("error sending request: %w", err)
153153
}
154-
defer resp.Body.Close()
154+
defer func() { _ = resp.Body.Close() }()
155155

156156
// Read the response
157157
respBody, err := io.ReadAll(resp.Body)
@@ -221,7 +221,7 @@ func (c *Client) Unregister() error {
221221
if err != nil {
222222
return fmt.Errorf("error sending request: %w", err)
223223
}
224-
defer resp.Body.Close()
224+
defer func() { _ = resp.Body.Close() }()
225225

226226
// Check for error
227227
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent {
@@ -376,7 +376,7 @@ func (c *Client) Refresh() error {
376376
if err != nil {
377377
return fmt.Errorf("error sending refresh request: %w", err)
378378
}
379-
defer resp.Body.Close()
379+
defer func() { _ = resp.Body.Close() }()
380380

381381
// Check if there was no change (304 Not Modified)
382382
if resp.StatusCode == http.StatusNotModified {

0 commit comments

Comments
 (0)