You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2005/03/13 03:05:55 UTC
svn commit: r157306 - in httpd/apreq/branches/multi-env-unstable:
include/apreq_cookie.h include/apreq_param.h library/cookie.c library/param.c
Author: joes
Date: Sat Mar 12 18:05:54 2005
New Revision: 157306
URL: http://svn.apache.org/viewcvs?view=rev&rev=157306
Log:
Remove experimental apreq_*_size functions.
Submitted by: Max Kellermann
Reviewed by: joes
Modified:
httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h
httpd/apreq/branches/multi-env-unstable/include/apreq_param.h
httpd/apreq/branches/multi-env-unstable/library/cookie.c
httpd/apreq/branches/multi-env-unstable/library/param.c
Modified: httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h?view=diff&r1=157305&r2=157306
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_cookie.h Sat Mar 12 18:05:54 2005
@@ -60,8 +60,6 @@
} apreq_cookie_t;
-APREQ_DECLARE(apr_size_t)apreq_cookie_size(const apreq_cookie_t *c);
-
/** Upgrades cookie jar table values to apreq_cookie_t structs. */
static APR_INLINE
Modified: httpd/apreq/branches/multi-env-unstable/include/apreq_param.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/include/apreq_param.h?view=diff&r1=157305&r2=157306
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/include/apreq_param.h (original)
+++ httpd/apreq/branches/multi-env-unstable/include/apreq_param.h Sat Mar 12 18:05:54 2005
@@ -40,8 +40,6 @@
const apreq_value_t v; /**< underlying name/value info */
} apreq_param_t;
-APREQ_DECLARE(apr_size_t)apreq_param_size(const apreq_param_t *p);
-
/** @return 1 if the taint flag is set, 0 otherwise. */
static APR_INLINE
Modified: httpd/apreq/branches/multi-env-unstable/library/cookie.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/cookie.c?view=diff&r1=157305&r2=157306
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/cookie.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/cookie.c Sat Mar 12 18:05:54 2005
@@ -27,24 +27,6 @@
#define ADD_COOKIE(j,c) apreq_value_table_add(&c->v, j)
-APREQ_DECLARE(apr_size_t)apreq_cookie_size(const apreq_cookie_t *c)
-{
- apr_size_t alen = 0;
-
- if (c->path != NULL)
- alen += strlen(c->path);
- if (c->domain != NULL)
- alen += strlen(c->domain);
- if (c->port != NULL)
- alen += strlen(c->port);
- if (c->comment != NULL)
- alen += strlen(c->comment);
- if (c->commentURL != NULL)
- alen += strlen(c->commentURL);
-
- return (apr_size_t)alen + c->v.nlen + c->v.dlen;
-}
-
APREQ_DECLARE(void) apreq_cookie_expires(apreq_cookie_t *c,
const char *time_str)
{
Modified: httpd/apreq/branches/multi-env-unstable/library/param.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/param.c?view=diff&r1=157305&r2=157306
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/param.c (original)
+++ httpd/apreq/branches/multi-env-unstable/library/param.c Sat Mar 12 18:05:54 2005
@@ -59,28 +59,6 @@
return param;
}
-static int elt_size(void *data, const char *key, const char *val)
-{
- apr_size_t *s = data;
- *s = strlen(key) + strlen(val);
- return 1; /* keep searching */
-}
-
-APREQ_DECLARE(apr_size_t)apreq_param_size(const apreq_param_t *p)
-{
- apr_size_t tlen = 0;
- apr_off_t blen = 0;
-
- if (p->info != NULL)
- apr_table_do(elt_size, &tlen, p->info, NULL);
- if (p->upload != NULL)
- apr_brigade_length(p->upload, 0, &blen);
-
- return (apr_size_t)blen + tlen + p->v.nlen + p->v.dlen;
-
-}
-
-
APREQ_DECLARE(apr_status_t) apreq_param_decode(apreq_param_t **param,
apr_pool_t *pool,
const char *word,