- white space cleanup part 2 this time 1.4 ;)

  i hope it helps with merging stuff back to 1.5

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1371 152afb58-edef-0310-8abb-c4023f1b3aa9

1 files changed, 64 insertions, 64 deletions

diff --git a/src/mod_evhost.c b/src/mod_evhost.c
index bc8adb63..daf44942 100644
--- a/src/mod_evhost.c
+++ b/src/mod_evhost.c
@@ -10,7 +10,7 @@
 typedef struct {
 	/* unparsed pieces */
 	buffer *path_pieces_raw;
-	
+
 	/* pieces for path creation */
 	size_t len;
 	buffer **path_pieces;
@@ -21,14 +21,14 @@ typedef struct {
 	buffer *tmp_buf;
 
 	plugin_config **config_storage;
-	plugin_config conf; 
+	plugin_config conf;
 } plugin_data;
 
 INIT_FUNC(mod_evhost_init) {
 	plugin_data *p;
-	
+
 	p = calloc(1, sizeof(*p));
-	
+
 	p->tmp_buf = buffer_init();
 
 	return p;
@@ -36,34 +36,34 @@ INIT_FUNC(mod_evhost_init) {
 
 FREE_FUNC(mod_evhost_free) {
 	plugin_data *p = p_d;
-	
+
 	UNUSED(srv);
 
 	if (!p) return HANDLER_GO_ON;
-	
+
 	if (p->config_storage) {
 		size_t i;
 		for (i = 0; i < srv->config_context->used; i++) {
 			plugin_config *s = p->config_storage[i];
 
 			if (!s) continue;
-			
+
 			if(s->path_pieces) {
 				size_t j;
 				for (j = 0; j < s->len; j++) {
 					buffer_free(s->path_pieces[j]);
 				}
-				
+
 				free(s->path_pieces);
 			}
-			
+
 			buffer_free(s->path_pieces_raw);
-			
+
 			free(s);
 		}
 		free(p->config_storage);
 	}
-	
+
 	buffer_free(p->tmp_buf);
 
 	free(p);
@@ -73,30 +73,30 @@ FREE_FUNC(mod_evhost_free) {
 
 static void mod_evhost_parse_pattern(plugin_config *s) {
 	char *ptr = s->path_pieces_raw->ptr,*pos;
-	
+
 	s->path_pieces = NULL;
-	
+
 	for(pos=ptr;*ptr;ptr++) {
 		if(*ptr == '%') {
 			s->path_pieces = realloc(s->path_pieces,(s->len+2) * sizeof(*s->path_pieces));
 			s->path_pieces[s->len] = buffer_init();
 			s->path_pieces[s->len+1] = buffer_init();
-			
+
 			buffer_copy_string_len(s->path_pieces[s->len],pos,ptr-pos);
 			pos = ptr + 2;
-			
+
 			buffer_copy_string_len(s->path_pieces[s->len+1],ptr++,2);
-			
+
 			s->len += 2;
 		}
 	}
-	
+
 	if(*pos != '\0') {
 		s->path_pieces = realloc(s->path_pieces,(s->len+1) * sizeof(*s->path_pieces));
 		s->path_pieces[s->len] = buffer_init();
-		
+
 		buffer_append_memory(s->path_pieces[s->len],pos,ptr-pos);
-		
+
 		s->len += 1;
 	}
 }
@@ -104,9 +104,9 @@ static void mod_evhost_parse_pattern(plugin_config *s) {
 SETDEFAULTS_FUNC(mod_evhost_set_defaults) {
 	plugin_data *p = p_d;
 	size_t i;
-	
+
 	/**
-	 * 
+	 *
 	 * #
 	 * # define a pattern for the host url finding
 	 * # %% => % sign
@@ -117,39 +117,39 @@ SETDEFAULTS_FUNC(mod_evhost_set_defaults) {
 	 * # %4 => subdomain 2 name
 	 * #
 	 * evhost.path-pattern = "/home/ckruse/dev/www/%3/htdocs/"
-	 * 
+	 *
 	 */
-	
-	config_values_t cv[] = { 
+
+	config_values_t cv[] = {
 		{ "evhost.path-pattern",            NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
 		{ NULL,                             NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
 	};
-	
+
 	if (!p) return HANDLER_ERROR;
-	
+
 	p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
-	
+
 	for (i = 0; i < srv->config_context->used; i++) {
 		plugin_config *s;
-		
+
 		s = calloc(1, sizeof(plugin_config));
 		s->path_pieces_raw = buffer_init();
 		s->path_pieces     = NULL;
 		s->len             = 0;
-	
+
 		cv[0].destination = s->path_pieces_raw;
-		
+
 		p->config_storage[i] = s;
-		
+
 		if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value,  cv)) {
 			return HANDLER_ERROR;
 		}
-		
+
 		if (s->path_pieces_raw->used != 0) {
 			mod_evhost_parse_pattern(s);
 		}
 	}
-	
+
 	return HANDLER_GO_ON;
 }
 
@@ -158,7 +158,7 @@ SETDEFAULTS_FUNC(mod_evhost_set_defaults) {
  * - %0 - full hostname (authority w/o port)
  * - %1 - tld
  * - %2 - domain.tld
- * - %3 - 
+ * - %3 -
  */
 
 static int mod_evhost_parse_host(connection *con,array *host) {
@@ -168,7 +168,7 @@ static int mod_evhost_parse_host(connection *con,array *host) {
 	int first = 1;
 	data_string *ds;
 	int i;
-	
+
 	/* first, find the domain + tld */
 	for(;ptr > con->uri.authority->ptr;ptr--) {
 		if(*ptr == '.') {
@@ -179,18 +179,18 @@ static int mod_evhost_parse_host(connection *con,array *host) {
 			first = 1;
 		}
 	}
-	
+
 	ds = data_string_init();
 	buffer_copy_string(ds->key,"%0");
-	
+
 	/* if we stopped at a dot, skip the dot */
 	if (*ptr == '.') ptr++;
 	buffer_copy_string_len(ds->value, ptr, colon-ptr);
-	
+
 	array_insert_unique(host,(data_unset *)ds);
-	
+
 	/* if the : is not the start of the authority, go on parsing the hostname */
-	
+
 	if (colon != con->uri.authority->ptr) {
 		for(ptr = colon - 1, i = 1; ptr > con->uri.authority->ptr; ptr--) {
 			if(*ptr == '.') {
@@ -200,24 +200,24 @@ static int mod_evhost_parse_host(connection *con,array *host) {
 					buffer_copy_string(ds->key,"%");
 					buffer_append_long(ds->key, i++);
 					buffer_copy_string_len(ds->value,ptr+1,colon-ptr-1);
-					
+
 					array_insert_unique(host,(data_unset *)ds);
 				}
 				colon = ptr;
 			}
 		}
-		
+
 		/* if the . is not the first charactor of the hostname */
 		if (colon != ptr) {
 			ds = data_string_init();
 			buffer_copy_string(ds->key,"%");
 			buffer_append_long(ds->key, i++);
 			buffer_copy_string_len(ds->value,ptr,colon-ptr);
-			
+
 			array_insert_unique(host,(data_unset *)ds);
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -226,29 +226,29 @@ static int mod_evhost_parse_host(connection *con,array *host) {
 static int mod_evhost_patch_connection(server *srv, connection *con, plugin_data *p) {
 	size_t i, j;
 	plugin_config *s = p->config_storage[0];
-	
+
 	PATCH(path_pieces);
 	PATCH(len);
-	
+
 	/* skip the first, the global context */
 	for (i = 1; i < srv->config_context->used; i++) {
 		data_config *dc = (data_config *)srv->config_context->data[i];
 		s = p->config_storage[i];
-		
+
 		/* condition didn't match */
 		if (!config_check_cond(srv, con, dc)) continue;
-		
+
 		/* merge config */
 		for (j = 0; j < dc->value->used; j++) {
 			data_unset *du = dc->value->data[j];
-			
+
 			if (buffer_is_equal_string(du->key, CONST_STR_LEN("evhost.path-pattern"))) {
 				PATCH(path_pieces);
 				PATCH(len);
 			}
 		}
 	}
-	
+
 	return 0;
 }
 #undef PATCH
@@ -261,29 +261,29 @@ static handler_t mod_evhost_uri_handler(server *srv, connection *con, void *p_d)
 	register char *ptr;
 	int not_good = 0;
 	stat_cache_entry *sce = NULL;
-	
+
 	/* not authority set */
 	if (con->uri.authority->used == 0) return HANDLER_GO_ON;
-	
+
 	mod_evhost_patch_connection(srv, con, p);
-	
+
 	/* missing even default(global) conf */
 	if (0 == p->conf.len) {
 		return HANDLER_GO_ON;
 	}
 
 	parsed_host = array_init();
-	
+
 	mod_evhost_parse_host(con, parsed_host);
-	
+
 	/* build document-root */
 	buffer_reset(p->tmp_buf);
-	
+
 	for (i = 0; i < p->conf.len; i++) {
 		ptr = p->conf.path_pieces[i]->ptr;
 		if (*ptr == '%') {
 			data_string *ds;
-			
+
 			if (*(ptr+1) == '%') {
 				/* %% */
 				BUFFER_APPEND_STRING_CONST(p->tmp_buf,"%");
@@ -298,11 +298,11 @@ static handler_t mod_evhost_uri_handler(server *srv, connection *con, void *p_d)
 			buffer_append_string_buffer(p->tmp_buf,p->conf.path_pieces[i]);
 		}
 	}
-	
+
 	BUFFER_APPEND_SLASH(p->tmp_buf);
-	
+
 	array_free(parsed_host);
-	
+
 	if (HANDLER_ERROR == stat_cache_get_entry(srv, con, p->tmp_buf, &sce)) {
 		log_error_write(srv, __FILE__, __LINE__, "sb", strerror(errno), p->tmp_buf);
 		not_good = 1;
@@ -310,11 +310,11 @@ static handler_t mod_evhost_uri_handler(server *srv, connection *con, void *p_d)
 		log_error_write(srv, __FILE__, __LINE__, "sb", "not a directory:", p->tmp_buf);
 		not_good = 1;
 	}
-	
+
 	if (!not_good) {
 		buffer_copy_string_buffer(con->physical.doc_root, p->tmp_buf);
 	}
-	
+
 	return HANDLER_GO_ON;
 }
 
@@ -325,9 +325,9 @@ int mod_evhost_plugin_init(plugin *p) {
 	p->set_defaults            = mod_evhost_set_defaults;
 	p->handle_docroot          = mod_evhost_uri_handler;
 	p->cleanup                 = mod_evhost_free;
-	
+
 	p->data                    = NULL;
-	
+
 	return 0;
 }