net: don't return errno from _C_res_nsearch

We ignore the value anyhow.

Change-Id: I1b1db7831c42bf852652236212812fd5cf258530
Reviewed-on: https://go-review.googlesource.com/c/go/+/457439
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/net/cgo_unix.go b/src/net/cgo_unix.go
index 7ed5daad73a6316dae79de46a926fe8d2b690e35..987931501948192c904f7a8543be46a83158b9a2 100644 (file)
--- a/src/net/cgo_unix.go
+++ b/src/net/cgo_unix.go
@@ -352,7 +352,7 @@ func cgoResSearch(hostname string, rtype, class int) ([]dnsmessage.Resource, err
 
        var size int
        for {
-               size, _ = _C_res_nsearch(state, (*_C_char)(unsafe.Pointer(s)), class, rtype, buf, bufSize)
+               size := _C_res_nsearch(state, (*_C_char)(unsafe.Pointer(s)), class, rtype, buf, bufSize)
                if size <= 0 || size > 0xffff {
                        return nil, errors.New("res_nsearch failure")
                }

diff --git a/src/net/cgo_unix_cgo_res.go b/src/net/cgo_unix_cgo_res.go
index 37bbc9a762d8ae288ea256aa1fd538f8d0b9fabf..c5f30238a13c8f0ce25f1b0656725ef04c00e965 100644 (file)
--- a/src/net/cgo_unix_cgo_res.go
+++ b/src/net/cgo_unix_cgo_res.go
@@ -32,7 +32,7 @@ func _C_res_nclose(state *_C_struct___res_state) {
        return
 }
 
-func _C_res_nsearch(state *_C_struct___res_state, dname *_C_char, class, typ int, ans *_C_uchar, anslen int) (int, error) {
-       x, err := C.res_search(dname, C.int(class), C.int(typ), ans, C.int(anslen))
-       return int(x), err
+func _C_res_nsearch(state *_C_struct___res_state, dname *_C_char, class, typ int, ans *_C_uchar, anslen int) int {
+       x := C.res_search(dname, C.int(class), C.int(typ), ans, C.int(anslen))
+       return int(x)
 }

diff --git a/src/net/cgo_unix_cgo_resn.go b/src/net/cgo_unix_cgo_resn.go
index 4a5ff165dfae238b72270e0d69d0aa82984df11a..4fc747b5a339079a086b85cc54f29b1b04e7b84f 100644 (file)
--- a/src/net/cgo_unix_cgo_resn.go
+++ b/src/net/cgo_unix_cgo_resn.go
@@ -33,7 +33,7 @@ func _C_res_nclose(state *_C_struct___res_state) {
        C.res_nclose(state)
 }
 
-func _C_res_nsearch(state *_C_struct___res_state, dname *_C_char, class, typ int, ans *_C_uchar, anslen int) (int, error) {
-       x, err := C.res_nsearch(state, dname, C.int(class), C.int(typ), ans, C.int(anslen))
-       return int(x), err
+func _C_res_nsearch(state *_C_struct___res_state, dname *_C_char, class, typ int, ans *_C_uchar, anslen int) int {
+       x := C.res_nsearch(state, dname, C.int(class), C.int(typ), ans, C.int(anslen))
+       return int(x)
 }

diff --git a/src/net/cgo_unix_syscall.go b/src/net/cgo_unix_syscall.go
index ac9aaa78fe7c2b35b410dfd5570ee0457296e104..735dcdfe368b1244a3c861e59c60b1d8d3ce5343 100644 (file)
--- a/src/net/cgo_unix_syscall.go
+++ b/src/net/cgo_unix_syscall.go
@@ -73,8 +73,9 @@ func _C_res_ninit(state *_C_struct___res_state) error {
        return nil
 }
 
-func _C_res_nsearch(state *_C_struct___res_state, dname *_C_char, class, typ int, ans *_C_char, anslen int) (int, error) {
-       return unix.ResNsearch(state, dname, class, typ, ans, anslen)
+func _C_res_nsearch(state *_C_struct___res_state, dname *_C_char, class, typ int, ans *_C_char, anslen int) int {
+       x, _ := unix.ResNsearch(state, dname, class, typ, ans, anslen)
+       return x
 }
 
 func _C_res_nclose(state *_C_struct___res_state) {