You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2022/11/19 16:12:14 UTC
svn commit: r1905407 [2/3] - in /apr/apr/trunk: include/ include/arch/beos/ include/arch/netware/ include/arch/os2/ include/arch/unix/ include/arch/win32/ include/private/ random/unix/ test/
Modified: apr/apr/trunk/include/apr_fnmatch.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_fnmatch.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_fnmatch.h (original)
+++ apr/apr/trunk/include/apr_fnmatch.h Sat Nov 19 16:12:13 2022
@@ -51,12 +51,12 @@ extern "C" {
/**
* @defgroup apr_fnmatch Filename Matching Functions
- * @ingroup APR
+ * @ingroup APR
* @{
*/
#define APR_FNM_NOMATCH 1 /**< Match failed. */
-
+
#define APR_FNM_NOESCAPE 0x01 /**< Disable backslash escaping. */
#define APR_FNM_PATHNAME 0x02 /**< Slash must be matched by slash. */
#define APR_FNM_PERIOD 0x04 /**< Leading period must be matched by period. */
@@ -72,20 +72,20 @@ extern "C" {
* PATTERN: Backslash followed by any character, including another
* backslash.<br/>
* MATCHES: That character exactly.
- *
+ *
* <p>
* PATTERN: ?<br/>
* MATCHES: Any single character.
* </p>
- *
+ *
* <p>
* PATTERN: *<br/>
* MATCHES: Any sequence of zero or more characters. (Note that multiple
* *s in a row are equivalent to one.)
- *
+ *
* PATTERN: Any character other than \?*[ or a \ at the end of the pattern<br/>
* MATCHES: That character exactly. (Case sensitive.)
- *
+ *
* PATTERN: [ followed by a class description followed by ]<br/>
* MATCHES: A single character described by the class description.
* (Never matches, if the class description reaches until the
@@ -102,7 +102,7 @@ extern "C" {
* the first character larger than the second are legal but
* never match. Edge cases: [] never matches, and [^] and [!]
* always match without consuming a character.
- *
+ *
* Note that these patterns attempt to match the entire string, not
* just find a substring matching the pattern.
*
@@ -117,7 +117,7 @@ extern "C" {
* </pre>
*/
-APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern,
+APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern,
const char *strings, int flags);
/**
@@ -140,7 +140,7 @@ APR_DECLARE(int) apr_fnmatch_test(const
* @remark The returned array may be empty even if APR_SUCCESS was
* returned.
*/
-APR_DECLARE(apr_status_t) apr_match_glob(const char *dir_pattern,
+APR_DECLARE(apr_status_t) apr_match_glob(const char *dir_pattern,
apr_array_header_t **result,
apr_pool_t *p);
Modified: apr/apr/trunk/include/apr_general.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_general.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_general.h (original)
+++ apr/apr/trunk/include/apr_general.h Sat Nov 19 16:12:13 2022
@@ -39,7 +39,7 @@ extern "C" {
/**
* @defgroup apr_general Miscellaneous library routines
- * @ingroup APR
+ * @ingroup APR
* This is collection of oddballs that didn't fit anywhere else,
* and might move to more appropriate headers with the release
* of APR 1.0.
@@ -114,10 +114,10 @@ typedef enum { APR_WAIT_READ, APR_WAIT_W
#ifndef DOXYGEN
-/* A couple of prototypes for functions in case some platform doesn't
+/* A couple of prototypes for functions in case some platform doesn't
* have it
*/
-#if (!APR_HAVE_STRCASECMP) && (APR_HAVE_STRICMP)
+#if (!APR_HAVE_STRCASECMP) && (APR_HAVE_STRICMP)
#define strcasecmp(s1, s2) stricmp(s1, s2)
#elif (!APR_HAVE_STRCASECMP)
int strcasecmp(const char *a, const char *b);
@@ -181,7 +181,7 @@ struct type { \
*/
/**
- * Setup any APR internal data structures. This MUST be the first function
+ * Setup any APR internal data structures. This MUST be the first function
* called for any APR library. It is safe to call apr_initialize several
* times as long as apr_terminate() is called the same number of times.
* @remark See apr_app_initialize() if this is an application, rather than
@@ -201,15 +201,15 @@ APR_DECLARE(apr_status_t) apr_initialize
* Otherwise, this call is identical to apr_initialize(), and must be closed
* with a call to apr_terminate() at the end of program execution.
*/
-APR_DECLARE(apr_status_t) apr_app_initialize(int *argc,
- char const * const * *argv,
+APR_DECLARE(apr_status_t) apr_app_initialize(int *argc,
+ char const * const * *argv,
char const * const * *env);
/**
- * Tear down any APR internal data structures which aren't torn down
+ * Tear down any APR internal data structures which aren't torn down
* automatically. apr_terminate must be called once for every call to
* apr_initialize() or apr_app_initialize().
- * @remark An APR program must call this function at termination once it
+ * @remark An APR program must call this function at termination once it
* has stopped using APR services. The APR developers suggest using
* @c atexit(apr_terminate) to ensure this is called. When using APR
* from a language other than C that has problems with the calling
@@ -219,12 +219,12 @@ APR_DECLARE(apr_status_t) apr_app_initia
APR_DECLARE_NONSTD(void) apr_terminate(void);
/**
- * Tear down any APR internal data structures which aren't torn down
+ * Tear down any APR internal data structures which aren't torn down
* automatically, same as apr_terminate()
* @remark An APR program must call either the apr_terminate() or apr_terminate2
- * function once it it has finished using APR services. The APR
+ * function once it it has finished using APR services. The APR
* developers suggest using @c atexit(apr_terminate) to ensure this is done.
- * apr_terminate2 exists to allow non-c language apps to tear down apr,
+ * apr_terminate2 exists to allow non-c language apps to tear down apr,
* while apr_terminate() is recommended from c language applications.
*/
APR_DECLARE(void) apr_terminate2(void);
@@ -244,7 +244,7 @@ APR_DECLARE(void) apr_terminate2(void);
* @param buf Buffer to fill with random bytes
* @param length Length of buffer in bytes
*/
-APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf,
+APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf,
apr_size_t length);
#endif
Modified: apr/apr/trunk/include/apr_getopt.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_getopt.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_getopt.h (original)
+++ apr/apr/trunk/include/apr_getopt.h Sat Nov 19 16:12:13 2022
@@ -30,11 +30,11 @@ extern "C" {
/**
* @defgroup apr_getopt Command Argument Parsing
- * @ingroup APR
+ * @ingroup APR
* @{
*/
-/**
+/**
* An @c apr_getopt_t error callback function.
*
* @a arg is this @c apr_getopt_t's @c errarg member.
@@ -46,7 +46,7 @@ typedef struct apr_getopt_t apr_getopt_t
/**
* Structure to store command line argument information.
- */
+ */
struct apr_getopt_t {
/** context for processing */
apr_pool_t *cont;
@@ -106,8 +106,8 @@ APR_DECLARE(apr_status_t) apr_getopt_ini
/**
* Parse the options initialized by apr_getopt_init().
* @param os The apr_opt_t structure returned by apr_getopt_init()
- * @param opts A string of characters that are acceptable options to the
- * program. Characters followed by ":" are required to have an
+ * @param opts A string of characters that are acceptable options to the
+ * program. Characters followed by ":" are required to have an
* option associated
* @param option_ch The next option character parsed
* @param option_arg The argument following the option character:
@@ -119,7 +119,7 @@ APR_DECLARE(apr_status_t) apr_getopt_ini
* APR_SUCCESS -- The next option was found.
* </PRE>
*/
-APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts,
+APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts,
char *option_ch, const char **option_arg);
/**
Modified: apr/apr/trunk/include/apr_global_mutex.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_global_mutex.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_global_mutex.h (original)
+++ apr/apr/trunk/include/apr_global_mutex.h Sat Nov 19 16:12:13 2022
@@ -37,7 +37,7 @@ extern "C" {
/**
* @defgroup APR_GlobalMutex Global Locking Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -83,7 +83,7 @@ APR_DECLARE(apr_status_t) apr_global_mut
* @param mutex The newly re-opened mutex structure.
* @param fname A file name to use if the mutex mechanism requires one. This
* argument should always be provided. The mutex code itself will
- * determine if it should be used. This filename should be the
+ * determine if it should be used. This filename should be the
* same one that was passed to apr_global_mutex_create().
* @param pool The pool to operate on.
* @remark This function must be called to maintain portability, even
Modified: apr/apr/trunk/include/apr_hash.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_hash.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_hash.h (original)
+++ apr/apr/trunk/include/apr_hash.h Sat Nov 19 16:12:13 2022
@@ -30,7 +30,7 @@ extern "C" {
/**
* @defgroup apr_hash Hash Tables
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -59,7 +59,7 @@ typedef struct apr_hash_index_t apr_hash
/**
* Callback functions for calculating hash values.
* @param key The key.
- * @param klen The length of the key, or APR_HASH_KEY_STRING to use the string
+ * @param klen The length of the key, or APR_HASH_KEY_STRING to use the string
* length. If APR_HASH_KEY_STRING then returns the actual key length.
*/
typedef unsigned int (*apr_hashfunc_t)(const char *key, apr_ssize_t *klen);
@@ -83,7 +83,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_make(
* @param hash_func A custom hash function.
* @return The hash table just created
*/
-APR_DECLARE(apr_hash_t *) apr_hash_make_custom(apr_pool_t *pool,
+APR_DECLARE(apr_hash_t *) apr_hash_make_custom(apr_pool_t *pool,
apr_hashfunc_t hash_func);
/**
@@ -164,7 +164,7 @@ APR_DECLARE(apr_hash_index_t *) apr_hash
/**
* Continue iterating over the entries in a hash table.
* @param hi The iteration state
- * @return a pointer to the updated iteration state. NULL if there are no more
+ * @return a pointer to the updated iteration state. NULL if there are no more
* entries.
*/
APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi);
@@ -178,7 +178,7 @@ APR_DECLARE(apr_hash_index_t *) apr_hash
* @remark The return pointers should point to a variable that will be set to the
* corresponding data, or they may be NULL if the data isn't interesting.
*/
-APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key,
+APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key,
apr_ssize_t *klen, void **val);
/**
@@ -225,7 +225,7 @@ APR_DECLARE(void) apr_hash_clear(apr_has
* @return A new hash table containing all of the data from the two passed in
*/
APR_DECLARE(apr_hash_t *) apr_hash_overlay(apr_pool_t *p,
- const apr_hash_t *overlay,
+ const apr_hash_t *overlay,
const apr_hash_t *base);
/**
@@ -261,14 +261,14 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge
* @param klen The key length from this iteration of the hash table
* @param value The value from this iteration of the hash table
* @remark Iteration continues while this callback function returns non-zero.
- * To export the callback function for apr_hash_do() it must be declared
+ * To export the callback function for apr_hash_do() it must be declared
* in the _NONSTD convention.
*/
typedef int (apr_hash_do_callback_fn_t)(void *rec, const void *key,
apr_ssize_t klen,
const void *value);
-/**
+/**
* Iterate over a hash table running the provided function once for every
* element in the hash table. The @p comp function will be invoked for
* every element in the hash table.
Modified: apr/apr/trunk/include/apr_hooks.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_hooks.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_hooks.h (original)
+++ apr/apr/trunk/include/apr_hooks.h Sat Nov 19 16:12:13 2022
@@ -110,11 +110,11 @@ extern "C" {
/** @} */
-/** macro to return the prototype of the hook function */
+/** macro to return the prototype of the hook function */
#define APR_IMPLEMENT_HOOK_GET_PROTO(ns,link,name) \
link##_DECLARE(apr_array_header_t *) ns##_hook_get_##name(void)
-/** macro to declare the hook correctly */
+/** macro to declare the hook correctly */
#define APR_DECLARE_EXTERNAL_HOOK(ns,link,ret,name,args) \
typedef ret ns##_HOOK_##name##_t args; \
link##_DECLARE(void) ns##_hook_##name(ns##_HOOK_##name##_t *pf, \
@@ -131,7 +131,7 @@ typedef struct ns##_LINK_##name##_t \
int nOrder; \
} ns##_LINK_##name##_t;
-/** macro to declare the hook structure */
+/** macro to declare the hook structure */
#define APR_HOOK_STRUCT(members) \
static struct { members } _hooks;
@@ -308,18 +308,18 @@ link##_DECLARE(ret) ns##_run_##name args
/**
* The global pool used to allocate any memory needed by the hooks.
- */
+ */
APR_DECLARE_DATA extern apr_pool_t *apr_hook_global_pool;
/**
* A global variable to determine if debugging information about the
* hooks functions should be printed.
- */
+ */
APR_DECLARE_DATA extern int apr_hook_debug_enabled;
/**
* The name of the module that is currently registering a function.
- */
+ */
APR_DECLARE_DATA extern const char *apr_hook_debug_current;
/**
@@ -327,7 +327,7 @@ APR_DECLARE_DATA extern const char *apr_
* @param szHookName The name of the Hook the function is registered for
* @param aHooks The array which stores all of the functions for this hook
*/
-APR_DECLARE(void) apr_hook_sort_register(const char *szHookName,
+APR_DECLARE(void) apr_hook_sort_register(const char *szHookName,
apr_array_header_t **aHooks);
/**
* Sort all of the registered functions for a given hook.
Modified: apr/apr/trunk/include/apr_inherit.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_inherit.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_inherit.h (original)
+++ apr/apr/trunk/include/apr_inherit.h Sat Nov 19 16:12:13 2022
@@ -18,16 +18,16 @@
#define APR_INHERIT_H
/**
- * @file apr_inherit.h
+ * @file apr_inherit.h
* @brief APR File Handle Inheritance Helpers
- * @remark This internal header includes internal declaration helpers
+ * @remark This internal header includes internal declaration helpers
* for other headers to declare apr_foo_inherit_[un]set functions.
*/
/**
- * Prototype for type-specific declarations of apr_foo_inherit_set
- * functions.
- * @remark Doxygen unwraps this macro (via doxygen.conf) to provide
+ * Prototype for type-specific declarations of apr_foo_inherit_set
+ * functions.
+ * @remark Doxygen unwraps this macro (via doxygen.conf) to provide
* actual help for each specific occurrence of apr_foo_inherit_set.
* @remark the linkage is specified for APR. It would be possible to expand
* the macros to support other linkages.
@@ -37,9 +37,9 @@
apr_##type##_t *the##type)
/**
- * Prototype for type-specific declarations of apr_foo_inherit_unset
- * functions.
- * @remark Doxygen unwraps this macro (via doxygen.conf) to provide
+ * Prototype for type-specific declarations of apr_foo_inherit_unset
+ * functions.
+ * @remark Doxygen unwraps this macro (via doxygen.conf) to provide
* actual help for each specific occurrence of apr_foo_inherit_unset.
* @remark the linkage is specified for APR. It would be possible to expand
* the macros to support other linkages.
Modified: apr/apr/trunk/include/apr_lib.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_lib.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_lib.h (original)
+++ apr/apr/trunk/include/apr_lib.h Sat Nov 19 16:12:13 2022
@@ -41,7 +41,7 @@ extern "C" {
/**
* @defgroup apr_lib General Purpose Library Routines
- * @ingroup APR
+ * @ingroup APR
* This is collection of oddballs that didn't fit anywhere else,
* and might move to more appropriate headers with the release
* of APR 1.0.
@@ -186,7 +186,7 @@ APR_DECLARE(int) apr_vformatter(int (*fl
* reason; its value will never be modified by the apr_password_get()
* function.
*/
-APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf,
+APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf,
apr_size_t *bufsize);
/** @} */
Modified: apr/apr/trunk/include/apr_md4.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_md4.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_md4.h (original)
+++ apr/apr/trunk/include/apr_md4.h Sat Nov 19 16:12:13 2022
@@ -85,10 +85,10 @@ APR_DECLARE(apr_status_t) apr_md4_init(a
#if APR_HAS_XLATE
/**
- * MDr4 translation setup. Provides the APR translation handle to be used
+ * MDr4 translation setup. Provides the APR translation handle to be used
* for translating the content before calculating the digest.
* @param context The MD4 content to set the translation for.
- * @param xlate The translation handle to use for this MD4 context
+ * @param xlate The translation handle to use for this MD4 context
*/
APR_DECLARE(apr_status_t) apr_md4_set_xlate(apr_md4_ctx_t *context,
apr_xlate_t *xlate);
@@ -97,7 +97,7 @@ APR_DECLARE(apr_status_t) apr_md4_set_xl
#endif
/**
- * MD4 block update operation. Continue an MD4 message-digest operation,
+ * MD4 block update operation. Continue an MD4 message-digest operation,
* processing another message block, and updating the context.
* @param context The MD4 content to update.
* @param input next message block to update
@@ -108,7 +108,7 @@ APR_DECLARE(apr_status_t) apr_md4_update
apr_size_t inputLen);
/**
- * MD4 finalization. Ends an MD4 message-digest operation, writing the
+ * MD4 finalization. Ends an MD4 message-digest operation, writing the
* message digest and zeroing the context
* @param digest The final MD4 digest
* @param context The MD4 content we are finalizing.
Modified: apr/apr/trunk/include/apr_md5.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_md5.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_md5.h (original)
+++ apr/apr/trunk/include/apr_md5.h Sat Nov 19 16:12:13 2022
@@ -78,7 +78,7 @@ struct apr_md5_ctx_t {
apr_uint32_t count[2];
/** input buffer */
unsigned char buffer[64];
- /** translation handle
+ /** translation handle
* ignored if xlate is unsupported
*/
apr_xlate_t *xlate;
@@ -91,16 +91,16 @@ struct apr_md5_ctx_t {
APR_DECLARE(apr_status_t) apr_md5_init(apr_md5_ctx_t *context);
/**
- * MD5 translation setup. Provides the APR translation handle to be used
+ * MD5 translation setup. Provides the APR translation handle to be used
* for translating the content before calculating the digest.
* @param context The MD5 content to set the translation for.
- * @param xlate The translation handle to use for this MD5 context
+ * @param xlate The translation handle to use for this MD5 context
*/
APR_DECLARE(apr_status_t) apr_md5_set_xlate(apr_md5_ctx_t *context,
apr_xlate_t *xlate);
/**
- * MD5 block update operation. Continue an MD5 message-digest operation,
+ * MD5 block update operation. Continue an MD5 message-digest operation,
* processing another message block, and updating the context.
* @param context The MD5 content to update.
* @param input next message block to update
@@ -111,7 +111,7 @@ APR_DECLARE(apr_status_t) apr_md5_update
apr_size_t inputLen);
/**
- * MD5 finalization. Ends an MD5 message-digest operation, writing the
+ * MD5 finalization. Ends an MD5 message-digest operation, writing the
* message digest and zeroing the context
* @param digest The final MD5 digest
* @param context The MD5 content we are finalizing.
@@ -164,7 +164,7 @@ APR_DECLARE(apr_status_t) apr_bcrypt_enc
* @param passwd The password to validate
* @param hash The password to validate against
*/
-APR_DECLARE(apr_status_t) apr_password_validate(const char *passwd,
+APR_DECLARE(apr_status_t) apr_password_validate(const char *passwd,
const char *hash);
Modified: apr/apr/trunk/include/apr_memcache.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_memcache.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_memcache.h (original)
+++ apr/apr/trunk/include/apr_memcache.h Sat Nov 19 16:12:13 2022
@@ -151,7 +151,7 @@ APR_DECLARE(apr_uint32_t) apr_memcache_h
* @return server that controls specified hash
* @see apr_memcache_hash
*/
-APR_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash(apr_memcache_t *mc,
+APR_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash(apr_memcache_t *mc,
const apr_uint32_t hash);
/**
@@ -159,7 +159,7 @@ APR_DECLARE(apr_memcache_server_t *) apr
*/
APR_DECLARE(apr_memcache_server_t *)
apr_memcache_find_server_hash_default(void *baton,
- apr_memcache_t *mc,
+ apr_memcache_t *mc,
const apr_uint32_t hash);
/**
@@ -243,9 +243,9 @@ APR_DECLARE(apr_status_t) apr_memcache_c
* @param baton location of the allocated value
* @param len length of data at baton
* @param flags any flags set by the client for this key
- * @return
+ * @return
*/
-APR_DECLARE(apr_status_t) apr_memcache_getp(apr_memcache_t *mc,
+APR_DECLARE(apr_status_t) apr_memcache_getp(apr_memcache_t *mc,
apr_pool_t *p,
const char* key,
char **baton,
@@ -304,7 +304,7 @@ APR_DECLARE(apr_status_t) apr_memcache_s
* @param data_size length of data at baton
* @param timeout time for the data to live on the server
* @param flags any flags set by the client for this key
- * @return APR_SUCCESS if the key was added, APR_EEXIST if the key
+ * @return APR_SUCCESS if the key was added, APR_EEXIST if the key
* already exists on the server.
*/
APR_DECLARE(apr_status_t) apr_memcache_add(apr_memcache_t *mc,
@@ -322,7 +322,7 @@ APR_DECLARE(apr_status_t) apr_memcache_a
* @param data_size length of data at baton
* @param timeout time for the data to live on the server
* @param flags any flags set by the client for this key
- * @return APR_SUCCESS if the key was added, APR_EEXIST if the key
+ * @return APR_SUCCESS if the key was added, APR_EEXIST if the key
* did not exist on the server.
*/
APR_DECLARE(apr_status_t) apr_memcache_replace(apr_memcache_t *mc,
@@ -348,7 +348,7 @@ APR_DECLARE(apr_status_t) apr_memcache_d
* @param n number to increment by
* @param nv new value after incrementing
*/
-APR_DECLARE(apr_status_t) apr_memcache_incr(apr_memcache_t *mc,
+APR_DECLARE(apr_status_t) apr_memcache_incr(apr_memcache_t *mc,
const char *key,
apr_int32_t n,
apr_uint32_t *nv);
@@ -360,7 +360,7 @@ APR_DECLARE(apr_status_t) apr_memcache_i
* @param n number to decrement by
* @param new_value new value after decrementing
*/
-APR_DECLARE(apr_status_t) apr_memcache_decr(apr_memcache_t *mc,
+APR_DECLARE(apr_status_t) apr_memcache_decr(apr_memcache_t *mc,
const char *key,
apr_int32_t n,
apr_uint32_t *new_value);
@@ -421,7 +421,7 @@ typedef struct
/** Number of bytes this server is allowed to use for storage. */
apr_uint32_t limit_maxbytes;
/** Number of threads the server is running (if built with threading) */
- apr_uint32_t threads;
+ apr_uint32_t threads;
} apr_memcache_stats_t;
/**
@@ -430,7 +430,7 @@ typedef struct
* @param p Pool to allocate answer from
* @param stats location of the new statistics structure
*/
-APR_DECLARE(apr_status_t) apr_memcache_stats(apr_memcache_server_t *ms,
+APR_DECLARE(apr_status_t) apr_memcache_stats(apr_memcache_server_t *ms,
apr_pool_t *p,
apr_memcache_stats_t **stats);
Modified: apr/apr/trunk/include/apr_mmap.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_mmap.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_mmap.h (original)
+++ apr/apr/trunk/include/apr_mmap.h Sat Nov 19 16:12:13 2022
@@ -38,7 +38,7 @@ extern "C" {
/**
* @defgroup apr_mmap MMAP (Memory Map) Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -84,7 +84,7 @@ struct apr_mmap_t {
#if APR_HAS_MMAP || defined(DOXYGEN)
-/** @def APR_MMAP_THRESHOLD
+/** @def APR_MMAP_THRESHOLD
* Files have to be at least this big before they're mmap()d. This is to deal
* with systems where the expense of doing an mmap() and an munmap() outweighs
* the benefit for small files. It shouldn't be set lower than 1.
@@ -114,7 +114,7 @@ struct apr_mmap_t {
/* Function definitions */
-/**
+/**
* Create a new mmap'ed file out of an existing APR file.
* @param newmmap The newly created mmap'ed file.
* @param file The file to turn into an mmap.
@@ -127,17 +127,17 @@ struct apr_mmap_t {
* </PRE>
* @param cntxt The pool to use when creating the mmap.
*/
-APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **newmmap,
+APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **newmmap,
apr_file_t *file, apr_off_t offset,
apr_size_t size, apr_int32_t flag,
apr_pool_t *cntxt);
/**
* Duplicate the specified MMAP.
- * @param new_mmap The structure to duplicate into.
+ * @param new_mmap The structure to duplicate into.
* @param old_mmap The mmap to duplicate.
* @param p The pool to use for new_mmap.
- */
+ */
APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
apr_mmap_t *old_mmap,
apr_pool_t *p);
@@ -148,13 +148,13 @@ APR_DECLARE(apr_status_t) apr_mmap_dup(a
*/
APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm);
-/**
+/**
* Move the pointer into the mmap'ed file to the specified offset.
* @param addr The pointer to the offset specified.
* @param mm The mmap'ed file.
* @param offset The offset to move to.
*/
-APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mm,
+APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mm,
apr_off_t offset);
#endif /* APR_HAS_MMAP */
Modified: apr/apr/trunk/include/apr_network_io.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_network_io.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_network_io.h (original)
+++ apr/apr/trunk/include/apr_network_io.h Sat Nov 19 16:12:13 2022
@@ -25,7 +25,7 @@
#include "apr_pools.h"
#include "apr_file_io.h"
#include "apr_errno.h"
-#include "apr_inherit.h"
+#include "apr_inherit.h"
#include "apr_perms_set.h"
#if APR_HAVE_NETINET_IN_H
@@ -41,7 +41,7 @@ extern "C" {
/**
* @defgroup apr_network_io Network Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -85,7 +85,7 @@ extern "C" {
#define APR_INCOMPLETE_READ 4096 /**< Set on non-blocking sockets
* (timeout != 0) on which the
* previous read() did not fill a buffer
- * completely. the next apr_socket_recv()
+ * completely. the next apr_socket_recv()
* will first call select()/poll() rather than
* going straight into read(). (Can also
* be set by an application to force a
@@ -99,7 +99,7 @@ extern "C" {
#define APR_IPV6_V6ONLY 16384 /**< Don't accept IPv4 connections on an
* IPv6 listening socket.
*/
-#define APR_TCP_DEFER_ACCEPT 32768 /**< Delay accepting of new connections
+#define APR_TCP_DEFER_ACCEPT 32768 /**< Delay accepting of new connections
* until data is available.
* @see apr_socket_accept_filter
*/
@@ -257,7 +257,7 @@ struct apr_sockaddr_t {
/** This points to the IP address structure within the appropriate
* sockaddr structure. */
void *ipaddr_ptr;
- /** If multiple addresses were found by apr_sockaddr_info_get(), this
+ /** If multiple addresses were found by apr_sockaddr_info_get(), this
* points to a representation of the next address. */
apr_sockaddr_t *next;
/** Union of either IPv4 or IPv6 sockaddr. */
@@ -309,19 +309,19 @@ struct apr_hdtr_t {
* socket. The caller must ensure that it is not used by other threads
* at the same time.
*/
-APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new_sock,
+APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new_sock,
int family, int type,
int protocol,
apr_pool_t *cont);
/**
* Shutdown either reading, writing, or both sides of a socket.
- * @param thesocket The socket to close
+ * @param thesocket The socket to close
* @param how How to shutdown the socket. One of:
* <PRE>
* APR_SHUTDOWN_READ no longer allow read requests
* APR_SHUTDOWN_WRITE no longer allow write requests
- * APR_SHUTDOWN_READWRITE no longer allow read or write requests
+ * APR_SHUTDOWN_READWRITE no longer allow read or write requests
* </PRE>
* @see apr_shutdown_how_e
* @remark This does not actually close the socket descriptor, it just
@@ -332,28 +332,28 @@ APR_DECLARE(apr_status_t) apr_socket_shu
/**
* Close a socket.
- * @param thesocket The socket to close
+ * @param thesocket The socket to close
*/
APR_DECLARE(apr_status_t) apr_socket_close(apr_socket_t *thesocket);
/**
* Bind the socket to its associated port
- * @param sock The socket to bind
+ * @param sock The socket to bind
* @param sa The socket address to bind to
* @remark This may be where we will find out if there is any other process
* using the selected port.
*/
-APR_DECLARE(apr_status_t) apr_socket_bind(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_bind(apr_socket_t *sock,
apr_sockaddr_t *sa);
/**
* Listen to a bound socket for connections.
- * @param sock The socket to listen on
+ * @param sock The socket to listen on
* @param backlog The number of outstanding connections allowed in the sockets
* listen queue. If this value is less than zero, the listen
- * queue size is set to zero.
+ * queue size is set to zero.
*/
-APR_DECLARE(apr_status_t) apr_socket_listen(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_listen(apr_socket_t *sock,
apr_int32_t backlog);
/**
@@ -367,14 +367,14 @@ APR_DECLARE(apr_status_t) apr_socket_lis
* socket. The caller must ensure that it is not used by other threads
* at the same time.
*/
-APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new_sock,
+APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new_sock,
apr_socket_t *sock,
apr_pool_t *connection_pool);
/**
- * Issue a connection request to a socket either on the same machine
+ * Issue a connection request to a socket either on the same machine
* or a different one.
- * @param sock The socket we wish to use for our side of the connection
+ * @param sock The socket we wish to use for our side of the connection
* @param sa The address of the machine we wish to connect to.
*/
APR_DECLARE(apr_status_t) apr_socket_connect(apr_socket_t *sock,
@@ -401,7 +401,7 @@ APR_DECLARE(apr_status_t) apr_socket_atr
* @param hostname The hostname or numeric address string to resolve/parse, or
* NULL to build an address that corresponds to 0.0.0.0 or ::
* or in case of APR_UNIX family it is absolute socket filename.
- * @param family The address family to use, or APR_UNSPEC if the system should
+ * @param family The address family to use, or APR_UNSPEC if the system should
* decide.
* @param port The port number.
* @param flags Special processing flags:
@@ -461,8 +461,8 @@ APR_DECLARE(apr_status_t) apr_sockaddr_z
APR_DECLARE(apr_status_t) apr_sockaddr_zone_get(const apr_sockaddr_t *sa,
const char **name,
apr_uint32_t *id,
- apr_pool_t *p);
-
+ apr_pool_t *p);
+
/**
* Look up the host name from an apr_sockaddr_t.
* @param hostname The hostname.
@@ -490,19 +490,19 @@ APR_DECLARE(apr_status_t) apr_getnameinf
* [abc] (not valid IPv6 numeric address string)
* abc:65536 (invalid port number)
*
- * @param addr The new buffer containing just the hostname. On output, *addr
+ * @param addr The new buffer containing just the hostname. On output, *addr
* will be NULL if no hostname/IP address was specfied.
- * @param scope_id The new buffer containing just the scope id. On output,
+ * @param scope_id The new buffer containing just the scope id. On output,
* *scope_id will be NULL if no scope id was specified.
- * @param port The port number. On output, *port will be 0 if no port was
+ * @param port The port number. On output, *port will be 0 if no port was
* specified.
* ### FIXME: 0 is a legal port (per RFC 1700). this should
* ### return something besides zero if the port is missing.
* @param str The input string to be parsed.
* @param p The pool from which *addr and *scope_id are allocated.
- * @remark If scope id shouldn't be allowed, check for scope_id != NULL in
- * addition to checking the return code. If addr/hostname should be
- * required, check for addr == NULL in addition to checking the
+ * @remark If scope id shouldn't be allowed, check for scope_id != NULL in
+ * addition to checking the return code. If addr/hostname should be
+ * required, check for addr == NULL in addition to checking the
* return code.
*/
APR_DECLARE(apr_status_t) apr_parse_addr_port(char **addr,
@@ -544,12 +544,12 @@ APR_DECLARE(apr_status_t) apr_socket_dat
/**
* Send data over a network.
* @param sock The socket to send the data over.
- * @param buf The buffer which contains the data to be sent.
+ * @param buf The buffer which contains the data to be sent.
* @param len On entry, the number of bytes to send; on exit, the number
* of bytes sent.
* @remark
* <PRE>
- * This functions acts like a blocking write by default. To change
+ * This functions acts like a blocking write by default. To change
* this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
* socket option.
*
@@ -558,18 +558,18 @@ APR_DECLARE(apr_status_t) apr_socket_dat
* APR_EINTR is never returned.
* </PRE>
*/
-APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf,
+APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf,
apr_size_t *len);
/**
* Send multiple buffers over a network.
* @param sock The socket to send the data over.
- * @param vec The array of iovec structs containing the data to send
+ * @param vec The array of iovec structs containing the data to send
* @param nvec The number of iovec structs in the array
* @param len Receives the number of bytes actually written
* @remark
* <PRE>
- * This functions acts like a blocking write by default. To change
+ * This functions acts like a blocking write by default. To change
* this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
* socket option.
* The number of bytes actually sent is stored in argument 4.
@@ -579,7 +579,7 @@ APR_DECLARE(apr_status_t) apr_socket_sen
* APR_EINTR is never returned.
* </PRE>
*/
-APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock,
const struct iovec *vec,
apr_int32_t nvec, apr_size_t *len);
@@ -590,9 +590,9 @@ APR_DECLARE(apr_status_t) apr_socket_sen
* @param buf The data to send
* @param len The length of the data to send
*/
-APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock,
apr_sockaddr_t *where,
- apr_int32_t flags, const char *buf,
+ apr_int32_t flags, const char *buf,
apr_size_t *len);
/**
@@ -608,25 +608,25 @@ APR_DECLARE(apr_status_t) apr_socket_sen
* @param len The length of the available buffer
*/
-APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from,
+APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from,
apr_socket_t *sock,
- apr_int32_t flags, char *buf,
+ apr_int32_t flags, char *buf,
apr_size_t *len);
-
+
#if APR_HAS_SENDFILE || defined(DOXYGEN)
/**
- * Send a file from an open file descriptor to a socket, along with
+ * Send a file from an open file descriptor to a socket, along with
* optional headers and trailers
* @param sock The socket to which we're writing
* @param file The open file from which to read
* @param hdtr A structure containing the headers and trailers to send
* @param offset Offset into the file where we should begin writing
- * @param len (input) - Number of bytes to send from the file
- * (output) - Number of bytes actually sent,
+ * @param len (input) - Number of bytes to send from the file
+ * (output) - Number of bytes actually sent,
* including headers, file, and trailers
* @param flags APR flags that are mapped to OS specific flags
- * @remark This functions acts like a blocking write by default. To change
+ * @remark This functions acts like a blocking write by default. To change
* this behavior, use apr_socket_timeout_set() or the
* APR_SO_NONBLOCK socket option.
* The number of bytes actually sent is stored in the len parameter.
@@ -634,7 +634,7 @@ APR_DECLARE(apr_status_t) apr_socket_rec
* value will never be modified by the apr_socket_sendfile() function.
* It is possible for both bytes to be sent and an error to be returned.
*/
-APR_DECLARE(apr_status_t) apr_socket_sendfile(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_sendfile(apr_socket_t *sock,
apr_file_t *file,
apr_hdtr_t *hdtr,
apr_off_t *offset,
@@ -646,12 +646,12 @@ APR_DECLARE(apr_status_t) apr_socket_sen
/**
* Read data from a network.
* @param sock The socket to read the data from.
- * @param buf The buffer to store the data in.
+ * @param buf The buffer to store the data in.
* @param len On entry, the number of bytes to receive; on exit, the number
* of bytes received.
* @remark
* <PRE>
- * This functions acts like a blocking read by default. To change
+ * This functions acts like a blocking read by default. To change
* this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
* socket option.
* The number of bytes actually received is stored in argument 3.
@@ -662,7 +662,7 @@ APR_DECLARE(apr_status_t) apr_socket_sen
* APR_EINTR is never returned.
* </PRE>
*/
-APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock,
char *buf, apr_size_t *len);
/**
@@ -672,7 +672,7 @@ APR_DECLARE(apr_status_t) apr_socket_rec
* @remark Will time out if socket has a time out set for it
* @remark direction can be either APR_WAIT_READ or APR_WAIT_WRITE
*/
-APR_DECLARE(apr_status_t) apr_socket_wait(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_wait(apr_socket_t *sock,
apr_wait_type_t direction);
/**
@@ -680,7 +680,7 @@ APR_DECLARE(apr_status_t) apr_socket_wai
* @param sock The socket to set up.
* @param opt The option we would like to configure. One of:
* <PRE>
- * APR_SO_DEBUG -- turn on debugging information
+ * APR_SO_DEBUG -- turn on debugging information
* APR_SO_KEEPALIVE -- keep connections active
* APR_SO_LINGER -- lingers on close if data is present
* APR_SO_NONBLOCK -- Turns blocking on/off for socket
@@ -720,7 +720,7 @@ APR_DECLARE(apr_status_t) apr_socket_tim
* @param sock The socket to query
* @param opt The option we would like to query. One of:
* <PRE>
- * APR_SO_DEBUG -- turn on debugging information
+ * APR_SO_DEBUG -- turn on debugging information
* APR_SO_KEEPALIVE -- keep connections active
* APR_SO_LINGER -- lingers on close if data is present
* APR_SO_NONBLOCK -- Turns blocking on/off for socket
@@ -734,7 +734,7 @@ APR_DECLARE(apr_status_t) apr_socket_tim
* </PRE>
* @param on Socket option returned on the call.
*/
-APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
apr_int32_t opt, apr_int32_t *on);
/**
@@ -742,7 +742,7 @@ APR_DECLARE(apr_status_t) apr_socket_opt
* @param sock The socket to query
* @param t Socket timeout returned from the query.
*/
-APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock,
apr_interval_time_t *t);
/**
@@ -751,7 +751,7 @@ APR_DECLARE(apr_status_t) apr_socket_tim
* @param atmark Is set to true if socket is at the OOB/urgent mark,
* otherwise is set to false.
*/
-APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock,
+APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock,
int *atmark);
/**
@@ -765,15 +765,15 @@ APR_DECLARE(apr_status_t) apr_socket_atm
APR_DECLARE(apr_status_t) apr_socket_addr_get(apr_sockaddr_t **sa,
apr_interface_e which,
apr_socket_t *sock);
-
+
/**
* Return the IP address (in numeric address string format) in
- * an APR socket address. APR will allocate storage for the IP address
+ * an APR socket address. APR will allocate storage for the IP address
* string from the pool of the apr_sockaddr_t.
* @param addr The IP address.
* @param sockaddr The socket address to reference.
*/
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
+APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
apr_sockaddr_t *sockaddr);
/**
@@ -814,13 +814,13 @@ APR_DECLARE(int) apr_sockaddr_is_wildcar
*/
APR_DECLARE(apr_status_t) apr_socket_type_get(apr_socket_t *sock,
int *type);
-
+
/**
* Given an apr_sockaddr_t and a service name, set the port for the service
* @param sockaddr The apr_sockaddr_t that will have its port set
* @param servname The name of the service you wish to use
*/
-APR_DECLARE(apr_status_t) apr_getservbyname(apr_sockaddr_t *sockaddr,
+APR_DECLARE(apr_status_t) apr_getservbyname(apr_sockaddr_t *sockaddr,
const char *servname);
/**
* Build an ip-subnet representation from an IP address and optional netmask or
@@ -830,9 +830,9 @@ APR_DECLARE(apr_status_t) apr_getservbyn
* @param mask_or_numbits The input netmask or number-of-bits string, or NULL
* @param p The pool to allocate from
*/
-APR_DECLARE(apr_status_t) apr_ipsubnet_create(apr_ipsubnet_t **ipsub,
- const char *ipstr,
- const char *mask_or_numbits,
+APR_DECLARE(apr_status_t) apr_ipsubnet_create(apr_ipsubnet_t **ipsub,
+ const char *ipstr,
+ const char *mask_or_numbits,
apr_pool_t *p);
/**
@@ -850,7 +850,7 @@ APR_DECLARE(int) apr_ipsubnet_test(apr_i
* @param sock The socket to put the accept filter on.
* @param name The accept filter
* @param args Any extra args to the accept filter. Passing NULL here removes
- * the accept filter.
+ * the accept filter.
*/
apr_status_t apr_socket_accept_filter(apr_socket_t *sock, const char *name,
const char *args);
@@ -893,9 +893,9 @@ APR_PERMS_SET_IMPLEMENT(socket);
* Join a Multicast Group
* @param sock The socket to join a multicast group
* @param join The address of the multicast group to join
- * @param iface Address of the interface to use. If NULL is passed, the
+ * @param iface Address of the interface to use. If NULL is passed, the
* default multicast interface will be used. (OS Dependent)
- * @param source Source Address to accept transmissions from (non-NULL
+ * @param source Source Address to accept transmissions from (non-NULL
* implies Source-Specific Multicast)
*/
APR_DECLARE(apr_status_t) apr_mcast_join(apr_socket_t *sock,
@@ -908,9 +908,9 @@ APR_DECLARE(apr_status_t) apr_mcast_join
* apr_mcast_join.
* @param sock The socket to leave a multicast group
* @param addr The address of the multicast group to leave
- * @param iface Address of the interface to use. If NULL is passed, the
+ * @param iface Address of the interface to use. If NULL is passed, the
* default multicast interface will be used. (OS Dependent)
- * @param source Source Address to accept transmissions from (non-NULL
+ * @param source Source Address to accept transmissions from (non-NULL
* implies Source-Specific Multicast)
*/
APR_DECLARE(apr_status_t) apr_mcast_leave(apr_socket_t *sock,
@@ -922,7 +922,7 @@ APR_DECLARE(apr_status_t) apr_mcast_leav
* Set the Multicast Time to Live (ttl) for a multicast transmission.
* @param sock The socket to set the multicast ttl
* @param ttl Time to live to Assign. 0-255, default=1
- * @remark If the TTL is 0, packets will only be seen by sockets on
+ * @remark If the TTL is 0, packets will only be seen by sockets on
* the local machine, and only when multicast loopback is enabled.
*/
APR_DECLARE(apr_status_t) apr_mcast_hops(apr_socket_t *sock,
Modified: apr/apr/trunk/include/apr_optional.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_optional.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_optional.h (original)
+++ apr/apr/trunk/include/apr_optional.h Sat Nov 19 16:12:13 2022
@@ -18,7 +18,7 @@
#define APR_OPTIONAL_H
#include "apu.h"
-/**
+/**
* @file apr_optional.h
* @brief APR-UTIL registration of functions exported by modules
*/
@@ -26,7 +26,7 @@
extern "C" {
#endif
-/**
+/**
* @defgroup APR_Util_Opt Optional Functions
* @ingroup APR
*
@@ -52,13 +52,13 @@ typedef ret (APR_OPTIONAL_FN_TYPE(name))
/**
* XXX: This doesn't belong here, then!
- * Private function! DO NOT USE!
+ * Private function! DO NOT USE!
* @internal
*/
typedef void (apr_opt_fn_t)(void);
/** @internal */
-APR_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName,
+APR_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName,
apr_opt_fn_t *pfn);
/**
@@ -73,7 +73,7 @@ APR_DECLARE_NONSTD(void) apr_dynamic_fn_
} while (0)
/** @internal
- * Private function! DO NOT USE!
+ * Private function! DO NOT USE!
*/
APR_DECLARE(apr_opt_fn_t *) apr_dynamic_fn_retrieve(const char *szName);
Modified: apr/apr/trunk/include/apr_optional_hooks.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_optional_hooks.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_optional_hooks.h (original)
+++ apr/apr/trunk/include/apr_optional_hooks.h Sat Nov 19 16:12:13 2022
@@ -27,7 +27,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-/**
+/**
* @defgroup APR_Util_OPT_HOOK Optional Hook Functions
* @ingroup APR_Util_Hook
* @{
Modified: apr/apr/trunk/include/apr_perms_set.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_perms_set.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_perms_set.h (original)
+++ apr/apr/trunk/include/apr_perms_set.h Sat Nov 19 16:12:13 2022
@@ -34,7 +34,7 @@ extern "C" {
/**
* @defgroup apr_perms_set Object permission set functions
- * @ingroup APR
+ * @ingroup APR
* @{
*/
Modified: apr/apr/trunk/include/apr_poll.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_poll.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_poll.h (original)
+++ apr/apr/trunk/include/apr_poll.h Sat Nov 19 16:12:13 2022
@@ -23,9 +23,9 @@
#include "apr.h"
#include "apr_pools.h"
#include "apr_errno.h"
-#include "apr_inherit.h"
-#include "apr_file_io.h"
-#include "apr_network_io.h"
+#include "apr_inherit.h"
+#include "apr_file_io.h"
+#include "apr_network_io.h"
#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
@@ -37,7 +37,7 @@ extern "C" {
/**
* @defgroup apr_poll Poll Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -89,7 +89,7 @@ typedef enum {
} apr_pollset_method_e;
/** Used in apr_pollfd_t to determine what the apr_descriptor is */
-typedef enum {
+typedef enum {
APR_NO_DESC, /**< nothing here */
APR_POLL_SOCKET, /**< descriptor refers to a socket */
APR_POLL_FILE, /**< descriptor refers to a file */
@@ -125,7 +125,7 @@ typedef struct apr_pollset_t apr_pollset
/**
* Set up a pollset object
- * @param pollset The pointer in which to return the newly created object
+ * @param pollset The pointer in which to return the newly created object
* @param size The maximum number of descriptors that this pollset can hold
* @param p The pool from which to allocate the pollset
* @param flags Optional flags to modify the operation of the pollset.
@@ -159,7 +159,7 @@ APR_DECLARE(apr_status_t) apr_pollset_cr
/**
* Set up a pollset object
- * @param pollset The pointer in which to return the newly created object
+ * @param pollset The pointer in which to return the newly created object
* @param size The maximum number of descriptors that this pollset can hold
* @param p The pool from which to allocate the pollset
* @param flags Optional flags to modify the operation of the pollset.
@@ -217,14 +217,14 @@ APR_DECLARE(apr_status_t) apr_pollset_de
* with APR_EINTR. Option (1) is recommended, but option (2) is
* allowed for implementations where option (1) is impossible
* or impractical.
- * @remark If the pollset has been created with APR_POLLSET_NOCOPY, the
+ * @remark If the pollset has been created with APR_POLLSET_NOCOPY, the
* apr_pollfd_t structure referenced by descriptor will not be copied
* and must have a lifetime at least as long as the pollset.
* @remark Do not add the same socket or file descriptor to the same pollset
- * multiple times, even if the requested events differ for the
+ * multiple times, even if the requested events differ for the
* different calls to apr_pollset_add(). If the events of interest
- * for a descriptor change, you must first remove the descriptor
- * from the pollset with apr_pollset_remove(), then add it again
+ * for a descriptor change, you must first remove the descriptor
+ * from the pollset with apr_pollset_remove(), then add it again
* specifying all requested events.
*/
APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
@@ -284,7 +284,7 @@ APR_DECLARE(apr_status_t) apr_pollset_wa
/**
* Poll the descriptors in the poll structure
- * @param aprset The poll structure we will be using.
+ * @param aprset The poll structure we will be using.
* @param numsock The number of descriptors we are polling
* @param nsds The number of descriptors signalled (output parameter)
* @param timeout The amount of time in microseconds to wait. This is a
@@ -292,14 +292,14 @@ APR_DECLARE(apr_status_t) apr_pollset_wa
* function will return before this time. If timeout is
* negative, the function will block until a descriptor is
* signalled or until apr_pollset_wakeup() has been called.
- * @remark The number of descriptors signalled is returned in the third argument.
- * This is a blocking call, and it will not return until either a
- * descriptor has been signalled or the timeout has expired.
+ * @remark The number of descriptors signalled is returned in the third argument.
+ * This is a blocking call, and it will not return until either a
+ * descriptor has been signalled or the timeout has expired.
* @remark The rtnevents field in the apr_pollfd_t array will only be filled-
* in if the return value is APR_SUCCESS.
*/
APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t numsock,
- apr_int32_t *nsds,
+ apr_int32_t *nsds,
apr_interval_time_t timeout);
/**
@@ -319,7 +319,7 @@ typedef struct apr_pollcb_t apr_pollcb_t
/**
* Set up a pollcb object
- * @param pollcb The pointer in which to return the newly created object
+ * @param pollcb The pointer in which to return the newly created object
* @param size The maximum number of descriptors that a single _poll can return.
* @param p The pool from which to allocate the pollcb
* @param flags Optional flags to modify the operation of the pollcb.
@@ -338,7 +338,7 @@ APR_DECLARE(apr_status_t) apr_pollcb_cre
/**
* Set up a pollcb object
- * @param pollcb The pointer in which to return the newly created object
+ * @param pollcb The pointer in which to return the newly created object
* @param size The maximum number of descriptors that a single _poll can return.
* @param p The pool from which to allocate the pollcb
* @param flags Optional flags to modify the operation of the pollcb.
@@ -366,14 +366,14 @@ APR_DECLARE(apr_status_t) apr_pollcb_cre
* @remark If you set client_data in the descriptor, that value will be
* returned in the client_data field whenever this descriptor is
* signalled in apr_pollcb_poll().
- * @remark Unlike the apr_pollset API, the descriptor is not copied, and users
+ * @remark Unlike the apr_pollset API, the descriptor is not copied, and users
* must retain the memory used by descriptor, as the same pointer will
* be returned to them from apr_pollcb_poll.
* @remark Do not add the same socket or file descriptor to the same pollcb
- * multiple times, even if the requested events differ for the
+ * multiple times, even if the requested events differ for the
* different calls to apr_pollcb_add(). If the events of interest
- * for a descriptor change, you must first remove the descriptor
- * from the pollcb with apr_pollcb_remove(), then add it again
+ * for a descriptor change, you must first remove the descriptor
+ * from the pollcb with apr_pollcb_remove(), then add it again
* specifying all requested events.
*/
APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
@@ -391,9 +391,9 @@ APR_DECLARE(apr_status_t) apr_pollcb_rem
apr_pollfd_t *descriptor);
/**
- * Function prototype for pollcb handlers
+ * Function prototype for pollcb handlers
* @param baton Opaque baton passed into apr_pollcb_poll()
- * @param descriptor Contains the notification for an active descriptor.
+ * @param descriptor Contains the notification for an active descriptor.
* The @a rtnevents member describes which events were triggered
* for this descriptor.
* @remark If the pollcb handler does not return APR_SUCCESS, the apr_pollcb_poll()
Modified: apr/apr/trunk/include/apr_pools.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_pools.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_pools.h (original)
+++ apr/apr/trunk/include/apr_pools.h Sat Nov 19 16:12:13 2022
@@ -52,7 +52,7 @@ extern "C" {
/**
* @defgroup apr_pools Memory Pool Functions
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -73,7 +73,7 @@ typedef struct apr_pool_t apr_pool_t;
* becomes:
* APR_DECLARE(apr_pool_t *) apr_file_pool_get(const apr_file_t *thefile);
* </pre>
- * @remark Doxygen unwraps this macro (via doxygen.conf) to provide
+ * @remark Doxygen unwraps this macro (via doxygen.conf) to provide
* actual help for each specific occurrence of apr_foo_pool_get.
* @remark the linkage is specified for APR. It would be possible to expand
* the macros to support other linkages.
@@ -82,7 +82,7 @@ typedef struct apr_pool_t apr_pool_t;
APR_DECLARE(apr_pool_t *) apr_##type##_pool_get \
(const apr_##type##_t *the##type)
-/**
+/**
* Implementation helper macro to provide apr_foo_pool_get()s.
*
* In the implementation, the APR_POOL_IMPLEMENT_ACCESSOR() is used to
@@ -629,7 +629,7 @@ APR_DECLARE(void) apr_pool_pre_cleanup_r
/**
* Remove a previously registered cleanup function.
- *
+ *
* The cleanup most recently registered with @a p having the same values of
* @a data and @a cleanup will be removed.
*
@@ -645,7 +645,7 @@ APR_DECLARE(void) apr_pool_cleanup_kill(
/**
* Replace the child cleanup function of a previously registered cleanup.
- *
+ *
* The cleanup most recently registered with @a p having the same values of
* @a data and @a plain_cleanup will have the registered child cleanup
* function replaced with @a child_cleanup.
@@ -678,7 +678,7 @@ APR_DECLARE(apr_status_t) apr_pool_clean
/**
* An empty cleanup function.
- *
+ *
* Passed to apr_pool_cleanup_register() when no cleanup is required.
*
* @param data The data to cleanup, will not be used by this function.
Modified: apr/apr/trunk/include/apr_portable.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_portable.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_portable.h (original)
+++ apr/apr/trunk/include/apr_portable.h Sat Nov 19 16:12:13 2022
@@ -15,7 +15,7 @@
*/
/* This header file is where you should put ANY platform specific information.
- * This should be the only header file that programs need to include that
+ * This should be the only header file that programs need to include that
* actually has platform dependent code which refers to the .
*/
#ifndef APR_PORTABLE_H
@@ -56,7 +56,7 @@ extern "C" {
/**
* @defgroup apr_portabile Portability Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -68,7 +68,7 @@ typedef SOCKET apr_os_soc
typedef HANDLE apr_os_proc_mutex_t;
typedef HANDLE apr_os_thread_t;
typedef HANDLE apr_os_proc_t;
-typedef DWORD apr_os_threadkey_t;
+typedef DWORD apr_os_threadkey_t;
typedef FILETIME apr_os_imp_time_t;
typedef SYSTEMTIME apr_os_exp_time_t;
typedef HANDLE apr_os_dso_handle_t;
@@ -81,7 +81,7 @@ typedef int apr_os_soc
typedef HMTX apr_os_proc_mutex_t;
typedef TID apr_os_thread_t;
typedef PID apr_os_proc_t;
-typedef PULONG apr_os_threadkey_t;
+typedef PULONG apr_os_threadkey_t;
typedef struct timeval apr_os_imp_time_t;
typedef struct tm apr_os_exp_time_t;
typedef HMODULE apr_os_dso_handle_t;
@@ -115,7 +115,7 @@ typedef int apr_os_soc
typedef NXMutex_t * apr_os_proc_mutex_t;
typedef NXThreadId_t apr_os_thread_t;
typedef long apr_os_proc_t;
-typedef NXKey_t apr_os_threadkey_t;
+typedef NXKey_t apr_os_threadkey_t;
typedef struct timeval apr_os_imp_time_t;
typedef struct tm apr_os_exp_time_t;
typedef void * apr_os_dso_handle_t;
@@ -148,7 +148,7 @@ typedef int apr_os_soc
typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; /**< native process
* mutex
*/
-#if APR_HAS_THREADS && APR_HAVE_PTHREAD_H
+#if APR_HAS_THREADS && APR_HAVE_PTHREAD_H
typedef pthread_t apr_os_thread_t; /**< native thread */
typedef pthread_key_t apr_os_threadkey_t; /**< native thread address
* space */
@@ -209,7 +209,7 @@ typedef struct apr_os_sock_info_t apr_os
};
typedef struct apr_os_global_mutex_t apr_os_global_mutex_t;
-APR_DECLARE(apr_status_t) apr_os_global_mutex_get(apr_os_global_mutex_t *ospmutex,
+APR_DECLARE(apr_status_t) apr_os_global_mutex_get(apr_os_global_mutex_t *ospmutex,
apr_global_mutex_t *pmutex);
#endif
@@ -218,7 +218,7 @@ APR_DECLARE(apr_status_t) apr_os_global_
* convert the file from apr type to os specific type.
* @param thefile The os specific file we are converting to
* @param file The apr file to convert.
- * @remark On Unix, it is only possible to get a file descriptor from
+ * @remark On Unix, it is only possible to get a file descriptor from
* an apr file type.
*/
APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile,
@@ -228,8 +228,8 @@ APR_DECLARE(apr_status_t) apr_os_file_ge
* convert the dir from apr type to os specific type.
* @param thedir The os specific dir we are converting to
* @param dir The apr dir to convert.
- */
-APR_DECLARE(apr_status_t) apr_os_dir_get(apr_os_dir_t **thedir,
+ */
+APR_DECLARE(apr_status_t) apr_os_dir_get(apr_os_dir_t **thedir,
apr_dir_t *dir);
/**
@@ -245,7 +245,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_ge
* @param ospmutex The os specific proc mutex we are converting to.
* @param pmutex The apr proc mutex to convert.
*/
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
+APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
apr_proc_mutex_t *pmutex);
/**
@@ -257,7 +257,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
* @remark Allows for disambiguation for platforms with multiple mechanisms
* available.
*/
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex,
+APR_DECLARE(apr_status_t) apr_os_proc_mutex_get_ex(apr_os_proc_mutex_t *ospmutex,
apr_proc_mutex_t *pmutex,
apr_lockmech_e *mech);
@@ -274,28 +274,28 @@ APR_DECLARE(apr_status_t) apr_os_exp_tim
* @param ostime the native time format
* @param aprtime the time to convert
*/
-APR_DECLARE(apr_status_t) apr_os_imp_time_get(apr_os_imp_time_t **ostime,
+APR_DECLARE(apr_status_t) apr_os_imp_time_get(apr_os_imp_time_t **ostime,
apr_time_t *aprtime);
/**
* convert the shm from apr type to os specific type.
* @param osshm The os specific shm representation
* @param shm The apr shm to convert.
- */
+ */
APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
apr_shm_t *shm);
#if APR_HAS_THREADS || defined(DOXYGEN)
-/**
+/**
* @defgroup apr_os_thread Thread portability Routines
- * @{
+ * @{
*/
/**
* convert the thread to os specific type from apr type.
* @param thethd The apr thread to convert
* @param thd The os specific thread we are converting to
*/
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd,
+APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd,
apr_thread_t *thd);
/**
@@ -335,8 +335,8 @@ APR_DECLARE(apr_os_thread_t) apr_os_thre
* @param tid1 1st Thread ID to compare
* @param tid2 2nd Thread ID to compare
* @return non-zero if the two threads are equal, zero otherwise
- */
-APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1,
+ */
+APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1,
apr_os_thread_t tid2);
/** @} */
@@ -353,7 +353,7 @@ APR_DECLARE(int) apr_os_thread_equal(apr
*/
APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file,
apr_os_file_t *thefile,
- apr_int32_t flags, apr_pool_t *cont);
+ apr_int32_t flags, apr_pool_t *cont);
/**
* convert the file from os specific type to apr type.
@@ -390,12 +390,12 @@ APR_DECLARE(apr_status_t) apr_os_pipe_pu
*/
APR_DECLARE(apr_status_t) apr_os_dir_put(apr_dir_t **dir,
apr_os_dir_t *thedir,
- apr_pool_t *cont);
+ apr_pool_t *cont);
/**
* Convert a socket from the os specific type to the APR type. If
* sock points to NULL, a socket will be created from the pool
- * provided. If **sock does not point to NULL, the structure pointed
+ * provided. If **sock does not point to NULL, the structure pointed
* to by sock will be reused and updated with the given socket.
* @param sock The pool to use.
* @param thesock The socket to convert to.
@@ -403,8 +403,8 @@ APR_DECLARE(apr_status_t) apr_os_dir_put
* @remark If it is a true socket, it is best to call apr_os_sock_make()
* and provide APR with more information about the socket.
*/
-APR_DECLARE(apr_status_t) apr_os_sock_put(apr_socket_t **sock,
- apr_os_sock_t *thesock,
+APR_DECLARE(apr_status_t) apr_os_sock_put(apr_socket_t **sock,
+ apr_os_sock_t *thesock,
apr_pool_t *cont);
/**
@@ -429,7 +429,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_ma
*/
APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
apr_os_proc_mutex_t *ospmutex,
- apr_pool_t *cont);
+ apr_pool_t *cont);
/**
* Convert the proc mutex from os specific type to apr type, using the
@@ -447,7 +447,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
apr_os_proc_mutex_t *ospmutex,
apr_lockmech_e mech,
int register_cleanup,
- apr_pool_t *cont);
+ apr_pool_t *cont);
/**
* Put the imploded time in the APR format.
@@ -457,7 +457,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
*/
APR_DECLARE(apr_status_t) apr_os_imp_time_put(apr_time_t *aprtime,
apr_os_imp_time_t **ostime,
- apr_pool_t *cont);
+ apr_pool_t *cont);
/**
* Put the exploded time in the APR format.
@@ -467,7 +467,7 @@ APR_DECLARE(apr_status_t) apr_os_imp_tim
*/
APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_time_exp_t *aprtime,
apr_os_exp_time_t **ostime,
- apr_pool_t *cont);
+ apr_pool_t *cont);
/**
* convert the shared memory from os specific type to apr type.
@@ -480,11 +480,11 @@ APR_DECLARE(apr_status_t) apr_os_exp_tim
*/
APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **shm,
apr_os_shm_t *osshm,
- apr_pool_t *cont);
+ apr_pool_t *cont);
#if APR_HAS_DSO || defined(DOXYGEN)
-/**
+/**
* @defgroup apr_os_dso DSO (Dynamic Loading) Portability Routines
* @{
*/
Modified: apr/apr/trunk/include/apr_proc_mutex.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_proc_mutex.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_proc_mutex.h (original)
+++ apr/apr/trunk/include/apr_proc_mutex.h Sat Nov 19 16:12:13 2022
@@ -34,11 +34,11 @@ extern "C" {
/**
* @defgroup apr_proc_mutex Process Locking Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
-/**
+/**
* Enumerated potential types for APR process locking methods
* @warning Check APR_HAS_foo_SERIALIZE defines to see if the platform supports
* APR_LOCK_foo. Only APR_LOCK_DEFAULT is portable.
@@ -89,7 +89,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex
* @param mutex The newly re-opened mutex structure.
* @param fname A file name to use if the mutex mechanism requires one. This
* argument should always be provided. The mutex code itself will
- * determine if it should be used. This filename should be the
+ * determine if it should be used. This filename should be the
* same one that was passed to apr_proc_mutex_create().
* @param pool The pool to operate on.
* @remark This function must be called to maintain portability, even
Modified: apr/apr/trunk/include/apr_queue.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_queue.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_queue.h (original)
+++ apr/apr/trunk/include/apr_queue.h Sat Nov 19 16:12:13 2022
@@ -47,14 +47,14 @@ extern "C" {
*/
typedef struct apr_queue_t apr_queue_t;
-/**
+/**
* create a FIFO queue
* @param queue The new queue
* @param queue_capacity maximum size of the queue
* @param a pool to allocate queue from
*/
-APR_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **queue,
- unsigned int queue_capacity,
+APR_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **queue,
+ unsigned int queue_capacity,
apr_pool_t *a);
/**
Modified: apr/apr/trunk/include/apr_redis.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_redis.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_redis.h (original)
+++ apr/apr/trunk/include/apr_redis.h Sat Nov 19 16:12:13 2022
@@ -256,7 +256,7 @@ APR_DECLARE(apr_status_t) apr_redis_crea
* @param baton location of the allocated value
* @param len length of data at baton
* @param flags any flags set by the client for this key
- * @return
+ * @return
*/
APR_DECLARE(apr_status_t) apr_redis_getp(apr_redis_t *rc,
apr_pool_t *p,
Modified: apr/apr/trunk/include/apr_reslist.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_reslist.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_reslist.h (original)
+++ apr/apr/trunk/include/apr_reslist.h Sat Nov 19 16:12:13 2022
@@ -17,7 +17,7 @@
#ifndef APR_RESLIST_H
#define APR_RESLIST_H
-/**
+/**
* @file apr_reslist.h
* @brief APR-UTIL Resource List Routines
*/
Modified: apr/apr/trunk/include/apr_ring.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_ring.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_ring.h (original)
+++ apr/apr/trunk/include/apr_ring.h Sat Nov 19 16:12:13 2022
@@ -39,7 +39,7 @@
/**
* @defgroup apr_ring Ring Macro Implementations
- * @ingroup APR
+ * @ingroup APR
* A ring is a kind of doubly-linked list that can be manipulated
* without knowing where its head is.
* @{
@@ -512,6 +512,6 @@
#define APR_RING_CHECK_ELEM_CONSISTENCY(ep, elem, link)
#endif
-/** @} */
+/** @} */
#endif /* !APR_RING_H */
Modified: apr/apr/trunk/include/apr_rmm.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_rmm.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_rmm.h (original)
+++ apr/apr/trunk/include/apr_rmm.h Sat Nov 19 16:12:13 2022
@@ -16,7 +16,7 @@
#ifndef APR_RMM_H
#define APR_RMM_H
-/**
+/**
* @file apr_rmm.h
* @brief APR-UTIL Relocatable Memory Management Routines
*/
@@ -54,7 +54,7 @@ typedef apr_size_t apr_rmm_off_t;
* (for instance using APR_ALIGN_DEFAULT).
*/
APR_DECLARE(apr_status_t) apr_rmm_init(apr_rmm_t **rmm, apr_anylock_t *lock,
- void *membuf, apr_size_t memsize,
+ void *membuf, apr_size_t memsize,
apr_pool_t *cont);
/**
Modified: apr/apr/trunk/include/apr_sdbm.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_sdbm.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_sdbm.h (original)
+++ apr/apr/trunk/include/apr_sdbm.h Sat Nov 19 16:12:13 2022
@@ -28,7 +28,7 @@
#include "apr_errno.h"
#include "apr_file_io.h" /* for apr_fileperms_t */
-/**
+/**
* @file apr_sdbm.h
* @brief apr-util SDBM library
*/
@@ -81,11 +81,11 @@ typedef struct {
* </PRE>
* @param perms Permissions to apply to if created
* @param p The pool to use when creating the sdbm
- * @remark The sdbm name is not a true file name, as sdbm appends suffixes
+ * @remark The sdbm name is not a true file name, as sdbm appends suffixes
* for seperate data and index files.
*/
-APR_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *name,
- apr_int32_t mode,
+APR_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *name,
+ apr_int32_t mode,
apr_fileperms_t perms, apr_pool_t *p);
/**
@@ -103,8 +103,8 @@ APR_DECLARE(apr_status_t) apr_sdbm_close
* APR_FLOCK_EXCLUSIVE
* </PRE>
* @remark Calls to apr_sdbm_lock may be nested. All apr_sdbm functions
- * perform implicit locking. Since an APR_FLOCK_SHARED lock cannot be
- * portably promoted to an APR_FLOCK_EXCLUSIVE lock, apr_sdbm_store and
+ * perform implicit locking. Since an APR_FLOCK_SHARED lock cannot be
+ * portably promoted to an APR_FLOCK_EXCLUSIVE lock, apr_sdbm_store and
* apr_sdbm_delete calls will fail if an APR_FLOCK_SHARED lock is held.
* The apr_sdbm_lock call requires the database to be opened with the
* APR_FOPEN_SHARELOCK mode value.
@@ -119,17 +119,17 @@ APR_DECLARE(apr_status_t) apr_sdbm_unloc
/**
* Fetch an sdbm record value by key
- * @param db The database
+ * @param db The database
* @param value The value datum retrieved for this record
* @param key The key datum to find this record
*/
-APR_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db,
- apr_sdbm_datum_t *value,
+APR_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db,
+ apr_sdbm_datum_t *value,
apr_sdbm_datum_t key);
/**
* Store an sdbm record value by key
- * @param db The database
+ * @param db The database
* @param key The key datum to store this record by
* @param value The value datum to store in this record
* @param opt The method used to store the record
@@ -143,16 +143,16 @@ APR_DECLARE(apr_status_t) apr_sdbm_store
/**
* Delete an sdbm record value by key
- * @param db The database
+ * @param db The database
* @param key The key datum of the record to delete
* @remark It is not an error to delete a non-existent record.
*/
-APR_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db,
+APR_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db,
const apr_sdbm_datum_t key);
/**
* Retrieve the first record key from a dbm
- * @param db The database
+ * @param db The database
* @param key The key datum of the first record
* @remark The keys returned are not ordered. To traverse the list of keys
* for an sdbm opened with APR_FOPEN_SHARELOCK, the caller must use apr_sdbm_lock
@@ -163,7 +163,7 @@ APR_DECLARE(apr_status_t) apr_sdbm_first
/**
* Retrieve the next record key from an sdbm
- * @param db The database
+ * @param db The database
* @param key The key datum of the next record
*/
APR_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, apr_sdbm_datum_t *key);
Modified: apr/apr/trunk/include/apr_sha1.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_sha1.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_sha1.h (original)
+++ apr/apr/trunk/include/apr_sha1.h Sat Nov 19 16:12:13 2022
@@ -50,7 +50,7 @@ extern "C" {
/** @see apr_sha1_ctx_t */
typedef struct apr_sha1_ctx_t apr_sha1_ctx_t;
-/**
+/**
* SHA1 context structure
*/
struct apr_sha1_ctx_t {
Modified: apr/apr/trunk/include/apr_shm.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_shm.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_shm.h (original)
+++ apr/apr/trunk/include/apr_shm.h Sat Nov 19 16:12:13 2022
@@ -33,7 +33,7 @@ extern "C" {
/**
* @defgroup apr_shm Shared Memory Routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -65,7 +65,7 @@ typedef struct apr_shm_t apr_shm_t;
* implementation to request a slightly greater segment length
* from the subsystem. In all cases, the apr_shm_baseaddr_get()
* function will return the first usable byte of memory.
- *
+ *
*/
APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
apr_size_t reqsize,
@@ -110,7 +110,7 @@ APR_DECLARE(apr_status_t) apr_shm_create
* implementation to request a slightly greater segment length
* from the subsystem. In all cases, the apr_shm_baseaddr_get()
* function will return the first usable byte of memory.
- *
+ *
*/
APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
apr_size_t reqsize,
@@ -220,7 +220,7 @@ APR_PERMS_SET_IMPLEMENT(shm);
*/
APR_POOL_DECLARE_ACCESSOR(shm);
-/** @} */
+/** @} */
#ifdef __cplusplus
}
Modified: apr/apr/trunk/include/apr_skiplist.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_skiplist.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_skiplist.h (original)
+++ apr/apr/trunk/include/apr_skiplist.h Sat Nov 19 16:12:13 2022
@@ -38,7 +38,7 @@ extern "C" {
*/
/**
- * apr_skiplist_compare is the function type that must be implemented
+ * apr_skiplist_compare is the function type that must be implemented
* per object type that is used in a skip list for comparisons to maintain
* order
* */
@@ -55,7 +55,7 @@ struct apr_skiplist;
/** Opaque structure used to represent the skip list */
typedef struct apr_skiplist apr_skiplist;
-/**
+/**
* Opaque structure used to represent abstract nodes in the skip list
* (an abstraction above the raw elements which are collected in the
* skip list).
Modified: apr/apr/trunk/include/apr_strings.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_strings.h?rev=1905407&r1=1905406&r2=1905407&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_strings.h (original)
+++ apr/apr/trunk/include/apr_strings.h Sat Nov 19 16:12:13 2022
@@ -61,7 +61,7 @@ extern "C" {
/**
* @defgroup apr_strings String routines
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -76,7 +76,7 @@ extern "C" {
APR_DECLARE(int) apr_strnatcmp(char const *a, char const *b);
/**
- * Do a natural order comparison of two strings ignoring the case of the
+ * Do a natural order comparison of two strings ignoring the case of the
* strings.
* @param a The first string to compare
* @param b The second string to compare
@@ -113,7 +113,7 @@ APR_DECLARE(char *) apr_pstrmemdup(apr_p
;
/**
- * Duplicate at most n characters of a string into memory allocated
+ * Duplicate at most n characters of a string into memory allocated
* out of a pool; the new string will be NUL-terminated
* @param p The pool to allocate out of
* @param s The string to duplicate
@@ -162,7 +162,7 @@ APR_DECLARE(char *) apr_pstrcatv(apr_poo
apr_size_t nvec, apr_size_t *nbytes);
/**
- * printf-style style printing routine. The data is output to a string
+ * printf-style style printing routine. The data is output to a string
* allocated from a pool
* @param p The pool to allocate out of
* @param fmt The format of the string
@@ -172,7 +172,7 @@ APR_DECLARE(char *) apr_pstrcatv(apr_poo
APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap);
/**
- * printf-style style printing routine. The data is output to a string
+ * printf-style style printing routine. The data is output to a string
* allocated from a pool
* @param p The pool to allocate out of
* @param fmt The format of the string
@@ -207,10 +207,10 @@ APR_DECLARE(apr_status_t) apr_memzero_ex
* <PRE>
* Note the differences between this function and strncpy():
* 1) strncpy() doesn't always NUL terminate; apr_cpystrn() does.
- * 2) strncpy() pads the destination string with NULs, which is often
+ * 2) strncpy() pads the destination string with NULs, which is often
* unnecessary; apr_cpystrn() does not.
* 3) strncpy() returns a pointer to the beginning of the dst string;
- * apr_cpystrn() returns a pointer to the NUL terminator of dst,
+ * apr_cpystrn() returns a pointer to the NUL terminator of dst,
* to allow a check for truncation.
* </PRE>
*/
@@ -227,7 +227,7 @@ APR_DECLARE(char *) apr_cpystrn(char *ds
APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src);
/**
- * Convert the arguments to a program from one string to an array of
+ * Convert the arguments to a program from one string to an array of
* strings terminated by a NULL pointer
* @param arg_str The arguments to convert
* @param argv_out Output location. This is a pointer to an array of strings.
@@ -238,7 +238,7 @@ APR_DECLARE(apr_status_t) apr_tokenize_t
apr_pool_t *token_context);
/**
- * Split a string into separate null-terminated tokens. The tokens are
+ * Split a string into separate null-terminated tokens. The tokens are
* delimited in the string by one or more characters from the sep
* argument.
* @param str The string to separate; this should be specified on the
@@ -342,7 +342,7 @@ APR_DECLARE(char *) apr_off_t_toa(apr_po
* @bug *end breaks type safety; where *buf is const, *end needs to be
* declared as const in APR 2.0
*/
-APR_DECLARE(apr_status_t) apr_strtoff(apr_off_t *offset, const char *buf,
+APR_DECLARE(apr_status_t) apr_strtoff(apr_off_t *offset, const char *buf,
char **end, int base);
/**