mirror of https://github.com/golang/go.git
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>
This commit is contained in:
parent
d3d390984b
commit
23ac1599ab
|
|
@ -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")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue