[asterisk-commits] russell: branch russell/chan_console r95336 - /team/russell/chan_console/chan...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Dec 28 20:34:56 2007
New Revision: 95336

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95336
Log:
let chan_console build again

Modified:
    team/russell/chan_console/channels/chan_console.c

Modified: team/russell/chan_console/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_console/channels/chan_console.c?view=diff&rev=95336&r1=95335&r2=95336
==============================================================================
--- team/russell/chan_console/channels/chan_console.c (original)
+++ team/russell/chan_console/channels/chan_console.c Fri Dec 28 20:34:56 2007
@@ -939,14 +939,14 @@
 }
 
 static struct ast_cli_entry cli_console[] = {
-	NEW_CLI(cli_console_dial, "Dial an extension from the console"),
-	NEW_CLI(cli_console_hangup, "Hangup a call on the console"),
-	NEW_CLI(cli_console_mute, "Disable/Enable mic input"),
-	NEW_CLI(cli_console_answer, "Answer an incoming console call"),
-	NEW_CLI(cli_console_sendtext, "Send text to a connected party"),
-	NEW_CLI(cli_console_flash, "Send a flash to the connected party"),
-	NEW_CLI(cli_console_autoanswer, "Turn autoanswer on or off"),
-	NEW_CLI(cli_list_devices, "List available devices"),
+	AST_CLI_DEFINE(cli_console_dial, "Dial an extension from the console"),
+	AST_CLI_DEFINE(cli_console_hangup, "Hangup a call on the console"),
+	AST_CLI_DEFINE(cli_console_mute, "Disable/Enable mic input"),
+	AST_CLI_DEFINE(cli_console_answer, "Answer an incoming console call"),
+	AST_CLI_DEFINE(cli_console_sendtext, "Send text to a connected party"),
+	AST_CLI_DEFINE(cli_console_flash, "Send a flash to the connected party"),
+	AST_CLI_DEFINE(cli_console_autoanswer, "Turn autoanswer on or off"),
+	AST_CLI_DEFINE(cli_list_devices, "List available devices"),
 };
 
 static void set_pvt_defaults(struct console_pvt *pvt)
@@ -954,9 +954,9 @@
 	ast_string_field_set(pvt, mohinterpret, "default");
 	ast_string_field_set(pvt, context, "default");
 	ast_string_field_set(pvt, exten, "s");
-	ast_string_field_free(pvt, language);
-	ast_string_field_free(pvt, cid_num);
-	ast_string_field_free(pvt, cid_name);
+	ast_string_field_set(pvt, language, "");
+	ast_string_field_set(pvt, cid_num, "");
+	ast_string_field_set(pvt, cid_name, "");
 
 	pvt->overridecontext = 0;
 	pvt->autoanswer = 0;
@@ -1042,7 +1042,7 @@
 	ast_channel_unregister(&console_tech);
 	ast_cli_unregister_multiple(cli_console, sizeof(cli_console) / sizeof(cli_console[0]));
 
-	ast_string_field_free_pools(pvt);
+	ast_string_field_free_memory(pvt);
 	ast_cond_destroy(&pvt->cond);
 
 	return 0;