costin 02/03/18 09:58:46
Modified: jk/native2/include jk_map.h
Log:
Remove the special map methods.
A map is a map, the config may be backed by a map but it deals with the
high level stuff.
As soon as APR goes 1.0 we can switch from our private map impl. to apr.
Revision Changes Path
1.10 +1 -97 jakarta-tomcat-connectors/jk/native2/include/jk_map.h
Index: jk_map.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_map.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_map.h 21 Feb 2002 11:15:04 -0000 1.9
+++ jk_map.h 18 Mar 2002 17:58:46 -0000 1.10
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Map object header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
#ifndef JK_MAP_H
@@ -120,102 +120,6 @@
int jk2_map_default_create(struct jk_env *env, jk_map_t **m,
struct jk_pool *pool);
-
-/* int map_open(jk_env *env, jk_map_t *m); */
-
-
-
-/* Additional functions that operate on maps. They are implemented
- * in jk_map.c, togheter with the 'default' jk map, but should operate
- * on any map.
- */
-
-char *jk2_map_getString(struct jk_env *env, struct jk_map *m,
- const char *name, char *def);
-
-int jk2_map_getBool(struct jk_env *env, struct jk_map *m,
- const char *prop, const char *def);
-
-/** Get a string property, using the worker's style
- for properties. If objType is null, then objName.pname
- will be used.
- Example worker.ajp13.host=localhost.
-*/
-char *jk2_map_getStrProp(struct jk_env *env, jk_map_t *m,
- const char *objType, const char *objName,
- const char *pname, char *def);
-
-int jk2_map_getIntProp(struct jk_env *env, jk_map_t *m,
- const char *objType, const char *objName,
- const char *pname,
- int def);
-
-/** Add all the values from src into dst. Use dst's pool
- */
-int jk2_map_append(struct jk_env *env, jk_map_t * dst,
- jk_map_t * src );
-
-/* ========== Manipulating values ========== */
-
-
-/** Extract a String[] property. If sep==NULL, it'll split the value on
- * ' ', tab, ',', '*'.
- *
- * @param pool Pool on which the result will be allocated. Defaults
- * to the map's pool XXX Use the env's tmp pool.
- */
-char **jk2_map_split(struct jk_env *env, jk_map_t *m,
- struct jk_pool *pool, /* XXX will be removed */
- const char *listStr, const char *sep,unsigned *list_len );
-
-int jk2_map_str2int(struct jk_env *env, char *value);
-
-/* Just atof...
- double jk_map_getDouble(jk_env *env, jk_map_t *m, */
-/* const char *name, double def); */
-
-
-
-/* ========== Reading and parsing properties ========== */
-
-/** Read the properties from the file, doing $(prop) substitution
- */
-int jk2_map_readFileProperties(struct jk_env *env, jk_map_t *m,
- const char *f);
-
-/**
- * Replace $(property) in value.
- *
- */
-char *jk2_map_replaceProperties(struct jk_env *env, jk_map_t *m,
- struct jk_pool *resultPool,
- char *value);
-
-
-/** For multi-value properties, return the concatenation
- * of all values.
- *
- * @param sep Separators used to separate multi-values and
- * when concatenating the values, NULL for none. The first
- * char will be used on the result, the other will be
- * used to split. ( i.e. the map may either have multiple
- * values or values separated by one of the sep's chars )
- *
- */
-char *jk2_map_getValuesString(struct jk_env *env, struct jk_map *m,
- struct jk_pool *resultPool,
- char *name, char *sep );
-
-
-/** For multi-value properties, return the array containing
- * all values.
- *
- * @param sep Optional separator, it'll be used to split existing values.
- * Curently only single-char separators are supported.
- */
-char **jk2_map_getValues(struct jk_env *env, struct jk_map *m,
- struct jk_pool *resultPool,
- char *name, char *sep, int *count);
#ifdef __cplusplus
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
