Another halloc:ification of fish. Halloc has been extended to allow registering function calls, this has allowed the creation of halloc-handled arraylists, stringbuffers, etc. More job parsing halloc-ification has reduced the error handling code to only a shadow of it's former self

darcs-hash:20060209155020-ac50b-e119c5293ce2368e252cfc01b98ab7c629fdd678.gz

1 files changed, 7 insertions, 8 deletions

diff --git a/main.c b/main.c
index 1744451a..448f6190 100644
--- a/main.c
+++ b/main.c
@@ -57,6 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "event.h"
 #include "output.h"
 #include "translate.h"
+#include "halloc_util.h"
 
 /**
    Parse init files
@@ -73,7 +74,7 @@ static int read_init()
 	}
 
 	env_set( L"__fish_help_dir", DOCDIR, 0);	
- 	
+	
 	eval( L"builtin cd " SYSCONFDIR L" 2>/dev/null; . fish 2>/dev/null", 0, TOP );
 	eval( L"builtin cd 2>/dev/null;. .fish 2>/dev/null", 0, TOP );
 	
@@ -210,9 +211,10 @@ int main( int argc, char **argv )
 	is_interactive_session &= isatty(STDIN_FILENO);	
 	is_interactive_session |= force_interactive;
 
-	translate_init();	
+	common_init();
+	halloc_util_init();	
+
 	proc_init();	
-	output_init();	
 	event_init();	
 	exec_init();	
 	wutil_init();
@@ -220,7 +222,6 @@ int main( int argc, char **argv )
 	builtin_init();
 	function_init();
 	env_init();
-	parse_util_init();
 	complete_init();
 	reader_init();
 	
@@ -302,13 +303,11 @@ int main( int argc, char **argv )
 	reader_destroy();
 	parser_destroy();
 	wutil_destroy();
-	common_destroy();
 	exec_destroy();	
-	parse_util_destroy();
 	event_destroy();
-	output_destroy();
-	translate_destroy();	
 
+	common_destroy();
+	halloc_util_destroy();
 	intern_free_all();
 
 	return res;