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

[cherokee at cherokee-project.com]

Author: adefacc
Date: 2007-07-02 22:59:47 +0200 (Mon, 02 Jul 2007)
New Revision: 786
Log:
Plugin loader fix + space cleanups.
Get the changeset with:
  svn diff -r 785:786 svn://svn.cherokee-project.com/

Modified:
  cherokee/trunk/ChangeLog
    7 ++++
  cherokee/trunk/cherokee/plugin_loader.c
   45 ++++++++++++++++++--------------

Modified: cherokee/trunk/ChangeLog
===================================================================
--- cherokee/trunk/ChangeLog	2007-07-02 20:45:51 UTC (rev 785)
+++ cherokee/trunk/ChangeLog	2007-07-02 20:59:47 UTC (rev 786)
@@ -1,6 +1,13 @@
 
 2007-07-02  A.D.F  <adefacc at tin.it>
 
+	* cherokee/plugin_loader.c
+	  - removed redundant call to cherokee_buffer_mrproper (my bad);
+	  - removed a goto;
+	  - space / indentation cleanups.
+
+2007-07-02  A.D.F  <adefacc at tin.it>
+
 	* cherokee/win32_misc.c
 	  - added comments about MUTEX_LOCK protection to win_dlerror();
 

Modified: cherokee/trunk/cherokee/plugin_loader.c
===================================================================
--- cherokee/trunk/cherokee/plugin_loader.c	2007-07-02 20:45:51 UTC (rev 785)
+++ cherokee/trunk/cherokee/plugin_loader.c	2007-07-02 20:59:47 UTC (rev 786)
@@ -177,24 +177,28 @@
 	ret_t ret;
 	
 	ret = cherokee_table_init (&loader->table);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 	
 	/* Plug-in dir
 	 */
 	ret = cherokee_buffer_init (&loader->module_dir);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 	cherokee_buffer_add_str (&loader->module_dir, CHEROKEE_PLUGINDIR);
 
 	/* Plug-in dependencies dir
 	 */
 	ret = cherokee_buffer_init (&loader->deps_dir);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 	cherokee_buffer_add_str (&loader->deps_dir, CHEROKEE_DEPSDIR);
 
 	ret = load_static_linked_modules (loader);
-	if (unlikely(ret < ret_ok)) return ret;
+	if (unlikely(ret < ret_ok))
+		return ret;
 
 	return ret_ok;
 }
@@ -260,7 +264,7 @@
 		PRINT_ERROR ("ERROR: dlopen(%s): %s\n", tmp.buf, dlerror());
 		CHEROKEE_MUTEX_UNLOCK (&dlerror_mutex);
 		cherokee_buffer_mrproper (&tmp);
-		goto error;
+		return ret_error;
 	}
 	CHEROKEE_MUTEX_UNLOCK (&dlerror_mutex);
 
@@ -270,10 +274,6 @@
 
 	*handler_out = lib;
 	return ret_ok;
-
-error:
-	cherokee_buffer_mrproper (&tmp);
-	return ret_error;
 }
 
 
@@ -365,7 +365,8 @@
 
 	cherokee_buffer_add_va (&filename, "%s/%s.deps", loader->deps_dir.buf, modname);
 	file = fopen (filename.buf, "r");
-	if (file == NULL) goto exit;
+	if (file == NULL)
+		goto exit;
 
 	while (!feof(file)) {
 		int   len;
@@ -508,7 +509,8 @@
 	entry_t *entry;
 
 	ret = cherokee_table_get (&loader->table, modname, (void **)&entry);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	*info = entry->info;
 	return ret_ok;
@@ -525,7 +527,8 @@
 	/* Get the symbol from a dynamic library
 	 */
 	ret = cherokee_table_get (&loader->table, modname, (void **)&entry);
-	if (ret != ret_ok) return ret;
+	if (ret != ret_ok)
+		return ret;
 
 	/* Even if we're trying to look for symbols in the executable,
 	 * using dlopen(NULL), the handler pointer should not be nil.
@@ -534,7 +537,8 @@
 		return ret_not_found;
 
 	tmp = get_sym_from_dlopen_handler (entry->dlopen_ref, name);
-	if (tmp == NULL) return ret_not_found;
+	if (tmp == NULL)
+		return ret_not_found;
 
 	*sym = tmp;
 	return ret_ok;
@@ -547,15 +551,17 @@
 ret_t 
 cherokee_plugin_loader_get (cherokee_plugin_loader_t *loader, char *modname, cherokee_plugin_info_t **info)
 {
-	   ret_t ret;
+	ret_t ret;
 
-	   ret = cherokee_plugin_loader_load (loader, modname);
-	   if (ret != ret_ok) return ret;
+	ret = cherokee_plugin_loader_load (loader, modname);
+	if (ret != ret_ok)
+		return ret;
 
-	   ret = cherokee_plugin_loader_get_info (loader, modname, info);
-	   if (ret != ret_ok) return ret;
+	ret = cherokee_plugin_loader_get_info (loader, modname, info);
+	if (ret != ret_ok)
+		return ret;
 
-	   return ret_ok;
+	return ret_ok;
 }
 
 
@@ -577,3 +583,4 @@
 
 	return ret_ok;
 }
+