You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2011/11/14 07:35:50 UTC
svn commit: r1201607 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c
iis/jk_isapi_plugin.c
Author: mturk
Date: Mon Nov 14 06:35:49 2011
New Revision: 1201607
URL: http://svn.apache.org/viewvc?rev=1201607&view=rev
Log:
Fix code style. No functional change
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1201607&r1=1201606&r2=1201607&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Nov 14 06:35:49 2011
@@ -361,7 +361,8 @@ static int JK_METHOD ws_start_response(j
*/
if (status != 500 && !strncmp(reason, "500 ", 4)) {
reason = "Unknown Reason";
- } else {
+ }
+ else {
/* Apache httpd returns a full status line,
* but we only want a reason phrase, so skip
* the prepended status code.
@@ -598,8 +599,9 @@ static void JK_METHOD ws_vhost_to_text(v
server_rec *s = (server_rec *)d;
size_t used = 0;
- if (s->server_hostname)
+ if (s->server_hostname) {
used += strlen(s->server_hostname);
+ }
if (!s->is_virtual) {
if (s->port)
used += strlen(":XXXXX");
@@ -1721,23 +1723,21 @@ static struct log_item_list
char ch;
item_key_func func;
} log_item_keys[] = {
-
- {
- 'T', log_request_duration}, {
- 'r', log_request_line}, {
- 'U', log_request_uri}, {
- 's', log_status}, {
- 'b', clf_log_bytes_sent}, {
- 'B', log_bytes_sent}, {
- 'V', log_server_name}, {
- 'v', log_virtual_host}, {
- 'p', log_server_port}, {
- 'H', log_request_protocol}, {
- 'm', log_request_method}, {
- 'q', log_request_query}, {
- 'w', log_worker_name}, {
- 'R', log_worker_route}, {
- '\0'}
+ { 'T', log_request_duration },
+ { 'r', log_request_line },
+ { 'U', log_request_uri },
+ { 's', log_status },
+ { 'b', clf_log_bytes_sent },
+ { 'B', log_bytes_sent },
+ { 'V', log_server_name },
+ { 'v', log_virtual_host },
+ { 'p', log_server_port },
+ { 'H', log_request_protocol },
+ { 'm', log_request_method },
+ { 'q', log_request_query },
+ { 'w', log_worker_name },
+ { 'R', log_worker_route},
+ { '\0', NULL }
};
static struct log_item_list *find_log_func(char k)
@@ -2852,7 +2852,8 @@ static void *create_jk_config(apr_pool_t
c->log_level = JK_UNSET;
c->ssl_enable = JK_UNSET;
c->strip_session = JK_UNSET;
- } else {
+ }
+ else {
if (!jk_map_alloc(&(c->uri_to_context))) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "Memory error");
}
@@ -3230,10 +3231,10 @@ static void jk_child_init(apr_pool_t * p
apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
apr_pool_cleanup_null);
}
- else
+ else {
jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
jk_shm_name(), rc);
-
+ }
if (JK_IS_DEBUG_LEVEL(conf->log))
jk_log(conf->log, JK_LOG_DEBUG, "Initialized %s", JK_FULL_EXPOSED_VERSION);
JK_TRACE_EXIT(conf->log);
@@ -3320,8 +3321,9 @@ static int init_jk(apr_pool_t * pconf, j
"Using default %s", jk_shm_file);
}
#endif
- if (jk_shm_size == 0)
+ if (jk_shm_size == 0) {
jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
+ }
else if (jk_shm_size_set) {
jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined automatically.");
@@ -3333,11 +3335,11 @@ static int init_jk(apr_pool_t * pconf, j
jk_cleanup_shmem,
apr_pool_cleanup_null);
}
- else
+ else {
jk_log(conf->log, JK_LOG_ERROR,
"Initializing shm:%s errno=%d. Load balancing workers will not function properly.",
jk_shm_name(), rc);
-
+ }
/* we add the URI->WORKER MAP since workers using AJP14
will feed it */
worker_env.uri_to_worker = conf->uw_map;
@@ -3400,7 +3402,8 @@ static int jk_post_config(apr_pool_t * p
#endif
apr_pool_userdata_set((const void *)jk_log_lock, JK_LOG_LOCK_KEY,
apr_pool_cleanup_null, s->process->pool);
- } else {
+ }
+ else {
jk_log_lock = (apr_global_mutex_t *)data;
}
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1201607&r1=1201606&r2=1201607&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Nov 14 06:35:49 2011
@@ -1372,7 +1372,8 @@ static int JK_METHOD iis_write(jk_ws_ser
JK_TRACE_EXIT(logger);
return JK_FALSE;
}
- } else {
+ }
+ else {
/* Write chunk header */
if (JK_IS_DEBUG_LEVEL(logger))
jk_log(logger, JK_LOG_DEBUG,
@@ -1576,10 +1577,11 @@ static size_t ap_regerror(int errcode, c
strlen(addmessage) + 6 : 0;
if (errbuf_size > 0) {
- if (addlength > 0 && errbuf_size >= length + addlength)
+ if (addlength > 0 && errbuf_size >= length + addlength) {
StringCbPrintf(errbuf, sizeof(errbuf), "%s%s%-6d",
message, addmessage,
(int)preg->re_erroffset);
+ }
else {
strncpy(errbuf, message, errbuf_size - 1);
errbuf[errbuf_size-1] = 0;
@@ -1621,13 +1623,16 @@ static int ap_regcomp(ap_regex_t *preg,
int erroffset;
int options = 0;
- if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
- if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
+ if ((cflags & AP_REG_ICASE) != 0)
+ options |= PCRE_CASELESS;
+ if ((cflags & AP_REG_NEWLINE) != 0)
+ options |= PCRE_MULTILINE;
preg->re_pcre = pcre_compile(pattern, options, &errorptr, &erroffset, NULL);
preg->re_erroffset = erroffset;
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
+ if (preg->re_pcre == NULL)
+ return AP_REG_INVARG;
preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
return 0;
@@ -1693,24 +1698,35 @@ static int ap_regexec(const ap_regex_t *
if (allocated_ovector)
free(ovector);
switch(rc) {
- case PCRE_ERROR_NOMATCH: return AP_REG_NOMATCH;
- case PCRE_ERROR_NULL: return AP_REG_INVARG;
- case PCRE_ERROR_BADOPTION: return AP_REG_INVARG;
- case PCRE_ERROR_BADMAGIC: return AP_REG_INVARG;
- case PCRE_ERROR_UNKNOWN_NODE: return AP_REG_ASSERT;
- case PCRE_ERROR_NOMEMORY: return AP_REG_ESPACE;
+ case PCRE_ERROR_NOMATCH:
+ return AP_REG_NOMATCH;
+ case PCRE_ERROR_NULL:
+ return AP_REG_INVARG;
+ case PCRE_ERROR_BADOPTION:
+ return AP_REG_INVARG;
+ case PCRE_ERROR_BADMAGIC:
+ return AP_REG_INVARG;
+ case PCRE_ERROR_UNKNOWN_NODE:
+ return AP_REG_ASSERT;
+ case PCRE_ERROR_NOMEMORY:
+ return AP_REG_ESPACE;
#ifdef PCRE_ERROR_MATCHLIMIT
- case PCRE_ERROR_MATCHLIMIT: return AP_REG_ESPACE;
+ case PCRE_ERROR_MATCHLIMIT:
+ return AP_REG_ESPACE;
#endif
#ifdef PCRE_ERROR_BADUTF8
- case PCRE_ERROR_BADUTF8: return AP_REG_INVARG;
+ case PCRE_ERROR_BADUTF8:
+ return AP_REG_INVARG;
#endif
#ifdef PCRE_ERROR_BADUTF8_OFFSET
- case PCRE_ERROR_BADUTF8_OFFSET: return AP_REG_INVARG;
+ case PCRE_ERROR_BADUTF8_OFFSET:
+ return AP_REG_INVARG;
#endif
- default: return AP_REG_ASSERT;
+ default:
+ break;
}
}
+ return AP_REG_ASSERT;
}
/* This function substitutes for $0-$9, filling in regular expression
@@ -1865,9 +1881,8 @@ static __inline LPSTR get_pheader(jk_poo
if ((rv = jk_pool_alloc(pool, dwLen)) == NULL)
return NULL;
/* Try again with dynamic buffer */
- if (!pfp->GetHeader(pfc, lpszName, rv, &dwLen)) {
+ if (!pfp->GetHeader(pfc, lpszName, rv, &dwLen))
return NULL;
- }
}
return rv;
}
@@ -1946,7 +1961,7 @@ static DWORD handle_notify_event(PHTTP_F
rv = SF_STATUS_REQ_FINISHED;
goto cleanup;
}
- else if (rc == BAD_PATH) {
+ if (rc == BAD_PATH) {
jk_log(logger, JK_LOG_EMERG,
"[%s] contains forbidden escape sequences.",
uri);
@@ -2542,11 +2557,13 @@ static int init_logger(int rotate, jk_lo
/* If there are %s in the log file name, treat it as a sprintf format */
tm_now = localtime(&t);
strftime(log_file_name, sizeof(log_file_name_buf), log_file, tm_now);
- } else {
+ }
+ else {
/* Otherwise append the number of seconds to the base name */
StringCbPrintf(log_file_name, sizeof(log_file_name_buf), "%s.%d", log_file, (long)t);
}
- } else {
+ }
+ else {
log_file_name = log_file;
}
@@ -2566,7 +2583,8 @@ static int init_logger(int rotate, jk_lo
/* Remember the current log file name for the next potential rotate */
StringCbCopy(log_file_effective, sizeof(log_file_effective), log_file_name);
rc = JK_TRUE;
- } else {
+ }
+ else {
logger = NULL;
rc = JK_FALSE;
}
@@ -2593,7 +2611,8 @@ static int JK_METHOD rotate_log_file(jk_
if (t >= log_next_rotate_time) {
rotate = JK_TRUE;
}
- } else if (log_filesize > 0) {
+ }
+ else if (log_filesize > 0) {
LARGE_INTEGER filesize;
HANDLE h = (HANDLE)_get_osfhandle(fileno(((jk_file_logger_t *)(*l)->logger_private)->logfile));
GetFileSizeEx(h, &filesize);
@@ -2788,8 +2807,9 @@ static int init_jk(char *serverName)
/*
* Create named shared memory for each server
*/
- if (shm_config_size == 0)
+ if (shm_config_size == 0) {
shm_config_size = jk_shm_calculate_size(workers_map, logger);
+ }
else {
jk_log(logger, JK_LOG_WARNING,
"The optimal shared memory size can now be determined automatically.");
@@ -2826,9 +2846,10 @@ static int init_jk(char *serverName)
uri_worker_map_ext(uw_map, logger);
uri_worker_map_switch(uw_map, logger);
}
- else
+ else {
jk_log(logger, JK_LOG_EMERG,
"Unable to read worker file %s.", worker_file);
+ }
if (rc != JK_TRUE) {
jk_map_free(&workers_map);
workers_map = NULL;
@@ -2871,22 +2892,14 @@ static BOOL initialize_extension(void)
int parse_uri_select(const char *uri_select)
{
- if (0 == strcasecmp(uri_select, URI_SELECT_PARSED_VERB)) {
+ if (!strcasecmp(uri_select, URI_SELECT_PARSED_VERB))
return URI_SELECT_OPT_PARSED;
- }
-
- if (0 == strcasecmp(uri_select, URI_SELECT_UNPARSED_VERB)) {
+ if (!strcasecmp(uri_select, URI_SELECT_UNPARSED_VERB))
return URI_SELECT_OPT_UNPARSED;
- }
-
- if (0 == strcasecmp(uri_select, URI_SELECT_ESCAPED_VERB)) {
+ if (!strcasecmp(uri_select, URI_SELECT_ESCAPED_VERB))
return URI_SELECT_OPT_ESCAPED;
- }
-
- if (0 == strcasecmp(uri_select, URI_SELECT_PROXY_VERB)) {
+ if (!strcasecmp(uri_select, URI_SELECT_PROXY_VERB))
return URI_SELECT_OPT_PROXY;
- }
-
return -1;
}
@@ -3025,7 +3038,8 @@ static int get_config_parameter(LPVOID s
else {
return JK_FALSE;
}
- } else {
+ }
+ else {
return get_registry_config_parameter((HKEY)src, tag, val, sz);
}
}
@@ -3034,7 +3048,8 @@ static int get_config_int(LPVOID src, co
{
if (using_ini_file) {
return jk_map_get_int((jk_map_t*)src, tag, def);
- } else {
+ }
+ else {
int val;
if (get_registry_config_number(src, tag, &val) ) {
return val;
@@ -3049,7 +3064,8 @@ static int get_config_bool(LPVOID src, c
{
if (using_ini_file) {
return jk_map_get_bool((jk_map_t*)src, tag, def);
- } else {
+ }
+ else {
char tmpbuf[128];
if (get_registry_config_parameter(src, tag,
tmpbuf, sizeof(tmpbuf))) {
@@ -3736,11 +3752,13 @@ static char *relative_path(char *path, s
nd--;
}
}
- else
+ else {
ch = *cp++ = *path++;
+ }
}
- else
+ else {
ch = *cp++ = *path++;
+ }
}
*cp = '\0';
return sp;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org