From: Jim Jagielski Date: Thu, 10 Nov 2005 16:03:23 +0000 (+0000) Subject: No functional change: more indenting/formatting changes due to X-Git-Tag: 2.3.0~2796 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b72e6104100a0a5a7d29013682b1da2c3915cfcf;p=thirdparty%2Fapache%2Fhttpd.git No functional change: more indenting/formatting changes due to tabbing git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c index 43ce874f5a4..db0d6db302f 100644 --- a/modules/arch/netware/mod_nw_ssl.c +++ b/modules/arch/netware/mod_nw_ssl.c @@ -314,7 +314,7 @@ int convert_secure_socket(conn_rec *c, apr_socket_t *csd) int rcode; struct tlsclientopts sWS2Opts; struct nwtlsopts sNWTLSOpts; - struct sslserveropts opts; + struct sslserveropts opts; unsigned long ulFlags; SOCKET sock; unicode_t keyFileName[60]; @@ -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); + 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 */ diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index 8d65fb8a43c..21cd11fd7af 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -795,7 +795,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r) if ((rv = ap_setup_client_block(r, body))) { if (rv == HTTP_REQUEST_ENTITY_TOO_LARGE) - apr_table_setn(r->notes, "error-notes", + apr_table_setn(r->notes, "error-notes", "TRACE with a request body is not allowed"); return rv; } diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c index ad42ddbd0b1..354a27c53d4 100644 --- a/modules/ldap/util_ldap_cache_mgr.c +++ b/modules/ldap/util_ldap_cache_mgr.c @@ -484,7 +484,7 @@ char *util_ald_cache_display_stats(request_rec *r, util_ald_cache_t *cache, char for (n = cache->nodes[i]; n != NULL && n != n->next; n = n->next) { - totchainlen++; + totchainlen++; } } } diff --git a/server/core.c b/server/core.c index 99b3c397a9f..d0c3622c768 100644 --- a/server/core.c +++ b/server/core.c @@ -109,7 +109,7 @@ static void *create_core_dir_config(apr_pool_t *a, char *dir) conf->opts_add = conf->opts_remove = OPT_NONE; conf->override = dir ? OR_UNSET : OR_UNSET|OR_ALL; conf->override_opts = OPT_UNSET | OPT_ALL | OPT_INCNOEXEC | OPT_SYM_OWNER - | OPT_MULTI; + | OPT_MULTI; conf->content_md5 = 2; conf->accept_path_info = 3; diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index b5ed9f2b9b8..b813ff53eb1 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -383,7 +383,7 @@ static void set_signals(void) /* We ignore SIGPIPE */ sa.sa_handler = SIG_IGN; if (sigaction(SIGPIPE, &sa, NULL) < 0) - ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGPIPE)"); + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGPIPE)"); /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy * processing one */ @@ -391,7 +391,7 @@ static void set_signals(void) sigaddset(&sa.sa_mask, AP_SIG_GRACEFUL); sa.sa_handler = restart; if (sigaction(SIGHUP, &sa, NULL) < 0) - ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGHUP)"); + ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGHUP)"); if (sigaction(AP_SIG_GRACEFUL, &sa, NULL) < 0) ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(" AP_SIG_GRACEFUL_STRING ")"); } @@ -521,7 +521,7 @@ static int32 worker_thread(void *dummy) } ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, "apr_pollset_poll: (listen)"); - clean_child_exit(1, worker_slot); + clean_child_exit(1, worker_slot); } /* We can always use pdesc[0], but sockets at position N * could end up completely starved of attention in a very @@ -592,7 +592,7 @@ got_fd: got_a_black_spot: } - apr_pool_destroy(ptrans); + apr_pool_destroy(ptrans); apr_pool_destroy(pworker); clean_child_exit(0, worker_slot); @@ -608,7 +608,7 @@ static int make_worker(int slot) (void) ap_update_child_status_from_indexes(0, slot, SERVER_STARTING, (request_rec*)NULL); if (one_process) { - set_signals(); + set_signals(); ap_scoreboard_image->parent[0].pid = getpid(); ap_scoreboard_image->servers[0][slot].tid = find_thread(NULL); return 0; @@ -626,8 +626,8 @@ static int make_worker(int slot) (void) ap_update_child_status_from_indexes(0, slot, SERVER_DEAD, (request_rec*)NULL); - sleep(10); - return -1; + sleep(10); + return -1; } resume_thread(tid); @@ -703,24 +703,24 @@ static void perform_idle_server_maintenance(void) last_non_dead = i; } - if (i >= ap_max_child_assigned && free_length >= spawn_rate) { + if (i >= ap_max_child_assigned && free_length >= spawn_rate) { break; - } + } } ap_max_child_assigned = last_non_dead + 1; if (free_length > 0) { - for (i = 0; i < free_length; ++i) { + for (i = 0; i < free_length; ++i) { make_worker(free_slots[i]); - } - /* the next time around we want to spawn twice as many if this - * wasn't good enough, but not if we've just done a graceful - */ - if (hold_off_on_exponential_spawning) { - --hold_off_on_exponential_spawning; - } else if (spawn_rate < MAX_SPAWN_RATE) { - spawn_rate *= 2; - } + } + /* the next time around we want to spawn twice as many if this + * wasn't good enough, but not if we've just done a graceful + */ + if (hold_off_on_exponential_spawning) { + --hold_off_on_exponential_spawning; + } else if (spawn_rate < MAX_SPAWN_RATE) { + spawn_rate *= 2; + } } else { spawn_rate = 1; } @@ -747,7 +747,7 @@ static void server_main_loop(int remaining_threads_to_start) /* non-fatal death... note that it's gone in the scoreboard. */ child_slot = -1; for (i = 0; i < ap_max_child_assigned; ++i) { - if (ap_scoreboard_image->servers[0][i].tid == pid.pid) { + if (ap_scoreboard_image->servers[0][i].tid == pid.pid) { child_slot = i; break; } diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index fb7c356ee6c..b30ceec8b7d 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -1124,7 +1124,7 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine) printf("Server built: %s\n", ap_get_server_built()); } else if (!strnicmp("MODULES",&szcommandLine[iCommandLen],3)) { - ap_show_modules(); + ap_show_modules(); } else if (!strnicmp("DIRECTIVES",&szcommandLine[iCommandLen],3)) { ap_show_directives(); diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index bb699b012f8..b05c8b0a2b0 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -231,7 +231,7 @@ static DWORD WINAPI monitor_service_9x_thread(void *service_name) /* Create an invisible window */ hwndMain = CreateWindow(wc.lpszClassName, service_name ? (char *) service_name : "Apache", - WS_OVERLAPPEDWINDOW & ~WS_VISIBLE, + WS_OVERLAPPEDWINDOW & ~WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); diff --git a/support/logresolve.c b/support/logresolve.c index a17259b5637..e2ecb445059 100644 --- a/support/logresolve.c +++ b/support/logresolve.c @@ -93,12 +93,12 @@ static void print_statistics (apr_file_t *output) apr_file_printf(output, " Resolves : %d" NL, resolves); if (noreverse) { - apr_file_printf(output, " - No reverse : %d" NL, + apr_file_printf(output, " - No reverse : %d" NL, noreverse); } if (doublefailed) { - apr_file_printf(output, " - Double lookup failed : %d" NL, + apr_file_printf(output, " - Double lookup failed : %d" NL, doublefailed); }