From commits-return-7803-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Thu Jun 22 16:03:15 2006 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 71772 invoked from network); 22 Jun 2006 16:03:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Jun 2006 16:03:14 -0000 Received: (qmail 12767 invoked by uid 500); 22 Jun 2006 16:03:08 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 12684 invoked by uid 500); 22 Jun 2006 16:03:07 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 12623 invoked by uid 99); 22 Jun 2006 16:03:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jun 2006 09:03:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jun 2006 09:03:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9AB6F1A9842; Thu, 22 Jun 2006 09:02:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r416407 - in /apr/apr/trunk/include: apr_errno.h apr_network_io.h Date: Thu, 22 Jun 2006 16:02:45 -0000 To: commits@apr.apache.org From: dreid@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060622160246.9AB6F1A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dreid Date: Thu Jun 22 09:02:45 2006 New Revision: 416407 URL: http://svn.apache.org/viewvc?rev=416407&view=rev Log: - remove what appears to be a copy/paste error from docs in network_io - add details about ranges of status numbers used by apr Modified: apr/apr/trunk/include/apr_errno.h apr/apr/trunk/include/apr_network_io.h Modified: apr/apr/trunk/include/apr_errno.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_errno.h?rev=416407&r1=416406&r2=416407&view=diff ============================================================================== --- apr/apr/trunk/include/apr_errno.h (original) +++ apr/apr/trunk/include/apr_errno.h Thu Jun 22 09:02:45 2006 @@ -131,6 +131,18 @@ * error immediately following this one is set ten times farther * away than usual, so that users of apr have a lot of room in * which to declare custom error codes. + * + * In general applications should try and create unique error codes. To try + * and assist in finding suitable ranges of numbers to use, the following + * ranges are known to be used by the listed applications. If your + * application defines error codes please advise the range of numbers it + * uses to dev@apr.apache.org for inclusion in this list. + * + * Ranges shown are in relation to APR_OS_START_USERERR + * + * Subversion - Defined ranges, of less than 100, at intervals of 5000 + * starting at an offset of 5000, e.g. + * +5000 to 5100, +10000 to 10100 */ #define APR_OS_START_USERERR (APR_OS_START_STATUS + APR_OS_ERRSPACE_SIZE) /** @@ -155,6 +167,39 @@ */ #define APR_OS_START_SYSERR (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE) +/** + * @defgroup APR_ERROR_map APR Error Space + * 
+ * The following attempts to show the relation of the various constants
+ * used for mapping APR Status codes.
+ *
+ *       0          
+ *
+ *  20,000     APR_OS_START_ERROR
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ *  70,000      APR_OS_START_STATUS
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ * 120,000      APR_OS_START_USERERR
+ *
+ *         + 10 x APR_OS_ERRSPACE_SIZE (50,000 * 10)
+ *
+ * 620,000      APR_OS_START_CANONERR
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ * 670,000      APR_OS_START_EAIERR
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ * 720,000      APR_OS_START_SYSERR
+ *
+ *
+ */ + /** no error. */ #define APR_SUCCESS 0 @@ -575,7 +620,7 @@ #define APR_EACCES (APR_OS_START_CANONERR + 1) #endif -/** @see APR_STATUS_IS_EXIST */ +/** @see APR_STATUS_IS_EEXIST */ #ifdef EEXIST #define APR_EEXIST EEXIST #else Modified: apr/apr/trunk/include/apr_network_io.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_network_io.h?rev=416407&r1=416406&r2=416407&view=diff ============================================================================== --- apr/apr/trunk/include/apr_network_io.h (original) +++ apr/apr/trunk/include/apr_network_io.h Thu Jun 22 09:02:45 2006 @@ -671,7 +671,6 @@ /** * Write the IP address (in numeric address string format) of the APR * socket address @a sockaddr into the buffer @a buf (of size @a buflen). - * @param addr The IP address. * @param sockaddr The socket address to reference. */ APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen,