joes 2003/01/24 15:33:44
Modified: src apreq_cookie.h apreq_cookie.c apreq_params.h
apreq_params.c
Log:
C != C++
Revision Changes Path
1.6 +8 -8 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apreq_cookie.h 24 Jan 2003 19:15:07 -0000 1.5
+++ apreq_cookie.h 24 Jan 2003 23:33:44 -0000 1.6
@@ -73,8 +73,8 @@
* @param c The cookie to add.
*/
-void apreq_jar_add(apreq_jar_t *jar, apreq_cookie_t *c);
-#define apreq_jar_add(jar,c) apreq_table_add(jar, &(c)->v)
+apr_status_t apreq_add_cookie(apreq_jar_t *jar, const apreq_cookie_t *c);
+#define apreq_add_cookie(jar,c) apreq_table_add(jar, &(c)->v)
/**
* Parse the incoming "Cookie:" headers into a cookie jar.
@@ -109,7 +109,7 @@
* @param value The cookie's value.
* @param vlen Length of value.
*/
-APREQ_DECLARE(apreq_cookie_t *) apreq_cookie_make(void *ctx,
+APREQ_DECLARE(apreq_cookie_t *) apreq_make_cookie(void *ctx,
const apreq_cookie_version_t version,
const char *name, const apr_size_t nlen,
const char *value, const apr_size_t vlen);
@@ -139,8 +139,8 @@
* @param len Size of buf's storage area.
*/
-APREQ_DECLARE(int) apreq_cookie_serialize(const apreq_cookie_t *c,
- char *buf, apr_size_t len);
+APREQ_DECLARE(int) apreq_serialize_cookie(char *buf, apr_size_t len,
+ const apreq_cookie_t *c);
/**
* Get/set the "expires" string. For NETSCAPE cookies, this returns
@@ -160,7 +160,7 @@
*
* @param c The cookie.
*/
-APREQ_DECLARE(apr_status_t) apreq_cookie_bake(const apreq_cookie_t *c);
+APREQ_DECLARE(apr_status_t) apreq_bake_cookie(const apreq_cookie_t *c);
/* XXX: how about baking whole cookie jars, too ??? */
@@ -169,9 +169,9 @@
*
* @param c The cookie.
*/
-APREQ_DECLARE(apr_status_t) apreq_cookie_bake2(const apreq_cookie_t *c);
+APREQ_DECLARE(apr_status_t) apreq_bake2_cookie(const apreq_cookie_t *c);
-APREQ_DECLARE(apreq_cookie_version_t) apreq_cookie_ua_version(void *ctx);
+APREQ_DECLARE(apreq_cookie_version_t) apreq_ua_cookie_version(void *ctx);
#ifdef __cplusplus
1.7 +14 -16 httpd-apreq-2/src/apreq_cookie.c
Index: apreq_cookie.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_cookie.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apreq_cookie.c 24 Jan 2003 19:15:07 -0000 1.6
+++ apreq_cookie.c 24 Jan 2003 23:33:44 -0000 1.7
@@ -70,10 +70,10 @@
return apreq_cookie(jar,name);
}
-APREQ_DECLARE(void) (apreq_jar_add)(apreq_jar_t *jar,
- apreq_cookie_t *c)
+APREQ_DECLARE(apr_status_t) (apreq_add_cookie)(apreq_jar_t *jar,
+ const apreq_cookie_t *c)
{
- apreq_jar_add(jar,c);
+ return apreq_add_cookie(jar,c);
}
APREQ_DECLARE(void) apreq_cookie_expires(apreq_cookie_t *c,
@@ -96,7 +96,7 @@
1 -> not found, keep going. */
}
-APREQ_DECLARE(apreq_cookie_version_t) apreq_cookie_ua_version(void *ctx)
+APREQ_DECLARE(apreq_cookie_version_t) apreq_ua_cookie_version(void *ctx)
{
if (apreq_env_cookie2(ctx) == NULL) {
apreq_jar_t *j = apreq_jar(ctx, NULL);
@@ -115,7 +115,8 @@
}
APREQ_DECLARE(apr_status_t) apreq_cookie_attr(apreq_cookie_t *c,
- char *attr, char *val)
+ char *attr,
+ char *val)
{
if ( attr[0] == '-' || attr[0] == '$' )
++attr;
@@ -182,7 +183,7 @@
return APR_ENOTIMPL;
}
-APREQ_DECLARE(apreq_cookie_t *) apreq_cookie_make(void *ctx,
+APREQ_DECLARE(apreq_cookie_t *) apreq_make_cookie(void *ctx,
const apreq_cookie_version_t version,
const char *name, const apr_size_t nlen,
const char *value, const apr_size_t vlen)
@@ -350,12 +351,10 @@
/* this is the normal exit point for apreq_jar */
return j;
-
case ',':
++data;
goto parse_cookie_header;
-
case '$':
if (c == NULL) {
apreq_error(ctx, APR_BADCH, "Saw attribute, "
@@ -381,14 +380,13 @@
}
break;
-
default:
status = get_pair(&data, &name, &nlen, &value, &vlen);
if (status == APR_SUCCESS) {
- c = apreq_cookie_make(ctx, version, name, nlen,
+ c = apreq_make_cookie(ctx, version, name, nlen,
value, vlen);
- apreq_jar_add(j, c);
+ apreq_add_cookie(j, c);
}
else {
apreq_warn(ctx, status, "Skipping bad NAME=VALUE pair: %s",
@@ -401,8 +399,8 @@
return j;
}
-APREQ_DECLARE(int) apreq_cookie_serialize(const apreq_cookie_t *c,
- char *buf, apr_size_t len)
+APREQ_DECLARE(int) apreq_serialize_cookie(char *buf, apr_size_t len,
+ const apreq_cookie_t *c)
{
/* The format string must be large enough to accomodate all
* of the cookie attributes. The current attributes sum to
@@ -471,7 +469,7 @@
{
char s[APREQ_COOKIE_LENGTH];
- int n = apreq_cookie_serialize(c, s, APREQ_COOKIE_LENGTH);
+ int n = apreq_serialize_cookie(s, APREQ_COOKIE_LENGTH,c);
if ( n < APREQ_COOKIE_LENGTH )
return apr_pstrmemdup(p, s, n);
@@ -479,7 +477,7 @@
return NULL;
}
-APREQ_DECLARE(apr_status_t) apreq_cookie_bake(const apreq_cookie_t *c)
+APREQ_DECLARE(apr_status_t) apreq_bake_cookie(const apreq_cookie_t *c)
{
const char *s = apreq_cookie_as_string(apreq_env_pool(c->ctx),c);
@@ -493,7 +491,7 @@
return apreq_env_set_cookie(c->ctx, s);
}
-APREQ_DECLARE(apr_status_t) apreq_cookie_bake2(const apreq_cookie_t *c)
+APREQ_DECLARE(apr_status_t) apreq_bake2_cookie(const apreq_cookie_t *c)
{
const char *s = apreq_cookie_as_string(apreq_env_pool(c->ctx),c);
1.3 +6 -6 httpd-apreq-2/src/apreq_params.h
Index: apreq_params.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_params.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apreq_params.h 24 Jan 2003 19:15:07 -0000 1.2
+++ apreq_params.h 24 Jan 2003 23:33:44 -0000 1.3
@@ -163,16 +163,16 @@
*/
APREQ_DECLARE(apr_array_header_t *) apreq_keys(apreq_request_t *req);
-APREQ_DECLARE(apr_status_t) apreq_param_split(apr_pool_t *pool,
- apreq_table_t *t,
- const char *data,
- const apr_size_t dlen);
+APREQ_DECLARE(apr_status_t) apreq_split_params(apr_pool_t *pool,
+ apreq_table_t *t,
+ const char *data,
+ const apr_size_t dlen);
-APREQ_DECLARE(apreq_param_t *) apreq_param_decode(apr_pool_t *pool,
+APREQ_DECLARE(apreq_param_t *) apreq_decode_param(apr_pool_t *pool,
const char *word,
const apr_size_t nlen,
const apr_size_t vlen);
-APREQ_DECLARE(char *) apreq_param_encode(apr_pool_t *pool,
+APREQ_DECLARE(char *) apreq_encode_param(apr_pool_t *pool,
const apreq_param_t *param);
1.3 +9 -8 httpd-apreq-2/src/apreq_params.c
Index: apreq_params.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_params.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apreq_params.c 24 Jan 2003 19:15:07 -0000 1.2
+++ apreq_params.c 24 Jan 2003 23:33:44 -0000 1.3
@@ -98,7 +98,7 @@
query_string = apreq_env_args(ctx);
req->status = (query_string == NULL) ? APR_SUCCESS :
- apreq_param_split(p, req->args, query_string, strlen(query_string));
+ apreq_split_params(p, req->args, query_string, strlen(query_string));
return req;
}
@@ -138,10 +138,10 @@
}
-APREQ_DECLARE(apr_status_t) apreq_param_split(apr_pool_t *pool,
- apreq_table_t *t,
- const char *data,
- apr_size_t dlen)
+APREQ_DECLARE(apr_status_t) apreq_split_params(apr_pool_t *pool,
+ apreq_table_t *t,
+ const char *data,
+ apr_size_t dlen)
{
const char *start = data, *end = data + dlen;
apr_size_t nlen = 0;
@@ -167,7 +167,7 @@
else {
const apr_size_t vlen = data - start - nlen - 1;
status = apreq_table_add(t, p2v(
- apreq_param_decode( pool, start,
+ apreq_decode_param( pool, start,
nlen, vlen )));
if (status != APR_SUCCESS)
@@ -184,7 +184,7 @@
}
-APREQ_DECLARE(apreq_param_t *) apreq_param_decode(apr_pool_t *pool,
+APREQ_DECLARE(apreq_param_t *) apreq_decode_param(apr_pool_t *pool,
const char *word,
const apr_size_t nlen,
const apr_size_t vlen)
@@ -222,7 +222,7 @@
}
-APREQ_DECLARE(char *) apreq_param_encode(apr_pool_t *pool,
+APREQ_DECLARE(char *) apreq_encode_param(apr_pool_t *pool,
const apreq_param_t *param)
{
apreq_value_t *v;
@@ -242,3 +242,4 @@
return v->data;
}
+
