- 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, 4 insertions, 4 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index f2fbd99ee..8cfc8cc08 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.44 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.45 2006/03/30 09:58:15 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -52,7 +52,7 @@
 #include "xmalloc.h"
 #include "atomicio.h"
 #include "monitor_fdpass.h"
-#include "getput.h"
+#include "misc.h"
 #include "servconf.h"
 
 #include "auth.h"
@@ -91,7 +91,7 @@ mm_request_send(int sock, enum monitor_reqtype type, Buffer *m)
 
         debug3("%s entering: type %d", __func__, type);
 
-        PUT_32BIT(buf, mlen + 1);
+        put_u32(buf, mlen + 1);
         buf[4] = (u_char) type;         /* 1st byte of payload is mesg-type */
         if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf))
                 fatal("%s: write: %s", __func__, strerror(errno));
@@ -112,7 +112,7 @@ mm_request_receive(int sock, Buffer *m)
                         cleanup_exit(255);
                 fatal("%s: read: %s", __func__, strerror(errno));
         }
-        msg_len = GET_32BIT(buf);
+        msg_len = get_u32(buf);
         if (msg_len > 256 * 1024)
                 fatal("%s: read: bad msg_len %d", __func__, msg_len);
         buffer_clear(m);