Permalink
Browse files

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
  • Loading branch information...
1 parent 500313e commit 7ac78e387b5228531f2ebb37eac8590ac592f7f7 @jimjag jimjag committed Nov 16, 2005
@@ -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,17 +346,17 @@ 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 */
unicpy(keyFileName, L"SSL CertificateIP");
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 */
View
@@ -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;
};
@@ -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 */
};
@@ -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 {
View
@@ -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,
View
@@ -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 */
};
@@ -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 */
};
@@ -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 */
};
@@ -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"
View
@@ -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 */
};
View
@@ -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
View
@@ -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 */
};
@@ -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 */
};
Oops, something went wrong.

0 comments on commit 7ac78e3

Please sign in to comment.