mturk 2004/11/26 08:58:31
Modified: jk/native/common jk_context.c jk_context.h
Log:
Change C++ reserved word 'virtual' to virt
Revision Changes Path
1.12 +10 -10 jakarta-tomcat-connectors/jk/native/common/jk_context.c
Index: jk_context.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_context.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_context.c 8 Oct 2004 07:50:39 -0000 1.11
+++ jk_context.c 26 Nov 2004 16:58:31 -0000 1.12
@@ -29,14 +29,14 @@
* Set the virtual name of the context
*/
-int context_set_virtual(jk_context_t *c, char *virtual)
+int context_set_virtual(jk_context_t *c, char *virt)
{
if (c) {
- if (virtual) {
- c->virtual = jk_pool_strdup(&c->p, virtual);
+ if (virt) {
+ c->virt = jk_pool_strdup(&c->p, virt);
- if (!c->virtual)
+ if (!c->virt)
return JK_FALSE;
}
@@ -50,7 +50,7 @@
* Init the context info struct
*/
-int context_open(jk_context_t *c, char *virtual)
+int context_open(jk_context_t *c, char *virt)
{
if (c) {
jk_open_pool(&c->p, c->buf, sizeof(jk_pool_atom_t) *
SMALL_POOL_SIZE);
@@ -58,7 +58,7 @@
c->capacity = 0;
c->contexts = NULL;
- return context_set_virtual(c, virtual);
+ return context_set_virtual(c, virt);
}
return JK_FALSE;
@@ -83,12 +83,12 @@
* Allocate and open context
*/
-int context_alloc(jk_context_t **c, char *virtual)
+int context_alloc(jk_context_t **c, char *virt)
{
if (c)
return context_open(*c =
- (jk_context_t *)malloc(sizeof(jk_context_t)),
- virtual);
+ (jk_context_t *)calloc(1, sizeof(jk_context_t)),
+ virt);
return JK_FALSE;
}
1.10 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_context.h
Index: jk_context.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_context.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_context.h 8 Nov 2004 13:28:54 -0000 1.9
+++ jk_context.h 26 Nov 2004 16:58:31 -0000 1.10
@@ -82,7 +82,7 @@
* Virtual Server (if use)
*/
- char *virtual;
+ char *virt;
/*
* Num of context handled (ie: examples, admin...)
@@ -109,13 +109,13 @@
* functions defined here
*/
-int context_set_virtual(jk_context_t *c, char *virtual);
+int context_set_virtual(jk_context_t *c, char *virt);
-int context_open(jk_context_t *c, char *virtual);
+int context_open(jk_context_t *c, char *virt);
int context_close(jk_context_t *c);
-int context_alloc(jk_context_t **c, char *virtual);
+int context_alloc(jk_context_t **c, char *virt);
int context_free(jk_context_t **c);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
