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 ra...@apache.org on 2003/06/17 05:38:49 UTC
cvs commit: httpd-apreq-2/src apreq_cookie.c apreq_cookie.h
randyk 2003/06/16 20:38:49
Modified: src apreq_cookie.c apreq_cookie.h
Log:
Reviewed by: joes
move definitions of apreq_cookie and apreq_add_cookie from apreq_cookie.h
to the declarations in apreq_cookie.c, for the benefit of Win32.
Revision Changes Path
1.16 +8 -6 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apreq_cookie.c 9 Jun 2003 06:36:06 -0000 1.15
+++ apreq_cookie.c 17 Jun 2003 03:38:48 -0000 1.16
@@ -62,16 +62,18 @@
#include "apr_lib.h"
-APREQ_DECLARE(apreq_cookie_t *) (apreq_cookie)(const apreq_jar_t *jar,
- const char *name)
+APREQ_DECLARE(apreq_cookie_t *) apreq_cookie(const apreq_jar_t *jar,
+ const char *name)
{
- return apreq_cookie(jar,name);
+ return apreq_value_to_cookie(apreq_char_to_value(apr_table_get(jar->cookies,
+ name)));
}
-APREQ_DECLARE(void) (apreq_add_cookie)(apreq_jar_t *jar,
- const apreq_cookie_t *c)
+APREQ_DECLARE(void) apreq_add_cookie(apreq_jar_t *jar,
+ const apreq_cookie_t *c)
{
- apreq_add_cookie(jar,c);
+ apr_table_addn(jar->cookies,
+ c->v.name,c->v.data);
}
APREQ_DECLARE(void) apreq_cookie_expires(apr_pool_t *p,
1.16 +0 -4 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apreq_cookie.h 15 Jun 2003 10:33:01 -0000 1.15
+++ apreq_cookie.h 17 Jun 2003 03:38:48 -0000 1.16
@@ -125,8 +125,6 @@
APREQ_DECLARE(apreq_cookie_t *)apreq_cookie(const apreq_jar_t *jar,
const char *name);
-#define apreq_cookie(j,k) apreq_value_to_cookie(apreq_char_to_value( \
- apr_table_get((j)->cookies,k)))
/**
* Adds a cookie by pushing it to the bottom of the jar.
@@ -137,8 +135,6 @@
APREQ_DECLARE(void) apreq_add_cookie(apreq_jar_t *jar,
const apreq_cookie_t *c);
-#define apreq_add_cookie(j,c) apr_table_addn((j)->cookies,\
- (c)->v.name,(c)->v.data)
/**
* Parse the incoming "Cookie:" headers into a cookie jar.