From 7ac78e387b5228531f2ebb37eac8590ac592f7f7 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 16 Nov 2005 16:31:25 +0000 Subject: [PATCH] No functional change: remove "internal" tab spacing/formatting. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68 --- modules/arch/netware/mod_nw_ssl.c | 12 +- modules/cache/cache_hash.c | 12 +- modules/cache/mod_disk_cache.c | 4 +- modules/cache/mod_file_cache.c | 2 +- modules/dav/fs/lock.c | 72 +++++----- modules/echo/mod_echo.c | 12 +- modules/generators/mod_asis.c | 12 +- modules/generators/mod_suexec.c | 2 +- modules/http/chunk_filter.c | 2 +- modules/http/http_core.c | 14 +- modules/http/http_etag.c | 2 +- modules/ldap/util_ldap.c | 20 +-- modules/mappers/mod_actions.c | 12 +- modules/mappers/mod_imagemap.c | 24 ++-- modules/mappers/mod_so.c | 12 +- modules/mappers/mod_speling.c | 10 +- modules/mappers/mod_vhost_alias.c | 10 +- modules/metadata/mod_expires.c | 2 +- modules/metadata/mod_mime_magic.c | 190 +++++++++++++-------------- modules/metadata/mod_setenvif.c | 8 +- modules/metadata/mod_usertrack.c | 2 +- modules/ssl/ssl_expr_parse.c | 12 +- modules/ssl/ssl_expr_scan.c | 46 +++---- server/config.c | 4 +- server/mpm/beos/beos.c | 24 ++-- server/mpm/mpmt_os2/mpmt_os2.c | 18 +-- server/mpm/mpmt_os2/mpmt_os2_child.c | 2 +- server/mpm/netware/mpm_netware.c | 10 +- server/mpm/winnt/child.c | 4 +- server/mpm/winnt/mpm_winnt.c | 22 ++-- test/cls.c | 2 +- test/test_limits.c | 2 +- test/time-sem.c | 10 +- 33 files changed, 296 insertions(+), 296 deletions(-) diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c index db0d6db302f..0d45c3a6d96 100644 --- a/modules/arch/netware/mod_nw_ssl.c +++ b/modules/arch/netware/mod_nw_ssl.c @@ -94,9 +94,9 @@ typedef struct secsocket_data secsocket_data; struct seclisten_rec { seclisten_rec *next; - struct sockaddr_in local_addr; /* local IP address and port */ + struct sockaddr_in local_addr; /* local IP address and port */ int fd; - int used; /* Only used during restart */ + int used; /* Only used during restart */ char key[MAX_KEY]; int mutual; char *addr; @@ -346,9 +346,9 @@ int convert_secure_socket(conn_rec *c, apr_socket_t *csd) sWS2Opts.options = &sNWTLSOpts; if (numcerts) { - sNWTLSOpts.walletProvider = WAL_PROV_DER; //the wallet provider defined in wdefs.h - sNWTLSOpts.TrustedRootList = certarray; //array of certs in UNICODE format - sNWTLSOpts.numElementsInTRList = numcerts; //number of certs in TRList + sNWTLSOpts.walletProvider = WAL_PROV_DER; //the wallet provider defined in wdefs.h + sNWTLSOpts.TrustedRootList = certarray; //array of certs in UNICODE format + sNWTLSOpts.numElementsInTRList = numcerts; //number of certs in TRList } else { /* setup the socket for SSL */ @@ -356,7 +356,7 @@ int convert_secure_socket(conn_rec *c, apr_socket_t *csd) sWS2Opts.wallet = keyFileName; /* no client certificate */ sWS2Opts.walletlen = unilen(keyFileName); - sNWTLSOpts.walletProvider = WAL_PROV_KMO; //the wallet provider defined in wdefs.h + sNWTLSOpts.walletProvider = WAL_PROV_KMO; //the wallet provider defined in wdefs.h } /* make the IOCTL call */ diff --git a/modules/cache/cache_hash.c b/modules/cache/cache_hash.c index efbfa40d267..2953138a2c2 100644 --- a/modules/cache/cache_hash.c +++ b/modules/cache/cache_hash.c @@ -39,11 +39,11 @@ typedef struct cache_hash_entry_t cache_hash_entry_t; struct cache_hash_entry_t { - cache_hash_entry_t *next; - unsigned int hash; - const void *key; - apr_ssize_t klen; - const void *val; + cache_hash_entry_t *next; + unsigned int hash; + const void *key; + apr_ssize_t klen; + const void *val; }; /* @@ -54,7 +54,7 @@ struct cache_hash_entry_t { * cache_hash_next(). */ struct cache_hash_index_t { - cache_hash_t *ht; + cache_hash_t *ht; cache_hash_entry_t *this, *next; int index; }; diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c index 33c32d548cd..1fa9bc1472e 100644 --- a/modules/cache/mod_disk_cache.c +++ b/modules/cache/mod_disk_cache.c @@ -1161,6 +1161,6 @@ module AP_MODULE_DECLARE_DATA disk_cache_module = { NULL, /* merge per-directory config structures */ create_config, /* create per-server config structure */ NULL, /* merge per-server config structures */ - disk_cache_cmds, /* command apr_table_t */ - disk_cache_register_hook /* register hooks */ + disk_cache_cmds, /* command apr_table_t */ + disk_cache_register_hook /* register hooks */ }; diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c index c98c6437eda..705dc4d73a3 100644 --- a/modules/cache/mod_file_cache.c +++ b/modules/cache/mod_file_cache.c @@ -108,7 +108,7 @@ typedef struct { apr_mmap_t *mm; #endif char mtimestr[APR_RFC822_DATE_LEN]; - char sizestr[21]; /* big enough to hold any 64-bit file size + null */ + char sizestr[21]; /* big enough to hold any 64-bit file size + null */ } a_file; typedef struct { diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c index 4258a665b40..511ac708503 100644 --- a/modules/dav/fs/lock.c +++ b/modules/dav/fs/lock.c @@ -56,34 +56,34 @@ ** ** The value consists of a list of elements. ** DIRECT LOCK: [char (DAV_LOCK_DIRECT), -** char (dav_lock_scope), -** char (dav_lock_type), -** int depth, -** time_t expires, -** apr_uuid_t locktoken, -** char[] owner, +** char (dav_lock_scope), +** char (dav_lock_type), +** int depth, +** time_t expires, +** apr_uuid_t locktoken, +** char[] owner, ** char[] auth_user] ** ** INDIRECT LOCK: [char (DAV_LOCK_INDIRECT), -** apr_uuid_t locktoken, -** time_t expires, -** apr_size_t key_size, -** char[] key] +** apr_uuid_t locktoken, +** time_t expires, +** apr_size_t key_size, +** char[] key] ** The key is to the collection lock that resulted in this indirect lock */ -#define DAV_TRUE 1 -#define DAV_FALSE 0 +#define DAV_TRUE 1 +#define DAV_FALSE 0 -#define DAV_CREATE_LIST 23 -#define DAV_APPEND_LIST 24 +#define DAV_CREATE_LIST 23 +#define DAV_APPEND_LIST 24 /* Stored lock_discovery prefix */ -#define DAV_LOCK_DIRECT 1 -#define DAV_LOCK_INDIRECT 2 +#define DAV_LOCK_DIRECT 1 +#define DAV_LOCK_INDIRECT 2 -#define DAV_TYPE_INODE 10 -#define DAV_TYPE_FNAME 11 +#define DAV_TYPE_INODE 10 +#define DAV_TYPE_FNAME 11 /* ack. forward declare. */ @@ -123,8 +123,8 @@ typedef struct dav_lock_discovery struct dav_lock_discovery_fixed f; dav_locktoken *locktoken; - const char *owner; /* owner field from activelock */ - const char *auth_user; /* authenticated user who created the lock */ + const char *owner; /* owner field from activelock */ + const char *auth_user; /* authenticated user who created the lock */ struct dav_lock_discovery *next; } dav_lock_discovery; @@ -149,14 +149,14 @@ typedef struct dav_lock_indirect ** Stored direct lock info - full lock_discovery length: ** prefix + Fixed length + lock token + 2 strings + 2 nulls (one for each string) */ -#define dav_size_direct(a) (1 + sizeof(dav_lock_discovery_fixed) \ +#define dav_size_direct(a) ( 1 + sizeof(dav_lock_discovery_fixed) \ + sizeof(apr_uuid_t) \ + ((a)->owner ? strlen((a)->owner) : 0) \ + ((a)->auth_user ? strlen((a)->auth_user) : 0) \ + 2) /* Stored indirect lock info - lock token and apr_datum_t */ -#define dav_size_indirect(a) (1 + sizeof(apr_uuid_t) \ +#define dav_size_indirect(a) (1 + sizeof(apr_uuid_t) \ + sizeof(time_t) \ + sizeof((a)->key.dsize) + (a)->key.dsize) @@ -177,12 +177,12 @@ typedef struct dav_lock_indirect */ struct dav_lockdb_private { - request_rec *r; /* for accessing the uuid state */ - apr_pool_t *pool; /* a pool to use */ - const char *lockdb_path; /* where is the lock database? */ + request_rec *r; /* for accessing the uuid state */ + apr_pool_t *pool; /* a pool to use */ + const char *lockdb_path; /* where is the lock database? */ - int opened; /* we opened the database */ - dav_db *db; /* if non-NULL, the lock database */ + int opened; /* we opened the database */ + dav_db *db; /* if non-NULL, the lock database */ }; typedef struct { @@ -195,7 +195,7 @@ typedef struct */ struct dav_lock_private { - apr_datum_t key; /* key into the lock database */ + apr_datum_t key; /* key into the lock database */ }; typedef struct { @@ -497,8 +497,8 @@ static dav_error * dav_fs_save_lock_record(dav_lockdb *lockdb, apr_datum_t key, ip = indirect; while(dp) { - *ptr++ = DAV_LOCK_DIRECT; /* Direct lock - lock_discovery struct follows */ - memcpy(ptr, dp, sizeof(dp->f)); /* Fixed portion of struct */ + *ptr++ = DAV_LOCK_DIRECT; /* Direct lock - lock_discovery struct follows */ + memcpy(ptr, dp, sizeof(dp->f)); /* Fixed portion of struct */ ptr += sizeof(dp->f); memcpy(ptr, dp->locktoken, sizeof(*dp->locktoken)); ptr += sizeof(*dp->locktoken); @@ -521,14 +521,14 @@ static dav_error * dav_fs_save_lock_record(dav_lockdb *lockdb, apr_datum_t key, } while(ip) { - *ptr++ = DAV_LOCK_INDIRECT; /* Indirect lock prefix */ - memcpy(ptr, ip->locktoken, sizeof(*ip->locktoken)); /* Locktoken */ + *ptr++ = DAV_LOCK_INDIRECT; /* Indirect lock prefix */ + memcpy(ptr, ip->locktoken, sizeof(*ip->locktoken)); /* Locktoken */ ptr += sizeof(*ip->locktoken); - memcpy(ptr, &ip->timeout, sizeof(ip->timeout)); /* Expire time */ + memcpy(ptr, &ip->timeout, sizeof(ip->timeout)); /* Expire time */ ptr += sizeof(ip->timeout); - memcpy(ptr, &ip->key.dsize, sizeof(ip->key.dsize)); /* Size of key */ + memcpy(ptr, &ip->key.dsize, sizeof(ip->key.dsize)); /* Size of key */ ptr += sizeof(ip->key.dsize); - memcpy(ptr, ip->key.dptr, ip->key.dsize); /* Key data */ + memcpy(ptr, ip->key.dptr, ip->key.dsize); /* Key data */ ptr += ip->key.dsize; ip = ip->next; } @@ -980,7 +980,7 @@ static dav_error * dav_fs_add_locknull_state( } dav_buffer_append(p, &buf, fname); - buf.cur_len++; /* we want the null-term here */ + buf.cur_len++; /* we want the null-term here */ if ((err = dav_fs_save_locknull_list(p, dirpath, &buf)) != NULL) { return dav_push_error(p, HTTP_INTERNAL_SERVER_ERROR, 0, diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c index 65b69a9b449..6a9b2490925 100644 --- a/modules/echo/mod_echo.c +++ b/modules/echo/mod_echo.c @@ -96,10 +96,10 @@ static void register_hooks(apr_pool_t *p) module AP_MODULE_DECLARE_DATA echo_module = { STANDARD20_MODULE_STUFF, - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - create_echo_server_config, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - echo_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + create_echo_server_config, /* create per-server config structure */ + NULL, /* merge per-server config structures */ + echo_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ }; diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c index 01004a72dbc..94cf9536443 100644 --- a/modules/generators/mod_asis.c +++ b/modules/generators/mod_asis.c @@ -136,10 +136,10 @@ static void register_hooks(apr_pool_t *p) module AP_MODULE_DECLARE_DATA asis_module = { STANDARD20_MODULE_STUFF, - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - NULL, /* command apr_table_t */ - register_hooks /* register hooks */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + NULL, /* create per-server config structure */ + NULL, /* merge per-server config structures */ + NULL, /* command apr_table_t */ + register_hooks /* register hooks */ }; diff --git a/modules/generators/mod_suexec.c b/modules/generators/mod_suexec.c index 080c51d9593..80088f61feb 100644 --- a/modules/generators/mod_suexec.c +++ b/modules/generators/mod_suexec.c @@ -134,5 +134,5 @@ module AP_MODULE_DECLARE_DATA suexec_module = create_mconfig_for_server, /* server config */ NULL, /* merge server config */ suexec_cmds, /* command table */ - suexec_hooks /* register hooks */ + suexec_hooks /* register hooks */ }; diff --git a/modules/http/chunk_filter.c b/modules/http/chunk_filter.c index 4bbb27a6bff..42e464e2e87 100644 --- a/modules/http/chunk_filter.c +++ b/modules/http/chunk_filter.c @@ -29,7 +29,7 @@ #include "http_config.h" #include "http_connection.h" #include "http_core.h" -#include "http_protocol.h" /* For index_of_response(). Grump. */ +#include "http_protocol.h" /* For index_of_response(). Grump. */ #include "http_request.h" #include "util_filter.h" diff --git a/modules/http/http_core.c b/modules/http/http_core.c index e6d75aecf00..14d8a1b598b 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -25,7 +25,7 @@ #include "http_config.h" #include "http_connection.h" #include "http_core.h" -#include "http_protocol.h" /* For index_of_response(). Grump. */ +#include "http_protocol.h" /* For index_of_response(). Grump. */ #include "http_request.h" #include "util_filter.h" @@ -250,10 +250,10 @@ static void register_hooks(apr_pool_t *p) module AP_MODULE_DECLARE_DATA http_module = { STANDARD20_MODULE_STUFF, - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - http_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + NULL, /* create per-server config structure */ + NULL, /* merge per-server config structures */ + http_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ }; diff --git a/modules/http/http_etag.c b/modules/http/http_etag.c index 8cd955decc3..f81e921ae18 100644 --- a/modules/http/http_etag.c +++ b/modules/http/http_etag.c @@ -25,7 +25,7 @@ #include "http_config.h" #include "http_connection.h" #include "http_core.h" -#include "http_protocol.h" /* For index_of_response(). Grump. */ +#include "http_protocol.h" /* For index_of_response(). Grump. */ #include "http_request.h" /* Generate the human-readable hex representation of an unsigned long diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index c48235b26a1..9d7b6c5c127 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -851,9 +851,9 @@ static int uldap_cache_checkuserid(request_rec *r, util_ldap_connection_t *ldc, char *dn; int count; int failures = 0; - util_url_node_t *curl; /* Cached URL node */ + util_url_node_t *curl; /* Cached URL node */ util_url_node_t curnode; - util_search_node_t *search_nodep; /* Cached search node */ + util_search_node_t *search_nodep; /* Cached search node */ util_search_node_t the_search_node; apr_time_t curtime; @@ -1097,9 +1097,9 @@ static int uldap_cache_getuserdn(request_rec *r, util_ldap_connection_t *ldc, char *dn; int count; int failures = 0; - util_url_node_t *curl; /* Cached URL node */ + util_url_node_t *curl; /* Cached URL node */ util_url_node_t curnode; - util_search_node_t *search_nodep; /* Cached search node */ + util_search_node_t *search_nodep; /* Cached search node */ util_search_node_t the_search_node; apr_time_t curtime; @@ -2042,10 +2042,10 @@ static void util_ldap_register_hooks(apr_pool_t *p) module AP_MODULE_DECLARE_DATA ldap_module = { STANDARD20_MODULE_STUFF, - NULL, /* create dir config */ - NULL, /* merge dir config */ - util_ldap_create_config, /* create server config */ - util_ldap_merge_config, /* merge server config */ - util_ldap_cmds, /* command table */ - util_ldap_register_hooks, /* set up request processing hooks */ + NULL, /* create dir config */ + NULL, /* merge dir config */ + util_ldap_create_config, /* create server config */ + util_ldap_merge_config, /* merge server config */ + util_ldap_cmds, /* command table */ + util_ldap_register_hooks, /* set up request processing hooks */ }; diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c index 643f6507d81..dd87611b227 100644 --- a/modules/mappers/mod_actions.c +++ b/modules/mappers/mod_actions.c @@ -212,10 +212,10 @@ static void register_hooks(apr_pool_t *p) module AP_MODULE_DECLARE_DATA actions_module = { STANDARD20_MODULE_STUFF, - create_action_dir_config, /* dir config creater */ - merge_action_dir_configs, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ - action_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + create_action_dir_config, /* dir config creater */ + merge_action_dir_configs, /* dir merger --- default is to override */ + NULL, /* server config */ + NULL, /* merge server config */ + action_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ }; diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c index 59aca9523b0..2bbdef54cc6 100644 --- a/modules/mappers/mod_imagemap.c +++ b/modules/mappers/mod_imagemap.c @@ -299,20 +299,20 @@ static void read_quoted(char **string, char **quoted_part) *quoted_part = NULL; while (apr_isspace(*strp)) { - strp++; /* go along string until non-whitespace */ + strp++; /* go along string until non-whitespace */ } - if (*strp == '"') { /* if that character is a double quote */ - strp++; /* step over it */ - *quoted_part = strp; /* note where the quoted part begins */ + if (*strp == '"') { /* if that character is a double quote */ + strp++; /* step over it */ + *quoted_part = strp; /* note where the quoted part begins */ while (*strp && *strp != '"') { - ++strp; /* skip the quoted portion */ + ++strp; /* skip the quoted portion */ } - *strp = '\0'; /* end the string with a NUL */ + *strp = '\0'; /* end the string with a NUL */ - strp++; /* step over the last double quote */ + strp++; /* step over the last double quote */ *string = strp; } } @@ -661,20 +661,20 @@ static int imap_handler_internal(request_rec *r) * memory for every line of the map file */ string_pos = input; - if (!*string_pos) { /* need at least two fields */ + if (!*string_pos) { /* need at least two fields */ goto need_2_fields; } directive = string_pos; - while (*string_pos && !apr_isspace(*string_pos)) { /* past directive */ + while (*string_pos && !apr_isspace(*string_pos)) { /* past directive */ ++string_pos; } - if (!*string_pos) { /* need at least two fields */ + if (!*string_pos) { /* need at least two fields */ goto need_2_fields; } *string_pos++ = '\0'; - if (!*string_pos) { /* need at least two fields */ + if (!*string_pos) { /* need at least two fields */ goto need_2_fields; } while(*string_pos && apr_isspace(*string_pos)) { /* past whitespace */ @@ -682,7 +682,7 @@ static int imap_handler_internal(request_rec *r) } value = string_pos; - while (*string_pos && !apr_isspace(*string_pos)) { /* past value */ + while (*string_pos && !apr_isspace(*string_pos)) { /* past value */ ++string_pos; } if (apr_isspace(*string_pos)) { diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c index 7e23031e00c..4173855ac34 100644 --- a/modules/mappers/mod_so.c +++ b/modules/mappers/mod_so.c @@ -422,10 +422,10 @@ static const command_rec so_cmds[] = { module AP_MODULE_DECLARE_DATA so_module = { STANDARD20_MODULE_STUFF, - NULL, /* create per-dir config */ - NULL, /* merge per-dir config */ - so_sconf_create, /* server config */ - NULL, /* merge server config */ - so_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + NULL, /* create per-dir config */ + NULL, /* merge per-dir config */ + so_sconf_create, /* server config */ + NULL, /* merge server config */ + so_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ }; diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c index 4441d64efec..a7b9b9ff169 100644 --- a/modules/mappers/mod_speling.c +++ b/modules/mappers/mod_speling.c @@ -525,9 +525,9 @@ module AP_MODULE_DECLARE_DATA speling_module = { STANDARD20_MODULE_STUFF, create_mconfig_for_directory, /* create per-dir config */ - NULL, /* merge per-dir config */ - create_mconfig_for_server, /* server config */ - NULL, /* merge server config */ - speling_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + NULL, /* merge per-dir config */ + create_mconfig_for_server, /* server config */ + NULL, /* merge server config */ + speling_cmds, /* command apr_table_t */ + register_hooks /* register hooks */ }; diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c index 4d3e1c823e2..e72c87e89aa 100644 --- a/modules/mappers/mod_vhost_alias.c +++ b/modules/mappers/mod_vhost_alias.c @@ -447,11 +447,11 @@ static void register_hooks(apr_pool_t *p) module AP_MODULE_DECLARE_DATA vhost_alias_module = { STANDARD20_MODULE_STUFF, - NULL, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - mva_create_server_config, /* server config */ - mva_merge_server_config, /* merge server configs */ - mva_commands, /* command apr_table_t */ + NULL, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + mva_create_server_config, /* server config */ + mva_merge_server_config, /* merge server configs */ + mva_commands, /* command apr_table_t */ register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index f2e91fcf199..fe2d93ef542 100644 --- a/modules/metadata/mod_expires.c +++ b/modules/metadata/mod_expires.c @@ -559,5 +559,5 @@ module AP_MODULE_DECLARE_DATA expires_module = NULL, /* server config */ NULL, /* merge server configs */ expires_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index faaea0ec355..b02c1876a19 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -119,52 +119,52 @@ #define MAXMIMESTRING 256 /* HOWMANY must be at least 4096 to make gzip -dcq work */ -#define HOWMANY 4096 +#define HOWMANY 4096 /* SMALL_HOWMANY limits how much work we do to figure out text files */ #define SMALL_HOWMANY 1024 -#define MAXDESC 50 /* max leng of text description */ -#define MAXstring 64 /* max leng of "string" types */ +#define MAXDESC 50 /* max leng of text description */ +#define MAXstring 64 /* max leng of "string" types */ struct magic { - struct magic *next; /* link to next entry */ - int lineno; /* line number from magic file */ + struct magic *next; /* link to next entry */ + int lineno; /* line number from magic file */ short flag; -#define INDIR 1 /* if '>(...)' appears, */ -#define UNSIGNED 2 /* comparison is unsigned */ - short cont_level; /* level of ">" */ +#define INDIR 1 /* if '>(...)' appears, */ +#define UNSIGNED 2 /* comparison is unsigned */ + short cont_level; /* level of ">" */ struct { - char type; /* byte short long */ - long offset; /* offset from indirection */ + char type; /* byte short long */ + long offset; /* offset from indirection */ } in; - long offset; /* offset to magic number */ - unsigned char reln; /* relation (0=eq, '>'=gt, etc) */ - char type; /* int, short, long or string. */ - char vallen; /* length of string value, if any */ -#define BYTE 1 -#define SHORT 2 -#define LONG 4 + long offset; /* offset to magic number */ + unsigned char reln; /* relation (0=eq, '>'=gt, etc) */ + char type; /* int, short, long or string. */ + char vallen; /* length of string value, if any */ +#define BYTE 1 +#define SHORT 2 +#define LONG 4 #define STRING 5 -#define DATE 6 -#define BESHORT 7 +#define DATE 6 +#define BESHORT 7 #define BELONG 8 #define BEDATE 9 -#define LESHORT 10 -#define LELONG 11 -#define LEDATE 12 +#define LESHORT 10 +#define LELONG 11 +#define LEDATE 12 union VALUETYPE { unsigned char b; unsigned short h; unsigned long l; char s[MAXstring]; - unsigned char hs[2]; /* 2 bytes of a fixed-endian "short" */ - unsigned char hl[4]; /* 2 bytes of a fixed-endian "long" */ - } value; /* either number or string */ - unsigned long mask; /* mask before comparison with value */ - char nospflag; /* supress space character */ + unsigned char hs[2]; /* 2 bytes of a fixed-endian "short" */ + unsigned char hl[4]; /* 2 bytes of a fixed-endian "long" */ + } value; /* either number or string */ + unsigned long mask; /* mask before comparison with value */ + char nospflag; /* supress space character */ /* NOTE: this string is suspected of overrunning - find it! */ - char desc[MAXDESC]; /* description */ + char desc[MAXDESC]; /* description */ }; /* @@ -207,7 +207,7 @@ union record { }; /* The magic field is filled with this if uname and gname are valid. */ -#define TMAGIC "ustar " /* 7 chars and a null */ +#define TMAGIC "ustar " /* 7 chars and a null */ /* * file-function prototypes @@ -246,30 +246,30 @@ static int fsmagic(request_rec *r, const char *fn); /* these types are used to index the apr_table_t 'types': keep em in sync! */ /* HTML inserted in first because this is a web server module now */ -#define L_HTML 0 /* HTML */ -#define L_C 1 /* first and foremost on UNIX */ -#define L_FORT 2 /* the oldest one */ -#define L_MAKE 3 /* Makefiles */ -#define L_PLI 4 /* PL/1 */ -#define L_MACH 5 /* some kinda assembler */ -#define L_ENG 6 /* English */ -#define L_PAS 7 /* Pascal */ -#define L_MAIL 8 /* Electronic mail */ -#define L_NEWS 9 /* Usenet Netnews */ +#define L_HTML 0 /* HTML */ +#define L_C 1 /* first and foremost on UNIX */ +#define L_FORT 2 /* the oldest one */ +#define L_MAKE 3 /* Makefiles */ +#define L_PLI 4 /* PL/1 */ +#define L_MACH 5 /* some kinda assembler */ +#define L_ENG 6 /* English */ +#define L_PAS 7 /* Pascal */ +#define L_MAIL 8 /* Electronic mail */ +#define L_NEWS 9 /* Usenet Netnews */ static char *types[] = { - "text/html", /* HTML */ - "text/plain", /* "c program text", */ - "text/plain", /* "fortran program text", */ - "text/plain", /* "make commands text", */ - "text/plain", /* "pl/1 program text", */ - "text/plain", /* "assembler program text", */ - "text/plain", /* "English text", */ - "text/plain", /* "pascal program text", */ - "message/rfc822", /* "mail text", */ - "message/news", /* "news text", */ - "application/binary", /* "can't happen error on names.h/types", */ + "text/html", /* HTML */ + "text/plain", /* "c program text", */ + "text/plain", /* "fortran program text", */ + "text/plain", /* "make commands text", */ + "text/plain", /* "pl/1 program text", */ + "text/plain", /* "assembler program text", */ + "text/plain", /* "English text", */ + "text/plain", /* "pascal program text", */ + "message/rfc822", /* "mail text", */ + "message/news", /* "news text", */ + "application/binary", /* "can't happen error on names.h/types", */ 0 }; @@ -312,7 +312,7 @@ static struct names { }, { "/*", L_C - }, /* must precede "The", "the", etc. */ + }, /* must precede "The", "the", etc. */ { "#include", L_C }, @@ -443,8 +443,8 @@ static struct names { */ typedef struct magic_rsl_s { - char *str; /* string, possibly a fragment */ - struct magic_rsl_s *next; /* pointer to next fragment */ + char *str; /* string, possibly a fragment */ + struct magic_rsl_s *next; /* pointer to next fragment */ } magic_rsl; /* @@ -453,16 +453,16 @@ typedef struct magic_rsl_s { /* per-server info */ typedef struct { - const char *magicfile; /* where magic be found */ - struct magic *magic; /* head of magic config list */ + const char *magicfile; /* where magic be found */ + struct magic *magic; /* head of magic config list */ struct magic *last; } magic_server_config_rec; /* per-request info */ typedef struct { - magic_rsl *head; /* result string list */ + magic_rsl *head; /* result string list */ magic_rsl *tail; - unsigned suf_recursion; /* recursion depth in suffix check */ + unsigned suf_recursion; /* recursion depth in suffix check */ } magic_req_rec; /* @@ -612,11 +612,11 @@ static int magic_rsl_putchar(request_rec *r, char c) /* allocate and copy a contiguous string from a result string list */ static char *rsl_strdup(request_rec *r, int start_frag, int start_pos, int len) { - char *result; /* return value */ - int cur_frag, /* current fragment number/counter */ - cur_pos, /* current position within fragment */ - res_pos; /* position in result string */ - magic_rsl *frag; /* list-traversal pointer */ + char *result; /* return value */ + int cur_frag, /* current fragment number/counter */ + cur_pos, /* current position within fragment */ + res_pos; /* position in result string */ + magic_rsl *frag; /* list-traversal pointer */ magic_req_rec *req_dat = (magic_req_rec *) ap_get_module_config(r->request_config, &mime_magic_module); @@ -664,16 +664,16 @@ typedef enum { /* process the RSL and set the MIME info in the request record */ static int magic_rsl_to_request(request_rec *r) { - int cur_frag, /* current fragment number/counter */ - cur_pos, /* current position within fragment */ - type_frag, /* content type starting point: fragment */ - type_pos, /* content type starting point: position */ - type_len, /* content type length */ - encoding_frag, /* content encoding starting point: fragment */ - encoding_pos, /* content encoding starting point: position */ - encoding_len; /* content encoding length */ - - magic_rsl *frag; /* list-traversal pointer */ + int cur_frag, /* current fragment number/counter */ + cur_pos, /* current position within fragment */ + type_frag, /* content type starting point: fragment */ + type_pos, /* content type starting point: position */ + type_len, /* content type length */ + encoding_frag, /* content encoding starting point: fragment */ + encoding_pos, /* content encoding starting point: position */ + encoding_len; /* content encoding length */ + + magic_rsl *frag; /* list-traversal pointer */ rsl_states state; magic_req_rec *req_dat = (magic_req_rec *) @@ -825,8 +825,8 @@ static int magic_rsl_to_request(request_rec *r) static int magic_process(request_rec *r) { apr_file_t *fd = NULL; - unsigned char buf[HOWMANY + 1]; /* one extra for terminating '\0' */ - apr_size_t nbytes = 0; /* number of bytes read from a datafile */ + unsigned char buf[HOWMANY + 1]; /* one extra for terminating '\0' */ + apr_size_t nbytes = 0; /* number of bytes read from a datafile */ int result; /* @@ -865,7 +865,7 @@ static int magic_process(request_rec *r) return DECLINED; } else { - buf[nbytes++] = '\0'; /* null-terminate it */ + buf[nbytes++] = '\0'; /* null-terminate it */ result = tryit(r, buf, nbytes, 1); if (result != OK) { return result; @@ -1090,12 +1090,12 @@ static int parse(server_rec *serv, apr_pool_t *p, char *l, int lineno) m->lineno = lineno; while (*l == '>') { - ++l; /* step over */ + ++l; /* step over */ m->cont_level++; } if (m->cont_level != 0 && *l == '(') { - ++l; /* step over */ + ++l; /* step over */ m->flag |= INDIR; } @@ -1250,7 +1250,7 @@ static int parse(server_rec *serv, apr_pool_t *p, char *l, int lineno) if (*l == 'x' && apr_isspace(l[1])) { m->reln = *l; ++l; - goto GetDesc; /* Bill The Cat */ + goto GetDesc; /* Bill The Cat */ } m->reln = '='; break; @@ -1370,10 +1370,10 @@ static char *getstr(server_rec *serv, register char *s, register char *p, case '6': case '7': val = c - '0'; - c = *s++; /* try for 2 */ + c = *s++; /* try for 2 */ if (c >= '0' && c <= '7') { val = (val << 3) | (c - '0'); - c = *s++; /* try for 3 */ + c = *s++; /* try for 3 */ if (c >= '0' && c <= '7') val = (val << 3) | (c - '0'); else @@ -1386,8 +1386,8 @@ static char *getstr(server_rec *serv, register char *s, register char *p, /* \x and up to 3 hex digits */ case 'x': - val = 'x'; /* Default if no digits */ - c = hextoint(*s++); /* Get next char */ + val = 'x'; /* Default if no digits */ + c = hextoint(*s++); /* Get next char */ if (c >= 0) { val = c; c = hextoint(*s++); @@ -1684,13 +1684,13 @@ static int match(request_rec *r, unsigned char *s, apr_size_t nbytes) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, MODNAME ": matched after %d rules", rule_counter); #endif - return 1; /* all through */ + return 1; /* all through */ } #if MIME_MAGIC_DEBUG ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, MODNAME ": failed after %d rules", rule_counter); #endif - return 0; /* no match at all */ + return 0; /* no match at all */ } static void mprint(request_rec *r, union VALUETYPE *p, struct magic *m) @@ -1977,7 +1977,7 @@ static int ascmagic(request_rec *r, unsigned char *buf, apr_size_t nbytes) { int has_escapes = 0; unsigned char *s; - char nbuf[HOWMANY + 1]; /* one extra for terminating '\0' */ + char nbuf[HOWMANY + 1]; /* one extra for terminating '\0' */ char *token; register struct names *p; int small_nbytes; @@ -1994,7 +1994,7 @@ static int ascmagic(request_rec *r, unsigned char *buf, apr_size_t nbytes) unsigned char *tp = buf + 1; while (apr_isspace(*tp)) - ++tp; /* skip leading whitespace */ + ++tp; /* skip leading whitespace */ if ((apr_isalnum(*tp) || *tp == '\\') && (apr_isalnum(*(tp + 1)) || *tp == '"')) { magic_rsl_puts(r, "application/x-troff"); @@ -2015,7 +2015,7 @@ static int ascmagic(request_rec *r, unsigned char *buf, apr_size_t nbytes) s[small_nbytes] = '\0'; has_escapes = (memchr(s, '\033', small_nbytes) != NULL); while ((token = apr_strtok((char *) s, " \t\n\r\f", &strtok_state)) != NULL) { - s = NULL; /* make apr_strtok() keep on tokin' */ + s = NULL; /* make apr_strtok() keep on tokin' */ for (p = names; p < names + NNAMES; p++) { if (STREQ(p->name, token)) { magic_rsl_puts(r, types[p->type]); @@ -2053,7 +2053,7 @@ static struct { apr_size_t maglen; char *argv[3]; int silent; - char *encoding; /* MUST be lowercase */ + char *encoding; /* MUST be lowercase */ } compr[] = { /* we use gzip here rather than uncompress because we have to pass @@ -2252,12 +2252,12 @@ static int is_tar(unsigned char *buf, apr_size_t nbytes) sum += ' ' * sizeof header->header.chksum; if (sum != recsum) - return 0; /* Not a tar archive */ + return 0; /* Not a tar archive */ if (0 == strcmp(header->header.magic, TMAGIC)) - return 2; /* Unix Standard tar archive */ + return 2; /* Unix Standard tar archive */ - return 1; /* Old fashioned tar archive */ + return 1; /* Old fashioned tar archive */ } @@ -2270,19 +2270,19 @@ static long from_oct(int digs, char *where) { register long value; - while (apr_isspace(*where)) { /* Skip spaces */ + while (apr_isspace(*where)) { /* Skip spaces */ where++; if (--digs <= 0) - return -1; /* All blank field */ + return -1; /* All blank field */ } value = 0; - while (digs > 0 && isodigit(*where)) { /* Scan til nonoctal */ + while (digs > 0 && isodigit(*where)) { /* Scan til nonoctal */ value = (value << 3) | (*where++ - '0'); --digs; } if (digs > 0 && *where && !apr_isspace(*where)) - return -1; /* Ended on non-space/nul */ + return -1; /* Ended on non-space/nul */ return value; } diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c index c28fc1c0216..b817bc044f1 100644 --- a/modules/metadata/mod_setenvif.c +++ b/modules/metadata/mod_setenvif.c @@ -50,8 +50,8 @@ * * Special values for 'name' are: * - * server_addr IP address of interface on which request arrived - * (analogous to SERVER_ADDR set in ap_add_common_vars()) + * server_addr IP address of interface on which request arrived + * (analogous to SERVER_ADDR set in ap_add_common_vars()) * remote_host Remote host name (if available) * remote_addr Remote IP address * request_method Request method (GET, POST, etc) @@ -166,7 +166,7 @@ static void *merge_setenvif_config(apr_pool_t *p, void *basev, void *overridesv) * any non-NULL magic constant will do... used to indicate if AP_REG_ICASE should * be used */ -#define ICASE_MAGIC ((void *)(&setenvif_module)) +#define ICASE_MAGIC ((void *)(&setenvif_module)) #define SEI_MAGIC_HEIRLOOM "setenvif-phase-flag" static int is_header_regex(apr_pool_t *p, const char* name) @@ -651,5 +651,5 @@ module AP_MODULE_DECLARE_DATA setenvif_module = create_setenvif_config_svr, /* server config */ merge_setenvif_config, /* merge server configs */ setenvif_module_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c index a7dd1a21c73..8c642a14add 100644 --- a/modules/metadata/mod_usertrack.c +++ b/modules/metadata/mod_usertrack.c @@ -449,5 +449,5 @@ module AP_MODULE_DECLARE_DATA usertrack_module = { make_cookie_log_state, /* server config */ NULL, /* merge server configs */ cookie_log_cmds, /* command apr_table_t */ - register_hooks /* register hooks */ + register_hooks /* register hooks */ }; diff --git a/modules/ssl/ssl_expr_parse.c b/modules/ssl/ssl_expr_parse.c index d1efa59c94c..7d8c4ab1061 100644 --- a/modules/ssl/ssl_expr_parse.c +++ b/modules/ssl/ssl_expr_parse.c @@ -274,22 +274,22 @@ static int ssl_expr_yygrowstack() #if defined(__cplusplus) || __STDC__ #define YYPARSE_PARAM_ARG void #define YYPARSE_PARAM_DECL -#else /* ! ANSI-C/C++ */ +#else /* ! ANSI-C/C++ */ #define YYPARSE_PARAM_ARG #define YYPARSE_PARAM_DECL -#endif /* ANSI-C/C++ */ -#else /* YYPARSE_PARAM */ +#endif /* ANSI-C/C++ */ +#else /* YYPARSE_PARAM */ #ifndef YYPARSE_PARAM_TYPE #define YYPARSE_PARAM_TYPE void * #endif #if defined(__cplusplus) || __STDC__ #define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM #define YYPARSE_PARAM_DECL -#else /* ! ANSI-C/C++ */ +#else /* ! ANSI-C/C++ */ #define YYPARSE_PARAM_ARG YYPARSE_PARAM #define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM; -#endif /* ANSI-C/C++ */ -#endif /* ! YYPARSE_PARAM */ +#endif /* ANSI-C/C++ */ +#endif /* ! YYPARSE_PARAM */ int ssl_expr_yyparse (YYPARSE_PARAM_ARG) diff --git a/modules/ssl/ssl_expr_scan.c b/modules/ssl/ssl_expr_scan.c index 7d7bb85fd38..f3b5ad23a87 100644 --- a/modules/ssl/ssl_expr_scan.c +++ b/modules/ssl/ssl_expr_scan.c @@ -47,15 +47,15 @@ /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST -#else /* ! __cplusplus */ +#else /* ! __cplusplus */ #if __STDC__ #define YY_USE_PROTOS #define YY_USE_CONST -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ +#endif /* __STDC__ */ +#endif /* ! __cplusplus */ #ifdef __TURBOC__ #pragma warn -rch @@ -126,10 +126,10 @@ extern FILE *yyin, *yyout; * int a single C statement (which needs a semi-colon terminator). This * avoids problems with code like: * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); + * if ( condition_holds ) + * yyless( 5 ); + * else + * do_something_else(); * * Prior to using the do-while the compiler would get upset at the * "else" because it interpreted the "if" statement as being all @@ -162,8 +162,8 @@ struct yy_buffer_state { FILE *yy_input_file; - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ /* Size of input buffer in bytes, not including room for EOB * characters. @@ -227,15 +227,15 @@ static YY_BUFFER_STATE yy_current_buffer = 0; /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ +static int yy_n_chars; /* number of characters read into yy_ch_buf */ int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ +static int yy_init = 1; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ /* Flag which is used to allow yywrap()'s to do buffer switches * instead of setting up a fresh yyin. A bit of a hack ... @@ -686,7 +686,7 @@ YY_DECL #endif if ( ! yy_start ) - yy_start = 1; /* first start state */ + yy_start = 1; /* first start state */ if ( ! yyin ) yyin = stdin; @@ -701,7 +701,7 @@ YY_DECL yy_load_buffer_state(); } - while ( 1 ) /* loops until end-of-file is reached */ + while ( 1 ) /* loops until end-of-file is reached */ { yy_cp = yy_c_buf_p; @@ -742,7 +742,7 @@ YY_DECL YY_DO_BEFORE_ACTION; -do_action: /* This label is used only to access EOF actions. */ +do_action: /* This label is used only to access EOF actions. */ switch ( yy_act ) @@ -1220,9 +1220,9 @@ case YY_STATE_EOF(regex): /* yy_get_next_buffer - try to read in a new buffer * * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file */ static int yy_get_next_buffer() @@ -1388,7 +1388,7 @@ static yy_state_type yy_get_previous_state() /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis - * next_state = yy_try_NUL_trans( current_state ); + * next_state = yy_try_NUL_trans( current_state ); */ #ifdef YY_USE_PROTOS @@ -1462,7 +1462,7 @@ register char *yy_bp; yy_hold_char = *yy_cp; yy_c_buf_p = yy_cp; } -#endif /* ifndef YY_NO_UNPUT */ +#endif /* ifndef YY_NO_UNPUT */ #ifdef __cplusplus @@ -1529,8 +1529,8 @@ static int input() } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ + c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ + *yy_c_buf_p = '\0'; /* preserve yytext */ yy_hold_char = *++yy_c_buf_p; @@ -1731,7 +1731,7 @@ yy_size_t size; if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; b->yy_input_file = 0; diff --git a/server/config.c b/server/config.c index a36a01dd503..1fc56cf519b 100644 --- a/server/config.c +++ b/server/config.c @@ -46,8 +46,8 @@ #include "http_config.h" #include "http_protocol.h" #include "http_core.h" -#include "http_log.h" /* for errors in parse_htaccess */ -#include "http_request.h" /* for default_handler (see invoke_handler) */ +#include "http_log.h" /* for errors in parse_htaccess */ +#include "http_request.h" /* for default_handler (see invoke_handler) */ #include "http_main.h" #include "http_vhost.h" #include "util_cfgtree.h" diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index b813ff53eb1..888c7c02798 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -43,8 +43,8 @@ #include "httpd.h" #include "http_main.h" #include "http_log.h" -#include "http_config.h" /* for read_config */ -#include "http_core.h" /* for get_remote_host */ +#include "http_config.h" /* for read_config */ +#include "http_core.h" /* for get_remote_host */ #include "http_connection.h" #include "ap_mpm.h" #include "beosd.h" @@ -101,7 +101,7 @@ static int num_listening_sockets = 0; static int mpm_state = AP_MPMQ_STARTING; apr_thread_mutex_t *accept_mutex = NULL; -static apr_pool_t *pconf; /* Pool for config stuff */ +static apr_pool_t *pconf; /* Pool for config stuff */ static int server_pid; @@ -678,7 +678,7 @@ static void startup_threads(int number_to_start) */ static int spawn_rate = 1; #ifndef MAX_SPAWN_RATE -#define MAX_SPAWN_RATE (32) +#define MAX_SPAWN_RATE (32) #endif static int hold_off_on_exponential_spawning; @@ -1010,7 +1010,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) * pthreads are stealing signals from us left and right. */ - ap_reclaim_child_processes(1); /* Start with SIGTERM */ + ap_reclaim_child_processes(1); /* Start with SIGTERM */ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, "SIGHUP received. Attempting to restart"); } @@ -1196,12 +1196,12 @@ AP_INIT_TAKE1( "MaxRequestsPerThread", set_max_requests_per_thread, NULL, RSRC_C module AP_MODULE_DECLARE_DATA mpm_beos_module = { MPM20_MODULE_STUFF, - NULL, /* hook to run before apache parses args */ - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - beos_cmds, /* command apr_table_t */ - beos_hooks /* register_hooks */ + NULL, /* hook to run before apache parses args */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + NULL, /* create per-server config structure */ + NULL, /* merge per-server config structures */ + beos_cmds, /* command apr_table_t */ + beos_hooks /* register_hooks */ }; diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 44e8e480f73..f330743bdec 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -47,7 +47,7 @@ #include "http_main.h" #include "http_log.h" #include "http_config.h" -#include "http_core.h" /* for get_remote_host */ +#include "http_core.h" /* for get_remote_host */ #include "http_connection.h" #include "mpm.h" #include "ap_mpm.h" @@ -70,7 +70,7 @@ #endif server_rec *ap_server_conf; -static apr_pool_t *pconf = NULL; /* Pool for config stuff */ +static apr_pool_t *pconf = NULL; /* Pool for config stuff */ static const char *ap_pid_fname=NULL; /* Config globals */ @@ -567,11 +567,11 @@ AP_INIT_TAKE1("ScoreBoardFile", ignore_cmd, NULL, RSRC_CONF, \ module AP_MODULE_DECLARE_DATA mpm_mpmt_os2_module = { MPM20_MODULE_STUFF, - NULL, /* hook to run before apache parses args */ - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - mpmt_os2_cmds, /* command apr_table_t */ - mpmt_os2_hooks, /* register_hooks */ + NULL, /* hook to run before apache parses args */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + NULL, /* create per-server config structure */ + NULL, /* merge per-server config structures */ + mpmt_os2_cmds, /* command apr_table_t */ + mpmt_os2_hooks, /* register_hooks */ }; diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c index 3aef26b4728..0c4e5a9cd74 100644 --- a/server/mpm/mpmt_os2/mpmt_os2_child.c +++ b/server/mpm/mpmt_os2/mpmt_os2_child.c @@ -25,7 +25,7 @@ #include "http_main.h" #include "http_log.h" #include "http_config.h" -#include "http_core.h" /* for get_remote_host */ +#include "http_core.h" /* for get_remote_host */ #include "http_connection.h" #include "mpm.h" #include "ap_mpm.h" diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index b30ceec8b7d..e576c0626d9 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -884,7 +884,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) apr_pool_create(&pmain, pconf); ap_run_child_init(pmain, ap_server_conf); - if (ap_threads_max_free < ap_threads_min_free + 1) /* Don't thrash... */ + if (ap_threads_max_free < ap_threads_min_free + 1) /* Don't thrash... */ ap_threads_max_free = ap_threads_min_free + 1; request_count = 0; @@ -1282,10 +1282,10 @@ AP_INIT_TAKE1("MaxThreads", set_thread_limit, NULL, RSRC_CONF, module AP_MODULE_DECLARE_DATA mpm_netware_module = { MPM20_MODULE_STUFF, netware_rewrite_args, /* hook to run before apache parses args */ - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + NULL, /* create per-server config structure */ + NULL, /* merge per-server config structures */ netware_mpm_cmds, /* command apr_table_t */ netware_mpm_hooks, /* register hooks */ }; diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index abb2bb7fd79..b2a64e32b4b 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -20,8 +20,8 @@ #include "httpd.h" #include "http_main.h" #include "http_log.h" -#include "http_config.h" /* for read_config */ -#include "http_core.h" /* for get_remote_host */ +#include "http_config.h" /* for read_config */ +#include "http_core.h" /* for get_remote_host */ #include "http_connection.h" #include "apr_portable.h" #include "apr_thread_proc.h" diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 3c8bc9ec63c..44b29439378 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -20,8 +20,8 @@ #include "httpd.h" #include "http_main.h" #include "http_log.h" -#include "http_config.h" /* for read_config */ -#include "http_core.h" /* for get_remote_host */ +#include "http_config.h" /* for read_config */ +#include "http_core.h" /* for get_remote_host */ #include "http_connection.h" #include "apr_portable.h" #include "apr_thread_proc.h" @@ -47,8 +47,8 @@ extern apr_shm_t *ap_scoreboard_shm; server_rec *ap_server_conf; /* Definitions of WINNT MPM specific config globals */ -static HANDLE shutdown_event; /* used to signal the parent to shutdown */ -static HANDLE restart_event; /* used to signal the parent to restart */ +static HANDLE shutdown_event; /* used to signal the parent to shutdown */ +static HANDLE restart_event; /* used to signal the parent to restart */ static char ap_coredump_dir[MAX_STRING_LEN]; @@ -1712,13 +1712,13 @@ static void winnt_hooks(apr_pool_t *p) AP_MODULE_DECLARE_DATA module mpm_winnt_module = { MPM20_MODULE_STUFF, - winnt_rewrite_args, /* hook to run before apache parses args */ - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - winnt_cmds, /* command apr_table_t */ - winnt_hooks /* register_hooks */ + winnt_rewrite_args, /* hook to run before apache parses args */ + NULL, /* create per-directory config structure */ + NULL, /* merge per-directory config structures */ + NULL, /* create per-server config structure */ + NULL, /* merge per-server config structures */ + winnt_cmds, /* command apr_table_t */ + winnt_hooks /* register_hooks */ }; #endif /* def WIN32 */ diff --git a/test/cls.c b/test/cls.c index d11e2a4147d..9c7aa833ff3 100644 --- a/test/cls.c +++ b/test/cls.c @@ -82,7 +82,7 @@ static int hex2sec(const char *x) j |= ch - ('a' - 10); } if (j == 0xffffffff) - return -1; /* so that it works with 8-byte ints */ + return -1; /* so that it works with 8-byte ints */ else return j; } diff --git a/test/test_limits.c b/test/test_limits.c index aa51d53c2c1..e2b5285f77a 100644 --- a/test/test_limits.c +++ b/test/test_limits.c @@ -14,7 +14,7 @@ * * * Message-ID: <861zqspvtw.fsf@niobe.ewox.org> - * Date: Fri, 7 Aug 1998 19:04:27 +0200 + * Date: Fri, 7 Aug 1998 19:04:27 +0200 * Sender: Bugtraq List * From: Dag-Erling Coidan =?ISO-8859-1?Q?Sm=F8rgrav?= * Subject: YA Apache DoS attack diff --git a/test/time-sem.c b/test/time-sem.c index 2b7f957eccb..b1a4d557cf6 100644 --- a/test/time-sem.c +++ b/test/time-sem.c @@ -467,7 +467,7 @@ static void *get_shared_mem(apr_size_t size) } #endif -#define BADSHMAT ((void *)(-1)) +#define BADSHMAT ((void *)(-1)) if ((result = shmat(shmid, 0, 0)) == BADSHMAT) { perror("shmat"); } @@ -478,12 +478,12 @@ static void *get_shared_mem(apr_size_t size) if (shmctl(shmid, IPC_RMID, NULL) != 0) { perror("shmctl(IPC_RMID)"); } - if (result == BADSHMAT) /* now bailout */ + if (result == BADSHMAT) /* now bailout */ exit(1); #ifdef MOVEBREAK if (obrk == (char *) -1) - return; /* nothing else to do */ + return; /* nothing else to do */ if (sbrk(-(MOVEBREAK)) == (char *) -1) { perror("sbrk 2"); } @@ -496,9 +496,9 @@ static void *get_shared_mem(apr_size_t size) /* don't ask */ #define _P __P #include -#define YIELD sched_yield() +#define YIELD sched_yield() #else -#define YIELD do { struct timeval zero; zero.tv_sec = zero.tv_usec = 0; select(0,0,0,0,&zero); } while(0) +#define YIELD do { struct timeval zero; zero.tv_sec = zero.tv_usec = 0; select(0,0,0,0,&zero); } while(0) #endif void main (int argc, char **argv)