costin 01/11/26 09:12:38
Modified: jk/native/common jk_map.c jk_map.h
Log:
Moved ( with small modifications ) the code from jk_util that gets properties.
Revision Changes Path
1.8 +44 -1 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_map.c 2001/10/30 21:08:39 1.7
+++ jk_map.c 2001/11/26 17:12:38 1.8
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose map object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***************************************************************************/
#include "jk_global.h"
@@ -481,5 +481,48 @@
}
return rc;
+}
+
+
+/** Get a string property, using the worker's style
+ for properties.
+ Example worker.ajp13.host=localhost.
+*/
+char *map_getStrProp(jk_map_t *m,
+ char *objType,
+ char *objName,
+ char *pname,
+ char *def)
+{
+ char buf[1024];
+
+ if( m==NULL ||
+ objType==NULL ||
+ objName==NULL ||
+ pname==NULL ) {
+ return def;
+ }
+
+ sprintf(buf, "%s.%s.%s", objType, objName, pname);
+ return map_get_string(m, buf, NULL);
+}
+
+int map_getIntProp(jk_map_t *m,
+ char *objType,
+ char *objName,
+ char *pname,
+ int def)
+{
+ char buf[1024];
+
+ if( m==NULL ||
+ objType==NULL ||
+ objName==NULL ||
+ pname==NULL ) {
+ return def;
+ }
+
+ sprintf(buf, "%s.%s.%s", objType, objName, pname);
+ return map_get_int(m, buf, def);
}
1.5 +17 -1 jakarta-tomcat-connectors/jk/native/common/jk_map.h
Index: jk_map.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_map.h 2001/10/30 21:08:39 1.4
+++ jk_map.h 2001/11/26 17:12:38 1.5
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Map object header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#ifndef JK_MAP_H
@@ -124,7 +124,23 @@
*/
char *map_replace_properties(const char *value, jk_map_t *m);
+/** Get a string property, using the worker's style
+ for properties.
+ Example worker.ajp13.host=localhost.
+*/
+char *map_getStrProp(jk_map_t *m,
+ char *objType,
+ char *objName,
+ char *pname,
+ char *def);
+
+int map_getIntProp(jk_map_t *m,
+ char *objType,
+ char *objName,
+ char *pname,
+ int def);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
