From: markus schnalke <meillo@marmaro.de>
Date: Sat, 29 Aug 2015 08:48:22 +0000 (+0200)
Subject: Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh
X-Git-Tag: mmh-0.2-RC1~31
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=a26906e6feefe63dfe0d8f9535444150b2ca0a08;hp=a2ca51e05aaad418d652ce36f232a9076b3b2d08

Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh
---

diff --git a/h/prototypes.h b/h/prototypes.h
index 3512ef7..848115f 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -38,7 +38,6 @@ void context_save(void);
 void cpydata(int, int, char *, char *);
 void cpydgst(int, int, char *, char *);
 int decode_rfc2047(char *, char *, size_t);
-void discard(FILE *);
 int default_done(int);
 int execprog(char *, char **);
 int execprogl(char *, char *, ...);
diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index e5d8ffd..61fc96c 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -50,7 +50,7 @@ SRCS = addrsbr.c ambigsw.c brkstring.c  \
 	context_find.c context_read.c  \
 	context_replace.c context_save.c \
 	cpydata.c cpydgst.c crawl_folders.c  \
-	discard.c dtime.c dtimep.c  \
+	dtime.c dtimep.c  \
 	error.c execprog.c ext_hook.c folder_addmsg.c folder_delmsgs.c  \
 	folder_free.c folder_read.c  \
 	folder_realloc.c gans.c getans.c getanswer.c  \
diff --git a/sbr/discard.c b/sbr/discard.c
deleted file mode 100644
index d3eabd0..0000000
--- a/sbr/discard.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-** discard.c -- discard output on a file pointer
-**
-** This code is Copyright (c) 2002, by the authors of nmh.  See the
-** COPYRIGHT file in the root directory of the nmh distribution for
-** complete copyright information.
-*/
-
-#include <h/mh.h>
-#include <termios.h>
-
-
-void
-discard(FILE *io)
-{
-	if (io == NULL)
-		return;
-
-	tcflush(fileno(io), TCOFLUSH);
-
-#if defined(_FSTDIO) || defined(__DragonFly__)
-	fpurge(io);
-#else
-# ifdef LINUX_STDIO
-	io->_IO_write_ptr = io->_IO_write_base;
-# else
-	if ((io->_ptr = io->_base))
-		io->_cnt = 0;
-# endif
-#endif
-}