diff options
author | Andrei Belov <defan@nginx.com> | 2018-10-25 19:00:07 +0300 |
---|---|---|
committer | Andrei Belov <defan@nginx.com> | 2018-10-25 19:00:07 +0300 |
commit | dc3e83f26ce9f92a157d4332c723d531ca411b80 (patch) | |
tree | a723f2ce7d8c91527fdfb94eeae708292a705417 /src/go/unit | |
parent | 8b37c0c70a183f19f7f4245ce0825954d8dbcaf7 (diff) | |
parent | fd99a738e586326ee5b40a6bc3d09c64b18f394a (diff) | |
download | unit-dc3e83f26ce9f92a157d4332c723d531ca411b80.tar.gz unit-dc3e83f26ce9f92a157d4332c723d531ca411b80.tar.bz2 |
Merged with the default branch.1.5-1
Diffstat (limited to '')
-rw-r--r-- | src/go/unit/nxt_cgo_lib.c | 2 | ||||
-rw-r--r-- | src/go/unit/port.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/go/unit/nxt_cgo_lib.c b/src/go/unit/nxt_cgo_lib.c index 9c080730..172bef88 100644 --- a/src/go/unit/nxt_cgo_lib.c +++ b/src/go/unit/nxt_cgo_lib.c @@ -203,5 +203,5 @@ nxt_cgo_request_done(uintptr_t req, int res) void nxt_cgo_warn(uintptr_t msg, uint32_t msg_len) { - nxt_unit_warn(NULL, ".*s", (int) msg_len, (char *) msg); + nxt_unit_warn(NULL, "%.*s", (int) msg_len, (char *) msg); } diff --git a/src/go/unit/port.go b/src/go/unit/port.go index f716c9ec..a68cae74 100644 --- a/src/go/unit/port.go +++ b/src/go/unit/port.go @@ -163,7 +163,7 @@ func nxt_go_port_recv(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int, GoBytes(oob, oob_size)) if err != nil { - nxt_go_warn("write result %d (%d), %s", n, oobn, err) + nxt_go_warn("read result %d (%d), %s", n, oobn, err) } return C.ssize_t(n) |