From owner-svn-src-user@FreeBSD.ORG Wed Oct 14 21:56:21 2009 Return-Path: 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 1C49110656A3; Wed, 14 Oct 2009 21:56: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 0BF7E8FC22; Wed, 14 Oct 2009 21:56: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 n9ELuKL4049940; Wed, 14 Oct 2009 21:56:20 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9ELuKrg049938; Wed, 14 Oct 2009 21:56:20 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200910142156.n9ELuKrg049938@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Wed, 14 Oct 2009 21:56:20 +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: r198104 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2009 21:56:21 -0000 Author: des Date: Wed Oct 14 21:56:20 2009 New Revision: 198104 URL: http://svn.freebsd.org/changeset/base/198104 Log: Reorder to match the header. Modified: user/des/svnsup/src/distill/error.c Modified: user/des/svnsup/src/distill/error.c ============================================================================== --- user/des/svnsup/src/distill/error.c Wed Oct 14 21:54:27 2009 (r198103) +++ user/des/svnsup/src/distill/error.c Wed Oct 14 21:56:20 2009 (r198104) @@ -37,16 +37,17 @@ #include "distill.h" void -svnsup_svn_error(svnsup_where_t *where, svn_error_t *error, const char *fmt, ...) +svnsup_apr_error(svnsup_where_t *where, apr_status_t status, const char *fmt, ...) { + char errbuf[1024]; va_list ap; fprintf(stderr, "svnsup: "); va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); - fprintf(stderr, "\n"); - svn_handle_error2(error, stderr, FALSE, "svnsup: "); + 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); @@ -54,17 +55,16 @@ svnsup_svn_error(svnsup_where_t *where, } void -svnsup_apr_error(svnsup_where_t *where, apr_status_t status, const char *fmt, ...) +svnsup_svn_error(svnsup_where_t *where, svn_error_t *error, const char *fmt, ...) { - char errbuf[1024]; va_list ap; fprintf(stderr, "svnsup: "); va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); - apr_strerror(status, errbuf, sizeof(errbuf)); - fprintf(stderr, "\nsvnsup: %s\n", errbuf); + 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);