From c486465de2bf80bade9fc6454b4f9e9a837c57f8 Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Wed, 31 Jan 2007 21:07:35 +0000
Subject: snprintf() -> xsnprintf()

---
 usr.bin/cvs/diff3.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'usr.bin/cvs/diff3.c')

diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c
index 9d2718a0a4b..1b2c81ede28 100644
--- a/usr.bin/cvs/diff3.c
+++ b/usr.bin/cvs/diff3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3.c,v 1.33 2007/01/28 02:04:45 joris Exp $	*/
+/*	$OpenBSD: diff3.c,v 1.34 2007/01/31 21:07:35 xsa Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -72,7 +72,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: diff3.c,v 1.33 2007/01/28 02:04:45 joris Exp $";
+    "$OpenBSD: diff3.c,v 1.34 2007/01/31 21:07:35 xsa Exp $";
 #endif /* not lint */
 
 #include "includes.h"
@@ -276,13 +276,8 @@ diff3_internal(int argc, char **argv, const char *fmark, const char *rmark)
 	if (argc < 5)
 		return (-1);
 
-	i = snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", fmark);
-	if (i < 0 ||i >= (int)sizeof(f1mark))
-		fatal("diff3_internal: truncation");
-
-	i = snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s", rmark);
-	if (i < 0 ||i >= (int)sizeof(f3mark))
-		fatal("diff3_internal: truncation");
+	(void)xsnprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", fmark);
+	(void)xsnprintf(f3mark, sizeof(f3mark), ">>>>>>> %s", rmark);
 
 	increase();
 	m = readin(argv[0], &d13);
-- 
cgit v1.2.3-59-g8ed1b