Return-Path: Delivered-To: apmail-httpd-apreq-cvs-archive@www.apache.org Received: (qmail 15047 invoked from network); 1 Nov 2003 03:58:30 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 1 Nov 2003 03:58:30 -0000 Received: (qmail 2968 invoked by uid 500); 1 Nov 2003 03:58:12 -0000 Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org Received: (qmail 2958 invoked by uid 500); 1 Nov 2003 03:58:12 -0000 Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: apreq-dev@httpd.apache.org List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list apreq-cvs@httpd.apache.org Received: (qmail 2945 invoked by uid 500); 1 Nov 2003 03:58:11 -0000 Delivered-To: apmail-httpd-apreq-2-cvs@apache.org Received: (qmail 2942 invoked from network); 1 Nov 2003 03:58:11 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 1 Nov 2003 03:58:11 -0000 Received: (qmail 15044 invoked by uid 1221); 1 Nov 2003 03:58:30 -0000 Date: 1 Nov 2003 03:58:30 -0000 Message-ID: <20031101035830.15043.qmail@minotaur.apache.org> From: joes@apache.org To: httpd-apreq-2-cvs@apache.org Subject: cvs commit: httpd-apreq-2/t params.c parsers.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N joes 2003/10/31 19:58:30 Modified: src apreq.h apreq_cookie.h t params.c parsers.c Log: Eliminate apr_table_nelts macro Revision Changes Path 1.36 +0 -4 httpd-apreq-2/src/apreq.h Index: apreq.h =================================================================== RCS file: /home/cvs/httpd-apreq-2/src/apreq.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- apreq.h 17 Oct 2003 06:10:35 -0000 1.35 +++ apreq.h 1 Nov 2003 03:58:29 -0000 1.36 @@ -60,10 +60,6 @@ #include "apr_buckets.h" #include -#ifndef apr_table_nelts -#define apr_table_nelts(t) apr_table_elts(t)->nelts -#endif - #ifdef __cplusplus extern "C" { #endif 1.19 +2 -2 httpd-apreq-2/src/apreq_cookie.h Index: apreq_cookie.h =================================================================== RCS file: /home/cvs/httpd-apreq-2/src/apreq_cookie.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apreq_cookie.h 28 Jun 2003 17:51:38 -0000 1.18 +++ apreq_cookie.h 1 Nov 2003 03:58:29 -0000 1.19 @@ -108,8 +108,8 @@ #define apreq_cookie_name(c) ((c)->v.name) #define apreq_cookie_value(c) ((c)->v.data) -#define apreq_jar_items(j) apr_table_nelts(j->cookies) -#define apreq_jar_nelts(j) apr_table_nelts(j->cookies) +#define apreq_jar_items(j) apr_table_elts(j->cookies)->nelts +#define apreq_jar_nelts(j) apr_table_elts(j->cookies)->nelts /** * Fetches a cookie from the jar 1.9 +1 -1 httpd-apreq-2/t/params.c Index: params.c =================================================================== RCS file: /home/cvs/httpd-apreq-2/t/params.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- params.c 17 Oct 2003 18:17:14 -0000 1.8 +++ params.c 1 Nov 2003 03:58:30 -0000 1.9 @@ -64,7 +64,7 @@ { r = apreq_request(NULL,"a=1;quux=foo+bar&plus=%2B;uplus=%U002b;okie=dokie;novalue1;novalue2="); CuAssertPtrNotNull(tc, r); - CuAssertIntEquals(tc,7, apr_table_nelts(r->args)); + CuAssertIntEquals(tc,7, apr_table_elts(r->args)->nelts); } static void request_args_get(CuTest *tc) 1.8 +1 -1 httpd-apreq-2/t/parsers.c Index: parsers.c =================================================================== RCS file: /home/cvs/httpd-apreq-2/t/parsers.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- parsers.c 14 Oct 2003 18:15:38 -0000 1.7 +++ parsers.c 1 Nov 2003 03:58:30 -0000 1.8 @@ -133,7 +133,7 @@ CuAssertIntEquals(tc, APR_SUCCESS, rv); CuAssertPtrNotNull(tc, req->body); - CuAssertIntEquals(tc, 2, apr_table_nelts(req->body)); + CuAssertIntEquals(tc, 2, apr_table_elts(req->body)->nelts); val = apr_table_get(req->body,"field1"); CuAssertStrEquals(tc, "Joe owes =80100.", val);