[Cherokee-commits] rev 781 - in cherokee/trunk

cherokee at cherokee-project.com cherokee at cherokee-project.com
Wed Jun 27 22:55:40 CEST 2007


Author: adefacc
Date: 2007-06-27 22:55:39 +0200 (Wed, 27 Jun 2007)
New Revision: 781
Log:
More cleanups.
Get the changeset with:
  svn diff -r 780:781 svn://svn.cherokee-project.com/

Modified:
  cherokee/trunk/ChangeLog
   11 +
  cherokee/trunk/cherokee/levenshtein_distance.c
  108 ++++++++-------
  cherokee/trunk/cherokee/virtual_entries.c
   13 +
  cherokee/trunk/cherokee/virtual_server.c
  179 +++++++++++++++----------
  cherokee/trunk/cherokee/virtual_server_names.c
   38 ++---

Modified: cherokee/trunk/ChangeLog
===================================================================
--- cherokee/trunk/ChangeLog	2007-06-27 20:15:36 UTC (rev 780)
+++ cherokee/trunk/ChangeLog	2007-06-27 20:55:39 UTC (rev 781)
@@ -1,3 +1,14 @@
+
+2007-06-27  A.D.F  <adefacc at tin.it>
+
+	* cherokee/levenshtein_distance.c,
+	  cherokee/virtual_server_names.c,
+	  cherokee/virtual_server.c,
+	  cherokee/virtual_entries.c
+	  - space / indentation / style cleanups;
+	  - changed #ifdef HAVE_TLS ... #endif
+	    scope in order to not compile unreacheable code.
+
 2007-06-27  Alvaro Lopez Ortega  <alvaro at alobbs.com>
 
 	* cherokee/win32_misc.c: Shouldn't return a pointer to a local

Modified: cherokee/trunk/cherokee/levenshtein_distance.c
===================================================================
--- cherokee/trunk/cherokee/levenshtein_distance.c	2007-06-27 20:15:36 UTC (rev 780)
+++ cherokee/trunk/cherokee/levenshtein_distance.c	2007-06-27 20:55:39 UTC (rev 781)
@@ -15,89 +15,99 @@
 static int  _min(int a, int b, int c);
 static void score(int *pD, char *A, char *B, int lA, int lB);
 
-#define D(r,c) pD[(r)*lB1+(c)]
+#define D(r,c)	pD[(r)*lB1+(c)]
 
 int distance(char *A, char *B)
 {
-    int *pD, d;
+	int *pD, d;
 
-    int lA  = strlen(A);
-    int lB  = strlen(B);
+	int lA  = strlen(A);
+	int lB  = strlen(B);
 
-    int lA1 = lA+1;
-    int lB1 = lB+1;
+	int lA1 = lA+1;
+	int lB1 = lB+1;
 
-    pD = (int *) malloc(lA1 * lB1 * sizeof(int));
-    if (!pD)
-	return -1;
-    
-    score(pD, A, B, lA, lB);
+	pD = (int *) malloc(lA1 * lB1 * sizeof(int));
+	if (!pD)
+		return -1;
 
-    d = D(lA,lB);
-    free(pD);
-    return d;
+	score(pD, A, B, lA, lB);
+
+	d = D(lA,lB);
+	free(pD);
+
+	return d;
 }
 
 
 int prefix_distance(char *A, char *B)
 {
-    int lA  = strlen(A);
-    int lB  = strlen(B);
+	int lA  = strlen(A);
+	int lB  = strlen(B);
 
-    return lA < lB ? _prefix_distance(A, B, lA, lB) :
-	             _prefix_distance(B, A, lB, lA);
+	return lA < lB ?
+		_prefix_distance(A, B, lA, lB) :
+		_prefix_distance(B, A, lB, lA);
 }
 
+
 static int _prefix_distance(char *A, char *B, int lA, int lB)
 {
-    int *pD, c, d;
+	int *pD, c, d;
 
-    int lA1 = lA+1;
-    int lB1 = lB+1;
+	int lA1 = lA+1;
+	int lB1 = lB+1;
 
-    pD = (int *) malloc(lA1 * lB1 * sizeof(int));
-    if (!pD)
-	return -1;
+	pD = (int *) malloc(lA1 * lB1 * sizeof(int));
+	if (!pD)
+		return -1;
     
-    score(pD, A, B, lA, lB);
+	score(pD, A, B, lA, lB);
 
-    d = D(lA, lA);
-    for (c=lA+1; c<=lB; c++)
-	if (d > D(lA, c))
-	    d = D(lA, c);
+	d = D(lA, lA);
+	for (c = lA+1; c <= lB; c++)
+		if (d > D(lA, c))
+			d = D(lA, c);
 
-    free(pD);
-    return d;
+	free(pD);
+
+	return d;
 }
 
 
 static void score(int *pD, char *A, char *B, int lA, int lB)
 {
-    int r, c;
+	int r, c;
 
-    int lB1 = lB+1;
+	int lB1 = lB+1;
 
-    for (r=0; r<=lA; r++) D(r,0) = r;
-    for (c=0; c<=lB; c++) D(0,c) = c;
+	for (r = 0; r <= lA; r++)
+		D(r,0) = r;
 
-    for (r=1; r<=lA; r++)
-    {
-	for (c=1; c<=lB; c++)
-	{
-	    int u    = D(r-1,c  );
-	    int l    = D(r  ,c-1);
-	    int ul   = D(r-1,c-1);
-	    int cost = A[r-1]==B[c-1] ? 0 : 1;
-	    D(r,c)   = _min(u+1, l+1, ul+cost);
+	for (c = 0; c <= lB; c++)
+		D(0,c) = c;
+
+	for (r = 1; r <= lA; r++) {
+		for (c = 1; c <= lB; c++) {
+			int u    = D(r-1,c  );
+			int l    = D(r  ,c-1);
+			int ul   = D(r-1,c-1);
+			int cost = (A[r-1] == B[c-1] ? 0 : 1);
+			D(r,c)   = _min(u+1, l+1, ul+cost);
+		}
 	}
-    }
 }
 
+
 static int _min (int a, int b, int c)
 {
-    int min = a;
-    if (min>b) min = b;
-    if (min>c) min = c;
+	int min = a;
 
-    return min;
+	if (min > b)
+		min = b;
+	if (min > c)
+		min = c;
+
+	return min;
 }
+

Modified: cherokee/trunk/cherokee/virtual_entries.c
===================================================================
--- cherokee/trunk/cherokee/virtual_entries.c	2007-06-27 20:15:36 UTC (rev 780)
+++ cherokee/trunk/cherokee/virtual_entries.c	2007-06-27 20:55:39 UTC (rev 781)
@@ -30,16 +30,19 @@
 cherokee_virtual_entries_init (cherokee_virtual_entries_t *ventry)
 {
 	ret_t ret;
-	
+
 	ret = cherokee_exts_table_init (&ventry->exts);
-	if (unlikely(ret < ret_ok)) return ret;
-	
+	if (unlikely(ret < ret_ok))
+		return ret;
+
 	ret = cherokee_dirs_table_init (&ventry->dirs);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 #ifndef CHEROKEE_EMBEDDED
 	ret = cherokee_reqs_list_init (&ventry->reqs);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 #endif
 
 	return ret_ok;

Modified: cherokee/trunk/cherokee/virtual_server.c
===================================================================
--- cherokee/trunk/cherokee/virtual_server.c	2007-06-27 20:15:36 UTC (rev 780)
+++ cherokee/trunk/cherokee/virtual_server.c	2007-06-27 20:55:39 UTC (rev 781)
@@ -42,7 +42,7 @@
 cherokee_virtual_server_new (cherokee_virtual_server_t **vserver, void *server)
 {
 	ret_t ret;
-       	CHEROKEE_NEW_STRUCT (n, virtual_server);
+	CHEROKEE_NEW_STRUCT (n, virtual_server);
 
 	INIT_LIST_HEAD (&n->list_entry);
 	INIT_LIST_HEAD (&n->index_list);
@@ -56,11 +56,13 @@
 	/* Virtual entries
 	 */
 	ret = cherokee_virtual_entries_init (&n->entry);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	ret = cherokee_virtual_entries_init (&n->userdir_entry);
-	if (ret != ret_ok) return ret;
-	
+	if (ret != ret_ok)
+		return ret;
+
 	/* Data transference 
 	 */
 	n->data.rx         = 0;
@@ -76,7 +78,8 @@
 
 #ifdef HAVE_TLS
 	ret = cherokee_table_init (&n->session_cache);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 # ifdef HAVE_GNUTLS
 	n->credentials     = NULL;
@@ -84,18 +87,22 @@
 # ifdef HAVE_OPENSSL
 	n->context         = NULL;
 # endif 
-#endif
 
+#endif /* HAVE_TLS */
+
 	ret = cherokee_buffer_init (&n->root);
-	if (unlikely(ret < ret_ok)) return ret;	
+	if (unlikely(ret < ret_ok))
+		return ret;	
 	
 	ret = cherokee_buffer_init (&n->name);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 	INIT_LIST_HEAD (&n->domains);
 
 	ret = cherokee_buffer_init (&n->userdir);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 	/* Return the object
 	 */
@@ -151,7 +158,7 @@
 		cherokee_table_free (vserver->logger_props);
 		vserver->logger_props = NULL;
 	}
-	
+
 	cherokee_buffer_mrproper (&vserver->userdir);
 
 	/* Destroy the virtual_entries
@@ -195,20 +202,17 @@
 #endif /* HAVE_GNUTLS */
 
 
-
 ret_t 
 cherokee_virtual_server_has_tls (cherokee_virtual_server_t *vserver)
 {
-#ifndef HAVE_TLS
-	return ret_not_found;
-#endif
+#ifdef HAVE_TLS
 	if (! cherokee_buffer_is_empty (&vserver->server_cert))
 		return ret_ok;
 	if (! cherokee_buffer_is_empty (&vserver->server_key))
 		return ret_ok;
 	if (! cherokee_buffer_is_empty (&vserver->ca_cert))
 		return ret_ok;
-
+#endif
 	return ret_not_found;
 }
 
@@ -216,11 +220,9 @@
 ret_t 
 cherokee_virtual_server_init_tls (cherokee_virtual_server_t *vsrv)
 {
+#ifdef HAVE_TLS
 	int rc;
 
-#ifndef HAVE_TLS
-	return ret_ok;
-#endif
 	/* Check if all of them are empty
 	 */
 	if (cherokee_buffer_is_empty (&vsrv->ca_cert)    &&
@@ -235,13 +237,13 @@
 	    cherokee_buffer_is_empty (&vsrv->server_cert))
 		return ret_error;
 
-#ifdef HAVE_GNUTLS
-        rc = gnutls_certificate_allocate_credentials (&vsrv->credentials);
+# ifdef HAVE_GNUTLS
+	rc = gnutls_certificate_allocate_credentials (&vsrv->credentials);
 	if (rc < 0) {
 		PRINT_ERROR_S ("ERROR: Couldn't allocate credentials.\n");
 		return ret_error;
 	}
-	
+
 	/* CA file
 	 */
 	rc = gnutls_certificate_set_x509_trust_file (vsrv->credentials,
@@ -270,9 +272,9 @@
 	gnutls_certificate_set_dh_params (vsrv->credentials, vsrv->dh_params);
 	gnutls_anon_set_server_dh_params (vsrv->credentials, vsrv->dh_params);
 	gnutls_certificate_set_rsa_export_params (vsrv->credentials, vsrv->rsa_params);
-#endif
+# endif
 
-#ifdef HAVE_OPENSSL
+# ifdef HAVE_OPENSSL
 	/* Init the OpenSSL context
 	 */
 	vsrv->context = SSL_CTX_new (SSLv23_server_method());
@@ -312,8 +314,10 @@
 		PRINT_ERROR_S("ERROR: OpenSSL: Private key does not match the certificate public key\n");
 		return ret_error;
 	}
-#endif
+# endif
 
+#endif /* HAVE_TLS */
+
 	return ret_ok;
 }
 
@@ -369,7 +373,8 @@
 	}
 
 	ret = cherokee_access_add (entry->access, address);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	return ret_ok;
 }
@@ -386,10 +391,11 @@
 
 	if (equal_buf_str (&conf->key, "priority")) {
 		entry->priority = atoi(conf->val.buf);
-		
+
 	} else if (equal_buf_str (&conf->key, "allow_from")) {
 		ret = cherokee_config_node_read_list (conf, NULL, add_access, entry);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 
 	} else if (equal_buf_str (&conf->key, "document_root")) {
 		cherokee_config_node_read_path (conf, NULL, &tmp);
@@ -404,29 +410,32 @@
 
 	} else if (equal_buf_str (&conf->key, "handler")) {
 		tmp = &conf->val;
-		
+
 		ret = cherokee_plugin_loader_get (&SRV(vserver->server_ref)->loader, tmp->buf, &info);
-		if (ret != ret_ok) return ret;
-		
+		if (ret != ret_ok)
+			return ret;
+
 		if (info->configure) {
 			handler_func_configure_t configure = info->configure;
 
 			ret = configure (conf, vserver->server_ref, &entry->handler_properties);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
-		
+
 		TRACE(ENTRIES, "Handler: %s\n", tmp->buf);
 		cherokee_config_entry_set_handler (entry, PLUGIN_INFO_HANDLER(info));
 
 	} else if (equal_buf_str (&conf->key, "auth")) {
 		cherokee_plugin_info_validator_t *vinfo;
-	   
+
 		/* Load module
 		 */
 		tmp = &conf->val;
 
 		ret = cherokee_plugin_loader_get (&SRV(vserver->server_ref)->loader, tmp->buf, &info);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 
 		entry->validator_new_func = info->instance;
 
@@ -442,7 +451,8 @@
 		vinfo = (cherokee_plugin_info_validator_t *)info;
 
 		ret = cherokee_validator_configure (conf, entry);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 
 		if ((entry->authentication & vinfo->valid_methods) != entry->authentication) {
 			PRINT_MSG ("ERROR: '%s' unsupported methods\n", tmp->buf);
@@ -470,7 +480,8 @@
 	void  *params[2] = { vserver, entry };
 
 	ret = cherokee_config_node_while (config, init_entry_property, (void *)params);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	return ret_ok;
 }
@@ -485,18 +496,21 @@
 	cherokee_buffer_t       *name   = &config->val;
 
 	ret = cherokee_config_entry_new (&entry);
-	if (unlikely (ret != ret_ok)) return ret;
+	if (unlikely (ret != ret_ok))
+		return ret;
 
 	ret = cherokee_plugin_loader_get (&SRV(vserver->server_ref)->loader, name->buf, &info);
-	if (ret != ret_ok) return ret;
-		
+	if (ret != ret_ok)
+		return ret;
+
 	if (info->configure) {
 		handler_func_configure_t configure = info->configure;
 
 		ret = configure (config, vserver->server_ref, &entry->handler_properties);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 	}
-		
+
 	TRACE(ENTRIES, "Error handler: %s\n", name->buf);
 
 	cherokee_config_entry_set_handler (entry, PLUGIN_INFO_HANDLER(info));		
@@ -516,10 +530,12 @@
 	/* Create a new entry
 	 */
 	ret = cherokee_config_entry_new (&entry);
-	if (unlikely (ret != ret_ok)) return ret;
+	if (unlikely (ret != ret_ok))
+		return ret;
 
 	ret = init_entry (vserver, config, entry);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 	
 	if (equal_buf_str (&config->key, "/")) {
 		TRACE(ENTRIES, "Adding %s\n", "default directory");
@@ -550,26 +566,30 @@
 	char                      *ext = config->key.buf;
 
 	ret = cherokee_config_entry_new (&entry);
-	if (unlikely (ret != ret_ok)) return ret;
+	if (unlikely (ret != ret_ok))
+		return ret;
 
 	ret = init_entry (vserver, config, entry);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	for (;;) {
 		end = strchr (ext, ',');
-		if (end != NULL) *end = '\0';
+		if (end != NULL)
+			*end = '\0';
 
 		ret = cherokee_exts_table_has (&ventry->exts, ext);
 		if (ret != ret_not_found) {
 			PRINT_MSG ("ERROR: Extension '%s' was already set\n", ext);
 			return ret_error;
 		}
-	
+
 		TRACE(ENTRIES, "Adding '%s' extension, priority %d\n", ext, entry->priority);
-		
+
 		ret = cherokee_exts_table_add (&ventry->exts, ext, entry);
-		if (ret != ret_ok) return ret;
-		
+		if (ret != ret_ok)
+			return ret;
+
 		if (end == NULL)
 			break;
 
@@ -605,7 +625,8 @@
 	TRACE(ENTRIES, "Adding '%s' request, priority %d\n", config->key.buf, CONF_ENTRY(entry)->priority);
 
 	ret = cherokee_reqs_list_add (&ventry->reqs, entry, SRV(vserver->server_ref)->regexs);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 #endif
 
 	return ret_ok;
@@ -620,7 +641,8 @@
 	TRACE (ENTRIES, "Adding vserver '%s' domain name '%s'\n", vserver->name.buf, config->val.buf);
 
 	ret = cherokee_vserver_names_add_name (&vserver->domains, &config->val);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	return ret_ok;
 }
@@ -648,16 +670,19 @@
 	/* Instance a new logger
 	 */
 	func_new = (logger_func_new_t) info->instance;
-	if (func_new == NULL) return ret_error;
+	if (func_new == NULL)
+		return ret_error;
 
 	ret = func_new ((void **) &vserver->logger, config);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	/* Logger initialization
 	 */
 	ret = cherokee_logger_init (vserver->logger);
-	if (ret != ret_ok) return ret;
-	
+	if (ret != ret_ok)
+		return ret;
+
 	return ret_ok;
 }
 
@@ -682,7 +707,8 @@
 	if (ret == ret_ok) {
 		cherokee_config_node_foreach (i, subconf) {
 			ret = add_directory (CONFIG_NODE(i), vserver, &vserver->userdir_entry);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
 	}
 
@@ -690,7 +716,8 @@
 	if (ret == ret_ok) {
 		cherokee_config_node_foreach (i, subconf) {
 			ret = add_extensions (CONFIG_NODE(i), vserver, &vserver->userdir_entry);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
 	}
 
@@ -698,7 +725,8 @@
 	if (ret == ret_ok) {
 		cherokee_config_node_foreach (i, subconf) {
 			ret = add_request (CONFIG_NODE(i), vserver, &vserver->userdir_entry);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
 	}
 
@@ -717,7 +745,8 @@
 
 	if (equal_buf_str (&conf->key, "document_root")) {
 		ret = cherokee_config_node_read_path (conf, NULL, &tmp);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 		
 		ret = cherokee_virtual_server_set_documentroot (vserver, (const char *)tmp->buf);
 		if (ret != ret_ok) {
@@ -727,35 +756,42 @@
 
 	} else if (equal_buf_str (&conf->key, "user_dir")) {
 		ret = configure_user_dir (conf, vserver);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 
 	} else if (equal_buf_str (&conf->key, "directory")) {
 		cherokee_config_node_foreach (i, conf) {
 			ret = add_directory (CONFIG_NODE(i), vserver, &vserver->entry);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
 	} else if (equal_buf_str (&conf->key, "extensions")) {
 		cherokee_config_node_foreach (i, conf) {
 			ret = add_extensions (CONFIG_NODE(i), vserver, &vserver->entry);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
 	} else if (equal_buf_str (&conf->key, "request")) {
 		cherokee_config_node_foreach (i, conf) {
 			ret = add_request (CONFIG_NODE(i), vserver, &vserver->entry);
-			if (ret != ret_ok) return ret;
+			if (ret != ret_ok)
+				return ret;
 		}
 	} else if (equal_buf_str (&conf->key, "domain")) {
 		cherokee_config_node_foreach (i, conf) {
 			ret = add_domain (CONFIG_NODE(i), vserver);
-			if (ret != ret_ok) return ret;		
+			if (ret != ret_ok)
+				return ret;		
 		}
 	} else if (equal_buf_str (&conf->key, "error_handler")) {
 		ret = add_error_handler (conf, vserver);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 
 	} else if (equal_buf_str (&conf->key, "logger")) {
 		ret = add_logger (conf, vserver);
-		if (ret != ret_ok) return ret;
+		if (ret != ret_ok)
+			return ret;
 
 	} else if (equal_buf_str (&conf->key, "directory_index")) {
 		cherokee_config_node_read_list (conf, NULL, add_directory_index, vserver);
@@ -763,7 +799,7 @@
 	} else if (equal_buf_str (&conf->key, "ssl_certificate_file")) {
 		cherokee_buffer_init (&vserver->server_cert);
 		cherokee_buffer_add_buffer (&vserver->server_cert, &conf->val);
-		
+
 	} else if (equal_buf_str (&conf->key, "ssl_certificate_key_file")) {
 		cherokee_buffer_init (&vserver->server_key);
 		cherokee_buffer_add_buffer (&vserver->server_key, &conf->val);
@@ -771,12 +807,12 @@
 	} else if (equal_buf_str (&conf->key, "ssl_ca_list_file")) {
 		cherokee_buffer_init (&vserver->ca_cert);
 		cherokee_buffer_add_buffer (&vserver->ca_cert, &conf->val);
-		
+
 	} else {
 		PRINT_MSG ("ERROR: Virtual Server: Unknown key '%s'\n", key);
 		return ret_error;
 	}
-	
+
 	return ret_ok;
 }
 
@@ -795,7 +831,8 @@
 	/* Parse properties
 	 */
 	ret = cherokee_config_node_while (config, configure_virtual_server_property, vserver);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	/* Perform some sanity checks
 	 */

Modified: cherokee/trunk/cherokee/virtual_server_names.c
===================================================================
--- cherokee/trunk/cherokee/virtual_server_names.c	2007-06-27 20:15:36 UTC (rev 780)
+++ cherokee/trunk/cherokee/virtual_server_names.c	2007-06-27 20:55:39 UTC (rev 781)
@@ -39,7 +39,8 @@
 	/* Create a new name object
 	 */
 	ret = cherokee_vserver_name_entry_new (&entry, name);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	/* Add the new entry
 	 */
@@ -52,15 +53,16 @@
 ret_t 
 cherokee_vserver_names_find (cherokee_vserver_names_t *list, cherokee_buffer_t *name)
 {
-        ret_t            ret;
-        cherokee_list_t *i;
+	ret_t            ret;
+	cherokee_list_t *i;
 
-        list_for_each (i, list) {
+	list_for_each (i, list) {
 		ret = cherokee_vserver_name_entry_match (VSERVER_NAME(i), name);
-		if (ret == ret_ok) return ret_ok;
-        }
+		if (ret == ret_ok)
+			return ret_ok;
+	}
 
-        return ret_not_found;
+	return ret_not_found;
 }
 
 
@@ -68,38 +70,37 @@
 cherokee_vserver_names_mrproper (cherokee_vserver_names_t *list)
 {
 	cherokee_list_t *i, *tmp;
-	
-        list_for_each_safe (i, tmp, list) {
+
+	list_for_each_safe (i, tmp, list) {
 		cherokee_vserver_name_entry_free (VSERVER_NAME(i));
 	}
-	
+
 	return ret_ok;
 }
 
 
-
 /* Virtual server name entry
  */
-
 ret_t 
 cherokee_vserver_name_entry_new (cherokee_vserver_name_entry_t **entry, cherokee_buffer_t *name)
 {
 	CHEROKEE_NEW_STRUCT (n, vserver_name_entry);
-	
+
 	/* It's a list node
 	 */
 	INIT_LIST_HEAD (&n->node);
-	
+
 	/* Name entry
 	 */
 	cherokee_buffer_init (&n->name);
-        cherokee_buffer_add_buffer (&n->name, name);
+	cherokee_buffer_add_buffer (&n->name, name);
 
 	/* Check if the name contains wildcards
-         */
-        n->is_wildcard = (strchr (name->buf, '*') || strchr (name->buf, '?'));
+	 */
+	n->is_wildcard = (strchr (name->buf, '*') || strchr (name->buf, '?'));
 
 	*entry = n;
+
 	return ret_ok;
 }
 
@@ -107,7 +108,6 @@
 ret_t 
 cherokee_vserver_name_entry_match (cherokee_vserver_name_entry_t *entry, cherokee_buffer_t *name)
 {
-                
 	if (entry->is_wildcard) 
 		return cherokee_wildcard_match (entry->name.buf, name->buf);
 
@@ -119,7 +119,7 @@
 cherokee_vserver_name_entry_free (cherokee_vserver_name_entry_t *entry)
 {
 	cherokee_buffer_mrproper (&entry->name);
-	
+
 	free (entry);
 	return ret_ok;
 }




More information about the Cherokee-commits mailing list