From 4dfe36feb16923b454ea2e44cc512adaff879127 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 23 Jan 2012 20:48:47 -0800
Subject: [PATCH] Migrate input_function_get_names to wcstring_list_t

---
 builtin.cpp | 13 +++----------
 input.cpp   | 12 +++---------
 input.h     |  2 +-
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/builtin.cpp b/builtin.cpp
index a3f4ebe13..3897e8994 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -465,20 +465,13 @@ static void builtin_bind_key_names( int all )
  */
 static void builtin_bind_function_names()
 {
-	array_list_t lst;
-	int i;
+    wcstring_list_t names = input_function_get_names();
 	
-	al_init( &lst );
-	input_function_get_names( &lst );
-	
-	for( i=0; i<al_get_count(&lst); i++ )
+	for( size_t i=0; i<names.size(); i++ )
 	{
-		wchar_t *seq = (wchar_t *)al_get( &lst, i );
-		
+		const wchar_t *seq = names.at(i).c_str();		
 		sb_printf( sb_out, L"%ls\n", seq );
 	}
-
-	al_destroy( &lst );
 }
 
 /**
diff --git a/input.cpp b/input.cpp
index eb4cf202e..e1b5f0c5d 100644
--- a/input.cpp
+++ b/input.cpp
@@ -835,16 +835,10 @@ void input_terminfo_get_names( array_list_t *lst, int skip_null )
 	}
 }
 
-void input_function_get_names( array_list_t *lst )
+wcstring_list_t input_function_get_names( void )
 {
-	size_t i;	
-
-	CHECK( lst, );
-		
-	for( i=0; i<(sizeof(name_arr)/sizeof(wchar_t *)); i++ )
-	{
-		al_push( lst, name_arr[i] );
-	}
+    size_t count = sizeof name_arr / sizeof *name_arr;
+    return wcstring_list_t(name_arr, name_arr + count);
 }
 
 wchar_t input_function_get_code( const wcstring &name )
diff --git a/input.h b/input.h
index 99840c7db..78131744c 100644
--- a/input.h
+++ b/input.h
@@ -138,7 +138,7 @@ wchar_t input_function_get_code( const wcstring &name );
 /**
    Returns a list of all existing input function names
  */
-void input_function_get_names( array_list_t *lst );
+wcstring_list_t input_function_get_names( void );
 
 
 #endif