jerenkrantz 2003/11/15 17:50:10
Modified: crypto apr_md4.c apr_sha1.c getuuid.c
encoding apr_base64.c
hooks apr_hooks.c
include apr_hooks.h apr_ldap.h.in apr_ldap.hnw apr_ldap.hw
apr_md5.h apr_optional.h apr_uri.h apr_xlate.h
ldap apr_ldap_compat.c
uri apr_uri.c
xlate xlate.c
Log:
Axe deprecated functions, #defines, etc. in apr-util.
Revision Changes Path
1.7 +1 -1 apr-util/crypto/apr_md4.c
Index: apr_md4.c
===================================================================
RCS file: /home/cvs/apr-util/crypto/apr_md4.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- apr_md4.c 1 Jan 2003 00:02:18 -0000 1.6
+++ apr_md4.c 16 Nov 2003 01:50:10 -0000 1.7
@@ -178,7 +178,7 @@
/* TODO: remove the single-byte-only restriction from this code
*/
- rv = apr_xlate_get_sb(xlate, &is_sb);
+ rv = apr_xlate_sb_get(xlate, &is_sb);
if (rv != APR_SUCCESS) {
return rv;
}
1.28 +1 -1 apr-util/crypto/apr_sha1.c
Index: apr_sha1.c
===================================================================
RCS file: /home/cvs/apr-util/crypto/apr_sha1.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -u -r1.27 -r1.28
--- apr_sha1.c 1 Jan 2003 00:02:18 -0000 1.27
+++ apr_sha1.c 16 Nov 2003 01:50:10 -0000 1.28
@@ -129,7 +129,7 @@
/* Only single-byte conversion is supported.
*/
- rv = apr_xlate_get_sb(x, &onoff);
+ rv = apr_xlate_sb_get(x, &onoff);
if (rv) {
return rv;
}
1.4 +1 -1 apr-util/crypto/getuuid.c
Index: getuuid.c
===================================================================
RCS file: /home/cvs/apr-util/crypto/getuuid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- getuuid.c 1 Jan 2003 00:02:18 -0000 1.3
+++ getuuid.c 16 Nov 2003 01:50:10 -0000 1.4
@@ -98,7 +98,7 @@
#else
- unsigned char seed[MD5_DIGESTSIZE];
+ unsigned char seed[APR_MD5_DIGESTSIZE];
apr_md5_ctx_t c;
/* ### probably should revise some of this to be a bit more portable */
1.24 +2 -2 apr-util/encoding/apr_base64.c
Index: apr_base64.c
===================================================================
RCS file: /home/cvs/apr-util/encoding/apr_base64.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- apr_base64.c 1 Jan 2003 00:02:19 -0000 1.23
+++ apr_base64.c 16 Nov 2003 01:50:10 -0000 1.24
@@ -123,14 +123,14 @@
/* Only single-byte conversion is supported.
*/
- rv = apr_xlate_get_sb(to_ascii, &onoff);
+ rv = apr_xlate_sb_get(to_ascii, &onoff);
if (rv) {
return rv;
}
if (!onoff) { /* If conversion is not single-byte-only */
return APR_EINVAL;
}
- rv = apr_xlate_get_sb(to_ebcdic, &onoff);
+ rv = apr_xlate_sb_get(to_ebcdic, &onoff);
if (rv) {
return rv;
}
1.48 +0 -12 apr-util/hooks/apr_hooks.c
Index: apr_hooks.c
===================================================================
RCS file: /home/cvs/apr-util/hooks/apr_hooks.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -u -r1.47 -r1.48
--- apr_hooks.c 7 Feb 2003 18:03:35 -0000 1.47
+++ apr_hooks.c 16 Nov 2003 01:50:10 -0000 1.48
@@ -394,11 +394,6 @@
}
/* Deprecated */
-APU_DECLARE(apr_opt_fn_t *) apr_retrieve_optional_fn(const char *szName)
-{
- return apr_dynamic_fn_retrieve(szName);
-}
-
APU_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName,
apr_opt_fn_t *pfn)
{
@@ -408,13 +403,6 @@
if(!s_phOptionalFunctions)
s_phOptionalFunctions=apr_hash_make(apr_hook_global_pool);
apr_hash_set(s_phOptionalFunctions,szName,strlen(szName),(void *)pfn);
-}
-
-/* Deprecated */
-APU_DECLARE_NONSTD(void) apr_register_optional_fn(const char *szName,
- apr_opt_fn_t *pfn)
-{
- apr_dynamic_fn_register(szName, pfn);
}
#if 0
1.49 +0 -17 apr-util/include/apr_hooks.h
Index: apr_hooks.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_hooks.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -u -r1.48 -r1.49
--- apr_hooks.h 15 Aug 2003 22:27:28 -0000 1.48
+++ apr_hooks.h 16 Nov 2003 01:50:10 -0000 1.49
@@ -247,26 +247,17 @@
*/
APU_DECLARE_DATA extern apr_pool_t *apr_hook_global_pool;
-/** @deprecated @see apr_hook_global_pool */
-APU_DECLARE_DATA extern apr_pool_t *apr_global_hook_pool;
-
/**
* A global variable to determine if debugging information about the
* hooks functions should be printed
*/
APU_DECLARE_DATA extern int apr_hook_debug_enabled;
-/** @deprecated @see apr_hook_debug_enabled */
-APU_DECLARE_DATA extern int apr_debug_module_hooks;
-
/**
* The name of the module that is currently registering a function
*/
APU_DECLARE_DATA extern const char *apr_hook_debug_current;
-/** @deprecated @see apr_hook_debug_current */
-APU_DECLARE_DATA extern const char *apr_current_hooking_module;
-
/**
* Register a hook function to be sorted
* @param szHookName The name of the Hook the function is registered for
@@ -279,9 +270,6 @@
*/
APU_DECLARE(void) apr_hook_sort_all(void);
-/** @deprecated @see apr_hook_sort_all */
-APU_DECLARE(void) apr_sort_hooks(void);
-
/**
* Print all of the information about the current hook. This is used for
* debugging purposes.
@@ -292,11 +280,6 @@
APU_DECLARE(void) apr_hook_debug_show(const char *szName,
const char * const *aszPre,
const char * const *aszSucc);
-
-/** @deprecated @see apr_hook_debug_show */
-APU_DECLARE(void) apr_show_hook(const char *szName,
- const char * const *aszPre,
- const char * const *aszSucc);
/**
* Remove all currently registered functions.
1.9 +0 -9 apr-util/include/apr_ldap.h.in
Index: apr_ldap.h.in
===================================================================
RCS file: /home/cvs/apr-util/include/apr_ldap.h.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- apr_ldap.h.in 10 Mar 2003 22:49:27 -0000 1.8
+++ apr_ldap.h.in 16 Nov 2003 01:50:10 -0000 1.9
@@ -134,15 +134,6 @@
#error "ERROR no LDAP SDK defined!"
#endif
-/* These are garbage, our public macros are always APR_HAS_ prefixed,
- * and use 0/1 values, not defined/undef semantics.
- *
- * Will be deprecated in APR 1.0
- */
-#if APR_HAS_LDAP
-#define APU_HAS_LDAP
-#endif
-
/* LDAP header files */
#if APR_HAS_NETSCAPE_LDAPSDK
1.7 +0 -10 apr-util/include/apr_ldap.hnw
Index: apr_ldap.hnw
===================================================================
RCS file: /home/cvs/apr-util/include/apr_ldap.hnw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- apr_ldap.hnw 14 Feb 2003 16:07:19 -0000 1.6
+++ apr_ldap.hnw 16 Nov 2003 01:50:10 -0000 1.7
@@ -123,16 +123,6 @@
#error "ERROR no LDAP SDK defined!"
#endif
-/* These are garbage, our public macros are always APR_HAS_ prefixed,
- * and use 0/1 values, not defined/undef semantics.
- *
- * Will be deprecated in APR 1.0
- */
-#if APR_HAS_LDAP
-#define APU_HAS_LDAP
-#endif
-
-
/* LDAP header files */
#if APR_HAS_NETSCAPE_LDAPSDK
1.7 +0 -10 apr-util/include/apr_ldap.hw
Index: apr_ldap.hw
===================================================================
RCS file: /home/cvs/apr-util/include/apr_ldap.hw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- apr_ldap.hw 14 Feb 2003 16:07:18 -0000 1.6
+++ apr_ldap.hw 16 Nov 2003 01:50:10 -0000 1.7
@@ -126,16 +126,6 @@
#error "ERROR no LDAP SDK defined!"
#endif
-/* These are garbage, our public macros are always APR_HAS_ prefixed,
- * and use 0/1 values, not defined/undef semantics.
- *
- * Will be deprecated in APR 1.0
- */
-#if APR_HAS_LDAP
-#define APU_HAS_LDAP
-#endif
-
-
/* LDAP header files */
#if APR_HAS_NETSCAPE_LDAPSDK
1.7 +0 -1 apr-util/include/apr_md5.h
Index: apr_md5.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_md5.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- apr_md5.h 12 Mar 2003 20:20:01 -0000 1.6
+++ apr_md5.h 16 Nov 2003 01:50:10 -0000 1.7
@@ -104,7 +104,6 @@
/** The MD5 digest size */
#define APR_MD5_DIGESTSIZE 16
-#define MD5_DIGESTSIZE APR_MD5_DIGESTSIZE /**< @deprecated */
/** @see apr_md5_ctx_t */
typedef struct apr_md5_ctx_t apr_md5_ctx_t;
1.12 +0 -7 apr-util/include/apr_optional.h
Index: apr_optional.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_optional.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- apr_optional.h 3 Mar 2003 23:41:11 -0000 1.11
+++ apr_optional.h 16 Nov 2003 01:50:10 -0000 1.12
@@ -98,10 +98,6 @@
/** @internal */
APU_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName,
apr_opt_fn_t *pfn);
-
-/** @internal deprecated function, see apr_dynamic_fn_register */
-APU_DECLARE_NONSTD(void) apr_register_optional_fn(const char *szName,
- apr_opt_fn_t *pfn);
/**
* Register an optional function. This can be later retrieved, type-safely,
by
@@ -117,9 +113,6 @@
* Private function! DO NOT USE!
*/
APU_DECLARE(apr_opt_fn_t *) apr_dynamic_fn_retrieve(const char *szName);
-
-/** @internal deprecated function, see apr_dynamic_fn_retrieve */
-APU_DECLARE(apr_opt_fn_t *) apr_retrieve_optional_fn(const char *szName);
/**
* Retrieve an optional function. Returns NULL if the function is not
present.
1.17 +0 -3 apr-util/include/apr_uri.h
Index: apr_uri.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_uri.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- apr_uri.h 3 Mar 2003 23:41:11 -0000 1.16
+++ apr_uri.h 16 Nov 2003 01:50:10 -0000 1.17
@@ -168,9 +168,6 @@
*/
APU_DECLARE(apr_port_t) apr_uri_port_of_scheme(const char *scheme_str);
-/** @deprecated @see apr_uri_port_of_scheme */
-APU_DECLARE(apr_port_t) apr_uri_default_port_for_scheme(const char
*scheme_str);
-
/**
* Unparse a apr_uri_t structure to an URI string. Optionally
* suppress the password for security reasons.
1.8 +0 -3 apr-util/include/apr_xlate.h
Index: apr_xlate.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_xlate.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- apr_xlate.h 3 Mar 2003 23:41:11 -0000 1.7
+++ apr_xlate.h 16 Nov 2003 01:50:10 -0000 1.8
@@ -130,9 +130,6 @@
*/
APU_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff);
-/** @deprecated @see apr_xlate_sb_get */
-APU_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff);
-
/**
* Convert a buffer of text from one codepage to another.
* @param convset The handle allocated by apr_xlate_open, specifying
1.5 +2 -2 apr-util/ldap/apr_ldap_compat.c
Index: apr_ldap_compat.c
===================================================================
RCS file: /home/cvs/apr-util/ldap/apr_ldap_compat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- apr_ldap_compat.c 1 Jan 2003 00:02:21 -0000 1.4
+++ apr_ldap_compat.c 16 Nov 2003 01:50:10 -0000 1.5
@@ -62,7 +62,7 @@
#include <apr_ldap.h>
-#ifdef APU_HAS_LDAP
+#if APR_HAS_LDAP
/*
@@ -97,4 +97,4 @@
#endif /* if LDAP_VERSION_MAX */
-#endif /* APU_HAS_LDAP */
+#endif /* APR_HAS_LDAP */
1.18 +0 -6 apr-util/uri/apr_uri.c
Index: apr_uri.c
===================================================================
RCS file: /home/cvs/apr-util/uri/apr_uri.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- apr_uri.c 3 Mar 2003 18:31:58 -0000 1.17
+++ apr_uri.c 16 Nov 2003 01:50:10 -0000 1.18
@@ -122,12 +122,6 @@
return 0;
}
-/** @deprecated @see apr_uri_port_of_scheme */
-APU_DECLARE(apr_port_t) apr_uri_default_port_for_scheme(const char
*scheme_str)
-{
- return apr_uri_port_of_scheme(scheme_str);
-}
-
/* Unparse a apr_uri_t structure to an URI string.
* Optionally suppress the password for security reasons.
*/
1.18 +0 -7 apr-util/xlate/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr-util/xlate/xlate.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- xlate.c 12 Jan 2003 22:47:23 -0000 1.17
+++ xlate.c 16 Nov 2003 01:50:10 -0000 1.18
@@ -481,10 +481,3 @@
}
#endif /* APR_HAS_XLATE */
-
-/* Deprecated
- */
-APU_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff)
-{
- return apr_xlate_sb_get(convset, onoff);
-}
