From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 9 Aug 2008 13:15:31 +0000 (-0400)
Subject: IFC: Colin's __dead2 markers
X-Git-Tag: v2.6.0~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1072ba851b0aa3ecc79e33b9aadca33437215de7;p=thirdparty%2Flibarchive.git

IFC: Colin's __dead2 markers

SVN-Revision: 180
---

diff --git a/cpio/cpio.h b/cpio/cpio.h
index 80a89cc89..a4c17108e 100644
--- a/cpio/cpio.h
+++ b/cpio/cpio.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.3 2008/07/29 15:23:31 kientzle Exp $
+ * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.4 2008/08/04 01:25:48 cperciva Exp $
  */
 
 #ifndef CPIO_H_INCLUDED
@@ -85,7 +85,7 @@ struct cpio {
 /* Name of this program; used in error reporting, initialized in main(). */
 const char *cpio_progname;
 
-void	cpio_errc(int _eval, int _code, const char *fmt, ...);
+void	cpio_errc(int _eval, int _code, const char *fmt, ...) __dead2;
 void	cpio_warnc(int _code, const char *fmt, ...);
 
 int	owner_parse(const char *, int *, int *);
diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h
index 9ca5893d8..a859417a6 100644
--- a/libarchive/archive_private.h
+++ b/libarchive/archive_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.29 2007/04/02 00:15:45 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.30 2008/08/04 01:25:48 cperciva Exp $
  */
 
 #ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -92,7 +92,7 @@ struct archive {
 void	__archive_check_magic(struct archive *, unsigned int magic,
 	    unsigned int state, const char *func);
 
-void	__archive_errx(int retvalue, const char *msg);
+void	__archive_errx(int retvalue, const char *msg) __dead2;
 
 #define	err_combine(a,b)	((a) < (b) ? (a) : (b))
 
diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index 90c9315de..59f24c20e 100644
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.34 2008/07/05 08:03:08 cperciva Exp $
+ * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.35 2008/08/04 01:25:48 cperciva Exp $
  */
 
 #include "bsdtar_platform.h"
@@ -103,7 +103,7 @@ struct bsdtar {
 };
 
 void	bsdtar_errc(struct bsdtar *, int _eval, int _code,
-	    const char *fmt, ...);
+	    const char *fmt, ...) __dead2;
 void	bsdtar_warnc(struct bsdtar *, int _code, const char *fmt, ...);
 void	cleanup_exclusions(struct bsdtar *);
 void	do_chdir(struct bsdtar *);