summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2020-01-25 23:28:07 +0000
committerDamien Miller <djm@cvs.openbsd.org>2020-01-25 23:28:07 +0000
commit66445db422f21abf141b4c36c2cbd264a23e215b (patch)
treecfc5cfc3440f83cbf2903bbc1b980db5aa086cba
parenta610aa55cda1a1502a9a4a2d9dfcf4546435729f (diff)
tidy headers; some junk snuck into sshbuf-misc.c and sshbuf-io.c
doesn't need SSHBUF_INTERNAL set
-rw-r--r--usr.bin/ssh/sshbuf-io.c3
-rw-r--r--usr.bin/ssh/sshbuf-misc.c15
2 files changed, 6 insertions, 12 deletions
diff --git a/usr.bin/ssh/sshbuf-io.c b/usr.bin/ssh/sshbuf-io.c
index 108a8021948..966f820235a 100644
--- a/usr.bin/ssh/sshbuf-io.c
+++ b/usr.bin/ssh/sshbuf-io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf-io.c,v 1.1 2020/01/25 23:02:14 djm Exp $ */
+/* $OpenBSD: sshbuf-io.c,v 1.2 2020/01/25 23:28:06 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -24,7 +24,6 @@
#include <string.h>
#include "ssherr.h"
-#define SSHBUF_INTERNAL
#include "sshbuf.h"
#include "atomicio.h"
diff --git a/usr.bin/ssh/sshbuf-misc.c b/usr.bin/ssh/sshbuf-misc.c
index 20234b97321..af02fe69e3f 100644
--- a/usr.bin/ssh/sshbuf-misc.c
+++ b/usr.bin/ssh/sshbuf-misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf-misc.c,v 1.12 2020/01/25 23:02:14 djm Exp $ */
+/* $OpenBSD: sshbuf-misc.c,v 1.13 2020/01/25 23:28:06 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -17,24 +17,19 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/stat.h>
#include <netinet/in.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <resolv.h>
+#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
-#include <stdlib.h>
+#include <limits.h>
#include <string.h>
-#include <unistd.h>
+#include <resolv.h>
+#include <ctype.h>
#include "ssherr.h"
#define SSHBUF_INTERNAL
#include "sshbuf.h"
-#include "atomicio.h"
void
sshbuf_dump_data(const void *s, size_t len, FILE *f)