Cleanup effort in prep for GA push:

Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68

include/ap_config.h

@@ -25,8 +25,8 @@
 #include "ap_hooks.h"
 
 /* Although this file doesn't declare any hooks, declare the exports group here */
-/** 
- * @defgroup exports Apache exports 
+/**
+ * @defgroup exports Apache exports
  * @ingroup  APACHE_CORE
  */
 
@@ -40,8 +40,8 @@
  * @see AP_DECLARE_EXPORT
  *
  * AP_DECLARE_STATIC and AP_DECLARE_EXPORT are left undefined when
- * including Apache's Core headers, to import and link the symbols from the 
- * dynamic Apache Core library and assure appropriate indirection and calling 
+ * including Apache's Core headers, to import and link the symbols from the
+ * dynamic Apache Core library and assure appropriate indirection and calling
  * conventions at compile time.
  */
 # define AP_DECLARE_STATIC
@@ -67,7 +67,7 @@
 #define AP_DECLARE(type)            type
 
 /**
- * Apache Core dso variable argument and hook functions are declared with 
+ * Apache Core dso variable argument and hook functions are declared with
  * AP_DECLARE_NONSTD(), as they must use the C language calling convention.
  * @see AP_DECLARE
  * @code
@@ -106,7 +106,7 @@
 /**
  * Declare a dso module's exported module structure as AP_MODULE_DECLARE_DATA.
  *
- * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * Unless AP_MODULE_DECLARE_STATIC is defined at compile time, symbols
  * declared with AP_MODULE_DECLARE_DATA are always exported.
  * @code
  * module AP_MODULE_DECLARE_DATA mod_tag
@@ -124,7 +124,7 @@
  * AP_MODULE_DECLARE_EXPORT is a no-op.  Unless contradicted by the
  * AP_MODULE_DECLARE_STATIC compile-time symbol, it is assumed and defined.
  *
- * The old SHARED_MODULE compile-time symbol is now the default behavior, 
+ * The old SHARED_MODULE compile-time symbol is now the default behavior,
  * so it is no longer referenced anywhere with Apache 2.0.
  */
 #define AP_MODULE_DECLARE_EXPORT

include/ap_hooks.h

@@ -23,8 +23,8 @@
 #define AP_HOOKS_H
 
 /* Although this file doesn't declare any hooks, declare the hook group here */
-/** 
- * @defgroup hooks Apache Hooks 
+/**
+ * @defgroup hooks Apache Hooks
  * @ingroup  APACHE_CORE
  */
 
@@ -50,8 +50,8 @@
  * @see AP_DECLARE_EXPORT
  *
  * AP_DECLARE_STATIC and AP_DECLARE_EXPORT are left undefined when
- * including Apache's Core headers, to import and link the symbols from the 
- * dynamic Apache Core library and assure appropriate indirection and calling 
+ * including Apache's Core headers, to import and link the symbols from the
+ * dynamic Apache Core library and assure appropriate indirection and calling
  * conventions at compile time.
  */
 # define AP_DECLARE_STATIC
@@ -119,8 +119,8 @@
                                             args_use,ok,decline)
 
 /**
- * Implement a hook that runs until a function returns something other than 
- * decline. If all functions return decline, the hook runner returns decline. 
+ * Implement a hook that runs until a function returns something other than
+ * decline. If all functions return decline, the hook runner returns decline.
  * The implementation is called ap_run_<i>name</i>.
  *
  * @param ret The return type of the hook (and the hook runner)

include/ap_listen.h

@@ -39,7 +39,7 @@ typedef struct ap_listen_rec ap_listen_rec;
 typedef apr_status_t (*accept_function)(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans);
 
 /**
- * @brief Apache's listeners record.  
+ * @brief Apache's listeners record.
  *
  * These are used in the Multi-Processing Modules
  * to setup all of the sockets for the MPM to listen to and accept on.
@@ -50,7 +50,7 @@ struct ap_listen_rec {
      */
     ap_listen_rec *next;
     /**
-     * The actual socket 
+     * The actual socket
      */
     apr_socket_t *sd;
     /**
@@ -62,7 +62,7 @@ struct ap_listen_rec {
      */
     accept_function accept_func;
     /**
-     * Is this socket currently active 
+     * Is this socket currently active
      */
     int active;
     /**
@@ -88,7 +88,7 @@ AP_DECLARE(void) ap_listen_pre_config(void);
  * sockets.  This executes the listen and bind on the sockets.
  * @param s The global server_rec
  * @return The number of open sockets.
- */ 
+ */
 AP_DECLARE(int) ap_setup_listeners(server_rec *s);
 
 /**
@@ -107,9 +107,9 @@ AP_DECLARE_NONSTD(int) ap_close_selected_listeners(ap_slave_t *);
  * should not ever be called by external modules.  ALL MPMs should include
  * LISTEN_COMMANDS in their command_rec table so that these functions are
  * called.
- */ 
+ */
 AP_DECLARE_NONSTD(const char *) ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg);
-AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy, 
+AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
                                                 int argc, char *const argv[]);
 AP_DECLARE_NONSTD(const char *) ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
 				    const char *arg);

include/ap_mpm.h

@@ -44,7 +44,7 @@ extern "C" {
 
     The MPM may or may not be multithreaded.  In the event that it is
     multithreaded, at any instant it guarantees a 1:1 mapping of threads
-    ap_process_connection invocations.  
+    ap_process_connection invocations.
 
     Note: In the future it will be possible for ap_process_connection
     to return to the MPM prior to finishing the entire connection; and
@@ -95,22 +95,22 @@ AP_DECLARE_HOOK(int, mpm, (apr_pool_t *pconf, apr_pool_t *plog, server_rec *serv
  * Spawn a process with privileges that another module has requested
  * @param r The request_rec of the current request
  * @param newproc The resulting process handle.
- * @param progname The program to run 
- * @param args the arguments to pass to the new program.  The first 
+ * @param progname The program to run
+ * @param args the arguments to pass to the new program.  The first
  *                   one should be the program name.
- * @param env The new environment apr_table_t for the new process.  This 
+ * @param env The new environment apr_table_t for the new process.  This
  *            should be a list of NULL-terminated strings.
  * @param attr the procattr we should use to determine how to create the new
  *         process
- * @param p The pool to use. 
+ * @param p The pool to use.
  */
 AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
     const request_rec *r,
-    apr_proc_t *newproc, 
+    apr_proc_t *newproc,
     const char *progname,
-    const char * const *args, 
+    const char * const *args,
     const char * const *env,
-    apr_procattr_t *attr, 
+    apr_procattr_t *attr,
     apr_pool_t *p);
 
 /* Subtypes/Values for AP_MPMQ_IS_THREADED and AP_MPMQ_IS_FORKED        */

include/ap_regex.h

@@ -119,7 +119,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *preg, const char *regex, int cflags);
  * @param eflags Bitwise OR of AP_REG_* flags (NOTBOL and NOTEOL supported,
  *                                             other flags are ignored)
  * @return 0 for successful match, \p AP_REG_NOMATCH otherwise
- */ 
+ */
 AP_DECLARE(int) ap_regexec(const ap_regex_t *preg, const char *string,
                            apr_size_t nmatch, ap_regmatch_t *pmatch, int eflags);
 
@@ -146,7 +146,7 @@ AP_DECLARE(int) ap_regexec_len(const ap_regex_t *preg, const char *buff,
  * @param errbuf A buffer to store the error in
  * @param errbuf_size The size of the buffer
  */
-AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg, 
+AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg,
                                    char *errbuf, apr_size_t errbuf_size);
 
 /** Destroy a pre-compiled regex.

include/ap_regkey.h

@@ -34,7 +34,7 @@ extern "C" {
 
 typedef struct ap_regkey_t ap_regkey_t;
 
-/* Used to recover AP_REGKEY_* constants 
+/* Used to recover AP_REGKEY_* constants
  */
 AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
 
@@ -64,8 +64,8 @@ AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
  *           AP_REGKEY_CURRENT_USER
  *           AP_REGKEY_LOCAL_MACHINE
  *           AP_REGKEY_USERS
- *           AP_REGKEY_PERFORMANCE_DATA 
- *           AP_REGKEY_DYN_DATA 
+ *           AP_REGKEY_PERFORMANCE_DATA
+ *           AP_REGKEY_DYN_DATA
  * </PRE>
  * @param keyname The path of the key relative to the parent key
  * @param flags Or'ed value of:
@@ -77,10 +77,10 @@ AP_DECLARE(const ap_regkey_t *) ap_regkey_const(int i);
  * </PRE>
  * @param pool The pool in which newkey is allocated
  */
-AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey, 
+AP_DECLARE(apr_status_t) ap_regkey_open(ap_regkey_t **newkey,
                                         const ap_regkey_t *parentkey,
                                         const char *keyname,
-                                        apr_int32_t flags, 
+                                        apr_int32_t flags,
                                         apr_pool_t *pool);
 
 /**
@@ -98,32 +98,32 @@ AP_DECLARE(apr_status_t) ap_regkey_close(ap_regkey_t *key);
  *           AP_REGKEY_CURRENT_USER
  *           AP_REGKEY_LOCAL_MACHINE
  *           AP_REGKEY_USERS
- *           AP_REGKEY_PERFORMANCE_DATA 
- *           AP_REGKEY_DYN_DATA 
+ *           AP_REGKEY_PERFORMANCE_DATA
+ *           AP_REGKEY_DYN_DATA
  * </PRE>
  * @param keyname The path of the key relative to the parent key
  * @param pool The pool used for temp allocations
  * @remark ap_regkey_remove() is not recursive, although it removes
- * all values within the given keyname, it will not remove a key 
+ * all values within the given keyname, it will not remove a key
  * containing subkeys.
  */
-AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent, 
+AP_DECLARE(apr_status_t) ap_regkey_remove(const ap_regkey_t *parent,
                                           const char *keyname,
                                           apr_pool_t *pool);
 
 /**
  * Win32 Only: Retrieve a registry value string from an open key.
- * @param result The string value retrieved 
+ * @param result The string value retrieved
  * @param key The registry key to retrieve the value from
  * @param valuename The named value to retrieve (pass "" for the default)
  * @param pool The pool used to store the result
  * @remark There is no toggle to prevent environment variable expansion
  * if the registry value is set with AP_REG_EXPAND (REG_EXPAND_SZ), such
  * expansions are always performed.
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result, 
-                                             ap_regkey_t *key, 
-                                             const char *valuename, 
+AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
+                                             ap_regkey_t *key,
+                                             const char *valuename,
                                              apr_pool_t *pool);
 
 /**
@@ -135,26 +135,26 @@ AP_DECLARE(apr_status_t) ap_regkey_value_get(char **result,
  * values will find all %foo% variables expanded from the environment.
  * @param pool The pool used for temp allocations
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key, 
-                                             const char *valuename, 
-                                             const char *value, 
+AP_DECLARE(apr_status_t) ap_regkey_value_set(ap_regkey_t *key,
+                                             const char *valuename,
+                                             const char *value,
                                              apr_int32_t flags,
                                              apr_pool_t *pool);
 
 /**
  * Win32 Only: Retrieve a raw byte value from an open key.
- * @param result The raw bytes value retrieved 
- * @param resultsize Pointer to a variable to store the number raw bytes retrieved 
+ * @param result The raw bytes value retrieved
+ * @param resultsize Pointer to a variable to store the number raw bytes retrieved
  * @param resulttype Pointer to a variable to store the registry type of the value retrieved
  * @param key The registry key to retrieve the value from
  * @param valuename The named value to retrieve (pass "" for the default)
  * @param pool The pool used to store the result
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result, 
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
                                                  apr_size_t *resultsize,
                                                  apr_int32_t *resulttype,
-                                                 ap_regkey_t *key, 
-                                                 const char *valuename, 
+                                                 ap_regkey_t *key,
+                                                 const char *valuename,
                                                  apr_pool_t *pool);
 
 /**
@@ -163,13 +163,13 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_get(void **result,
  * @param valuename The named value to store (pass "" for the default)
  * @param value The bytes to store for the named value
  * @param valuesize The number of bytes for value
- * @param valuetype The 
+ * @param valuetype The
  * values will find all %foo% variables expanded from the environment.
  * @param pool The pool used for temp allocations
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key, 
-                                                 const char *valuename, 
-                                                 const void *value, 
+AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
+                                                 const char *valuename,
+                                                 const void *value,
                                                  apr_size_t  valuesize,
                                                  apr_int32_t valuetype,
                                                  apr_pool_t *pool);
@@ -181,9 +181,9 @@ AP_DECLARE(apr_status_t) ap_regkey_value_raw_set(ap_regkey_t *key,
  * @param valuename The named value to retrieve (pass "" for the default)
  * @param pool The pool used to store the result
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result, 
+AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
                                                    ap_regkey_t *key,
-                                                   const char *valuename, 
+                                                   const char *valuename,
                                                    apr_pool_t *pool);
 
 /**
@@ -194,9 +194,9 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_get(apr_array_header_t **result,
  * @param elts The number of elements in the elts string array
  * @param pool The pool used for temp allocations
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key, 
-                                                   const char *valuename, 
-                                                   int nelts, 
+AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
+                                                   const char *valuename,
+                                                   int nelts,
                                                    const char * const * elts,
                                                    apr_pool_t *pool);
 
@@ -206,7 +206,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_array_set(ap_regkey_t *key,
  * @param valuename The named value to remove (pass "" for the default)
  * @param pool The pool used for temp allocations
  */
-AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key, 
+AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
                                                 const char *valuename,
                                                 apr_pool_t *pool);
 

include/ap_release.h

@@ -34,10 +34,10 @@
  * The tokens are listed in order of their significance for identifying the
  * application.
  *
- * "Product tokens should be short and to the point -- use of them for 
+ * "Product tokens should be short and to the point -- use of them for
  * advertizing or other non-essential information is explicitly forbidden."
  *
- * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
+ * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
  */
 #define AP_SERVER_BASEVENDOR "Apache Software Foundation"
 #define AP_SERVER_BASEPROJECT "Apache HTTP Server"
@@ -48,7 +48,7 @@
 #define AP_SERVER_PATCHLEVEL_NUMBER   15
 #define AP_SERVER_DEVBUILD_BOOLEAN    1
 
-/* Synchronize the above with docs/manual/style/version.ent */ 
+/* Synchronize the above with docs/manual/style/version.ent */
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"

include/ap_slotmem.h

@@ -148,7 +148,7 @@ struct ap_slotmem_provider_t {
     /**
      * return number of free (not used) slots allocated for this entry.
      * Valid for slots which are AP_SLOTMEM_TYPE_PREGRAB as well as
-     * any which use get/release. 
+     * any which use get/release.
      * @param s ap_slotmem_instance_t to use.
      * @return number of slots
      */