Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 99353 invoked from network); 14 Jun 2004 15:13:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 14 Jun 2004 15:13:20 -0000 Received: (qmail 19441 invoked by uid 500); 14 Jun 2004 15:13:27 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 19380 invoked by uid 500); 14 Jun 2004 15:13:26 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 19340 invoked by uid 500); 14 Jun 2004 15:13:25 -0000 Delivered-To: apmail-apr-util-cvs@apache.org Date: 14 Jun 2004 15:13:14 -0000 Message-ID: <20040614151314.99266.qmail@minotaur.apache.org> From: jorton@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/xml apr_xml.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/06/14 08:13:14 Modified: xml apr_xml.c Log: * xml/apr_xml.c (apr_xml_parser_geterror): Revert r1.29 which added unnecessary argument validation. Revision Changes Path 1.30 +3 -9 apr-util/xml/apr_xml.c Index: apr_xml.c =================================================================== RCS file: /home/cvs/apr-util/xml/apr_xml.c,v retrieving revision 1.29 retrieving revision 1.30 diff -d -w -u -r1.29 -r1.30 --- apr_xml.c 21 May 2004 07:13:44 -0000 1.29 +++ apr_xml.c 14 Jun 2004 15:13:14 -0000 1.30 @@ -414,21 +414,15 @@ char *errbuf, apr_size_t errbufsize) { - int error = 0; + int error = parser->error; const char *msg; /* clear our record of an error */ - if (parser != NULL) { - error = parser->error; parser->error = 0; - } switch (error) { case 0: - if (parser != NULL) msg = "No error."; - else - msg = "No parser."; break; case APR_XML_NS_ERROR_UNKNOWN_PREFIX: