From owner-svn-src-user@FreeBSD.ORG  Thu Oct 15 10:49:24 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63F3B106566B;
	Thu, 15 Oct 2009 10:49:24 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 509508FC0A;
	Thu, 15 Oct 2009 10:49:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FAnOuE071199;
	Thu, 15 Oct 2009 10:49:24 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FAnOQd071196;
	Thu, 15 Oct 2009 10:49:24 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200910151049.n9FAnOQd071196@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 15 Oct 2009 10:49:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198123 - user/des/svnsup/src/distill
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 10:49:24 -0000

Author: des
Date: Thu Oct 15 10:49:24 2009
New Revision: 198123
URL: http://svn.freebsd.org/changeset/base/198123

Log:
  Handle libsvnsup errors (poorly)

Modified:
  user/des/svnsup/src/distill/distill.h
  user/des/svnsup/src/distill/error.c

Modified: user/des/svnsup/src/distill/distill.h
==============================================================================
--- user/des/svnsup/src/distill/distill.h	Thu Oct 15 10:48:45 2009	(r198122)
+++ user/des/svnsup/src/distill/distill.h	Thu Oct 15 10:49:24 2009	(r198123)
@@ -42,6 +42,8 @@
 #include <subversion-1/svn_error.h>
 #include <subversion-1/svn_ra.h>
 
+#include "svnsup.h"
+
 extern int debug;
 extern int verbose;
 
@@ -71,6 +73,15 @@ void svnsup_svn_error(svnsup_where_t *, 
 			    (error), __VA_ARGS__);			\
 	} while (0)
 
+/* svnsup errors */
+void svnsup_svnsup_error(svnsup_where_t *, svnsup_err_t, const char *, ...);
+#define SVNSUP_SVNSUP_ERROR(error, ...)					\
+	do {								\
+		if ((error) != SVNSUP_ERR_NONE)				\
+			svnsup_svnsup_error(SVNSUP_WHERE,		\
+			    (error), __VA_ARGS__);			\
+	} while (0)
+
 /* assertions */
 void svnsup_assert(svnsup_where_t *, const char *, const char *, ...);
 #define SVNSUP_ASSERT(cond, ...)					\

Modified: user/des/svnsup/src/distill/error.c
==============================================================================
--- user/des/svnsup/src/distill/error.c	Thu Oct 15 10:48:45 2009	(r198122)
+++ user/des/svnsup/src/distill/error.c	Thu Oct 15 10:49:24 2009	(r198123)
@@ -79,6 +79,22 @@ svnsup_svn_error(svnsup_where_t *where, 
 }
 
 void
+svnsup_svnsup_error(svnsup_where_t *where, svnsup_err_t error,
+    const char *fmt, ...)
+{
+	va_list ap;
+
+	fprintf(stderr, "svnsup: ");
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+	fprintf(stderr, "svnsup: error code %d\n", error); /* XXX */
+	svnsup_print_where(stderr, where);
+	exit(1);
+}
+
+void
 svnsup_assert(svnsup_where_t *where, const char *cond,
     const char *fmt, ...)
 {