From owner-svn-src-user@FreeBSD.ORG  Thu Oct 15 10:46:21 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 E7428106566C;
	Thu, 15 Oct 2009 10:46:21 +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 D73D18FC1C;
	Thu, 15 Oct 2009 10:46:21 +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 n9FAkLtq071022;
	Thu, 15 Oct 2009 10:46:21 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FAkLni071020;
	Thu, 15 Oct 2009 10:46:21 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200910151046.n9FAkLni071020@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 15 Oct 2009 10:46:21 +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: r198120 - 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:46:22 -0000

Author: des
Date: Thu Oct 15 10:46:21 2009
New Revision: 198120
URL: http://svn.freebsd.org/changeset/base/198120

Log:
  Additional refactoring

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

Modified: user/des/svnsup/src/distill/error.c
==============================================================================
--- user/des/svnsup/src/distill/error.c	Thu Oct 15 10:42:30 2009	(r198119)
+++ user/des/svnsup/src/distill/error.c	Thu Oct 15 10:46:21 2009	(r198120)
@@ -36,8 +36,18 @@
 
 #include "distill.h"
 
+static inline void
+svnsup_print_where(FILE *f, svnsup_where_t *where)
+{
+	if (debug) {
+		fprintf(f, "svnsup: in %s() on line %d of %s\n",
+		    where->func, where->line, where->file);
+	}
+}
+
 void
-svnsup_apr_error(svnsup_where_t *where, apr_status_t status, const char *fmt, ...)
+svnsup_apr_error(svnsup_where_t *where, apr_status_t status,
+    const char *fmt, ...)
 {
 	char errbuf[1024];
 	va_list ap;
@@ -48,14 +58,13 @@ svnsup_apr_error(svnsup_where_t *where, 
 	va_end(ap);
 	apr_strerror(status, errbuf, sizeof(errbuf));
 	fprintf(stderr, "\nsvnsup: %s\n", errbuf);
-	if (debug)
-		fprintf(stderr, "svnsup: in %s() on line %d of %s\n",
-		    where->func, where->line, where->file);
+	svnsup_print_where(stderr, where);
 	exit(1);
 }
 
 void
-svnsup_svn_error(svnsup_where_t *where, svn_error_t *error, const char *fmt, ...)
+svnsup_svn_error(svnsup_where_t *where, svn_error_t *error,
+    const char *fmt, ...)
 {
 	va_list ap;
 
@@ -65,14 +74,13 @@ svnsup_svn_error(svnsup_where_t *where, 
 	va_end(ap);
 	fprintf(stderr, "\n");
 	svn_handle_error2(error, stderr, FALSE, "svnsup: ");
-	if (debug)
-		fprintf(stderr, "svnsup: in %s() on line %d of %s\n",
-		    where->func, where->line, where->file);
+	svnsup_print_where(stderr, where);
 	exit(1);
 }
 
 void
-svnsup_assert(svnsup_where_t *where, const char *cond, const char *fmt, ...)
+svnsup_assert(svnsup_where_t *where, const char *cond,
+    const char *fmt, ...)
 {
 	va_list ap;
 
@@ -82,8 +90,6 @@ svnsup_assert(svnsup_where_t *where, con
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	if (debug)
-		fprintf(stderr, "svnsup: in %s() on line %d of %s\n",
-		    where->func, where->line, where->file);
+	svnsup_print_where(stderr, where);
 	exit(1);
 }