- 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@

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 @@
-/* $OpenBSD: sftp-client.c,v 1.63 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.64 2006/03/30 09:58:16 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -32,11 +32,11 @@
 
 #include "buffer.h"
 #include "bufaux.h"
-#include "getput.h"
 #include "xmalloc.h"
 #include "log.h"
 #include "atomicio.h"
 #include "progressmeter.h"
+#include "misc.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
@@ -66,7 +66,7 @@ send_msg(int fd, Buffer *m)
                 fatal("Outbound message too long %u", buffer_len(m));
 
         /* Send length first */
-        PUT_32BIT(mlen, buffer_len(m));
+        put_u32(mlen, buffer_len(m));
         if (atomicio(vwrite, fd, mlen, sizeof(mlen)) != sizeof(mlen))
                 fatal("Couldn't send packet: %s", strerror(errno));