diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-31 23:13:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-31 23:13:02 +1100 |
commit | 3f9418893e1254bda3b87e7d3af7029d11b0a6c7 (patch) | |
tree | 97662277f300ea1ab8255905b9d5d72a26f7578f /sftp-client.c | |
parent | d79b424e8ad424a44119f327e5ab1f79cd35649c (diff) |
- djm@cvs.openbsd.org 2006/03/30 09:58:16
[authfd.c bufaux.c deattack.c gss-serv.c mac.c misc.c misc.h]
[monitor_wrap.c msg.c packet.c sftp-client.c sftp-server.c ssh-agent.c]
replace {GET,PUT}_XXBIT macros with functionally similar functions,
silencing a heap of lint warnings. also allows them to use
__bounded__ checking which can't be applied to macros; requested
by and feedback from deraadt@
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-client.c b/sftp-client.c index 5788aa6ad..c71c66f33 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.63 2006/03/25 13:17:02 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.64 2006/03/30 09:58:16 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -32,11 +32,11 @@ | |||
32 | 32 | ||
33 | #include "buffer.h" | 33 | #include "buffer.h" |
34 | #include "bufaux.h" | 34 | #include "bufaux.h" |
35 | #include "getput.h" | ||
36 | #include "xmalloc.h" | 35 | #include "xmalloc.h" |
37 | #include "log.h" | 36 | #include "log.h" |
38 | #include "atomicio.h" | 37 | #include "atomicio.h" |
39 | #include "progressmeter.h" | 38 | #include "progressmeter.h" |
39 | #include "misc.h" | ||
40 | 40 | ||
41 | #include "sftp.h" | 41 | #include "sftp.h" |
42 | #include "sftp-common.h" | 42 | #include "sftp-common.h" |
@@ -66,7 +66,7 @@ send_msg(int fd, Buffer *m) | |||
66 | fatal("Outbound message too long %u", buffer_len(m)); | 66 | fatal("Outbound message too long %u", buffer_len(m)); |
67 | 67 | ||
68 | /* Send length first */ | 68 | /* Send length first */ |
69 | PUT_32BIT(mlen, buffer_len(m)); | 69 | put_u32(mlen, buffer_len(m)); |
70 | if (atomicio(vwrite, fd, mlen, sizeof(mlen)) != sizeof(mlen)) | 70 | if (atomicio(vwrite, fd, mlen, sizeof(mlen)) != sizeof(mlen)) |
71 | fatal("Couldn't send packet: %s", strerror(errno)); | 71 | fatal("Couldn't send packet: %s", strerror(errno)); |
72 | 72 | ||