diff options
| author | Alistair Delva <adelva@google.com> | 2020-08-20 16:14:23 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-08-20 16:53:18 -0700 |
| commit | d9da10d147d633fdb6ec65e17ff4b8447419d83e (patch) | |
| tree | 8f93e8fdc2907f141e0924910bfec26669819f0b /monitor_fdpass.c | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f (diff) | |
| parent | ecb2c02d994b3e21994f31a70ff911667c262f1f (diff) | |
Merge upstream-master into master
Commit ecb2c02d994b3e21994f31a70ff911667c262f1f upstream
This nearly (but not quite) corresponds to V_8_3_P1; subsequent
cherry-picks will correct this.
Bug: 162492243
Change-Id: I3c079d86435b7c25aefff4538dc89a3002b1e25b
Diffstat (limited to 'monitor_fdpass.c')
| -rw-r--r-- | monitor_fdpass.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 2ddd8073..d766edcf 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.20 2015/02/25 23:05:47 djm Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.21 2016/02/29 20:22:36 jca Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -99,8 +99,7 @@ mm_send_fd(int sock, int fd) } if (n != 1) { - error("%s: sendmsg: expected sent 1 got %ld", - __func__, (long)n); + error("%s: sendmsg: expected sent 1 got %zd", __func__, n); return -1; } return 0; @@ -155,8 +154,7 @@ mm_receive_fd(int sock) } if (n != 1) { - error("%s: recvmsg: expected received 1 got %ld", - __func__, (long)n); + error("%s: recvmsg: expected received 1 got %zd", __func__, n); return -1; } |